Merge pull request #197 from TreinaDev/refact/likes-controller

[ REFACT ] Refatora Likes Controller

Author: DanSmaR

app/controllers/comments/likes_controller.rb

@@ -0,0 +1,12 @@
+module Comments
+  class LikesController < LikesController
+    before_action :set_likeable
+
+    private
+
+    def set_likeable
+      @likeable = Comment.find(params[:comment_id])
+      @post = @likeable.post
+    end
+  end
+end

app/controllers/likes_controller.rb

@@ -2,40 +2,18 @@ class LikesController < ApplicationController
   before_action :authenticate_user!
 
   def create
-    likeable, post_id = find_likeable_and_post_id
-    return unless likeable
-
-    like = current_user.likes.build(likeable:)
+    like = current_user.likes.build(likeable: @likeable)
     if like.save
-      redirect_to post_path(post_id)
+      redirect_to post_path(@post)
     else
-      redirect_to post_path(post_id), alert: t('.error')
+      redirect_to post_path(@post), alert: t('.error')
     end
   end
 
   def destroy
-    if params[:post_like_id]
-      like = Like.find(params[:post_like_id])
-      post_id = like.likeable
-    elsif params[:comment_like_id]
-      like = Like.find(params[:comment_like_id])
-      post_id = like.likeable.post
-    end
-
+    like = current_user.likes.find(params[:id])
     like.destroy
 
-    redirect_to post_path(post_id)
-  end
-
-  private
-
-  def find_likeable_and_post_id
-    if params[:post_id]
-      likeable = Post.find(params[:post_id])
-      [likeable, likeable.id]
-    elsif params[:comment_id]
-      likeable = Comment.find(params[:comment_id])
-      [likeable, likeable.post_id]
-    end
+    redirect_to post_path(@post)
   end
 end

app/controllers/posts/likes_controller.rb

@@ -0,0 +1,12 @@
+module Posts
+  class LikesController < LikesController
+    before_action :set_likeable
+
+    private
+
+    def set_likeable
+      @likeable = Post.find(params[:post_id])
+      @post = @likeable
+    end
+  end
+end

app/views/posts/show.html.erb

@@ -46,13 +46,13 @@
         <%= @likes_count %> <%= Like.model_name.human(count: @likes_count) %>
       </div>
       <% if @liked %>
-          <%= button_to like_path(post_like_id: @liked), method: :delete, class: 'btn btn-sm', id: 'unlike' do %>
-            <%= image_tag 'thumbs-up-solid', width: '20rem' %>
-          <% end %>
+        <%= button_to post_like_path(@post, @liked), method: :delete, class: 'btn btn-sm', id: 'unlike' do %>
+          <%= image_tag 'thumbs-up-solid', width: '20rem' %>
+        <% end %>
       <% else %>
-          <%= button_to likes_path(post_id: @post), method: :post, class: 'btn btn-sm', id: 'like' do %>
-            <%= image_tag 'thumbs-up-regular', width: '20rem' %>
-          <% end %>
+        <%= button_to post_likes_path(@post), method: :post, class: 'btn btn-sm', id: 'like' do %>
+          <%= image_tag 'thumbs-up-regular', width: '20rem' %>
+        <% end %>
       <% end %>
     </div>
   </div>
@@ -87,16 +87,17 @@
             <div class="me-2">
               <% if user_signed_in? && comment.likes.where(user_id: current_user.id).any? %>
                 <% like = comment.likes.find_by(user_id: current_user.id) %>
-                <%= button_to like_path(comment_like_id: like.id), method: :delete, class: 'btn btn-sm', id: 'unlike' do %>
-                  <%= image_tag 'thumbs-up-solid', width: '20rem', class: 'mb-4' %>
+                <%= button_to comment_like_path(comment, like), method: :delete, class: 'btn btn-sm', id: 'unlike' do %>
+                      <%= image_tag 'thumbs-up-solid', width: '20rem', class: 'mb-4' %>
                 <% end %>
               <% else %>
-                <%= button_to likes_path(comment_id: comment.id), method: :post, class: 'btn btn-sm', id: 'like' do %>
+                <%= button_to comment_likes_path(comment), method: :post, class: 'btn btn-sm', id: 'like' do %>
                   <%= image_tag 'thumbs-up-regular', width: '20rem', class: 'mb-2' %>
                 <% end %>
               <% end %>
             </div>
           </div>
+
           <% if current_user != comment.user %>
             <div class="report-link-wrapper">
               <%= link_to t('reports.report_btn'), new_report_path(reportable: comment, reportable_type: comment.class), class: 'btn btn-secondary btn-sm' %>

config/locales/likes.pt-BR.yml

@@ -4,7 +4,12 @@ pt-BR:
       like: 
         one: Curtida
         other: Curtidas
-  likes:
-    create:    
-      success: Curtiu
-      error: Você já curtiu isso
+  posts:
+    likes:
+      create:    
+        success: Curtiu
+        error: Você já curtiu isso
+  comments:
+    likes:
+      create:    
+        error: Você já curtiu isso

config/routes.rb

@@ -23,6 +23,14 @@
 
   resources :reports, only: %i[index new create show]
 
+  resources :posts, only: %i[] do
+    resources :likes, only: %i[create destroy], module: :posts
+
+    end
+  resources :comments, only: %i[] do
+    resources :likes, only: %i[create destroy], module: :comments
+  end
+
   resources :users, only: [] do
     resources :posts, shallow: true, only: %i[show edit update]
     resources :profiles, shallow: true, only: %i[edit show update] do
@@ -38,7 +46,6 @@
   delete 'delete_account', controller: :settings
   patch 'deactivate_profile', 'work_unavailable', 'open_to_work', 'change_privacy', controller: :settings
 
-  resources :likes, only: %i[create destroy]
   resources :job_categories, only: %i[index create]
   resource :profile, only: %i[edit update], controller: :profile, as: :user_profile do
     resources :professional_infos, shallow: true, only: %i[new create edit update]
@@ -53,7 +60,7 @@
       resources :job_categories, only: %i[index show]
       resources :profiles, only: %i[show index]
       resources :invitations, only: %i[create update]
-      
+
       get 'projects/request_invitation', controller: :projects
     end
   end

db/schema.rb

@@ -3,25 +3,30 @@
 describe 'Usuário curte uma publicação ou comentário' do
   context 'não esta logado' do
     it 'e tenta curtir' do
-      post likes_path
+      post = create(:post)
+
+      post post_likes_path(post)
 
       expect(response).to redirect_to(new_user_session_path)
+      expect(Like.count).to eq 0
     end
 
     it 'e tenta descurtir uma publicação' do
       like = create(:like, :for_post)
 
-      delete like_path(like)
+      delete post_like_path(like.likeable, like)
 
       expect(response).to redirect_to(new_user_session_path)
+      expect(Like.count).to eq 1
     end
 
     it 'e tenta descurtir um comentário' do
       like = create(:like, :for_comment)
 
-      delete like_path(like)
+      delete comment_like_path(like.likeable, like)
 
       expect(response).to redirect_to(new_user_session_path)
+      expect(Like.count).to eq 1
     end
   end
 
@@ -30,9 +35,10 @@
 
     login_as like.user
 
-    post likes_path, params: { post_id: like.likeable.id }
+    post post_likes_path(like.likeable)
 
     expect(response).to redirect_to(post_path(like.likeable))
     expect(flash[:alert]).to eq 'Você já curtiu isso'
+    expect(Like.count).to eq 1
   end
 end