Address review's feedback

fastruby · Sep 19, 2023 · c9a7282 · c9a7282
1 parent 49b4ed4
commit c9a7282
Show file tree

Hide file tree

Showing 6 changed files with 22 additions and 29 deletions.
diff --git a/app/controllers/comments_controller.rb b/app/controllers/comments_controller.rb
@@ -9,7 +9,6 @@ def edit
   def create
     @comment = current_user.comments.build(story: @story)
     @comment.attributes = comment_params
-    @comment.user_id = current_user.id
     saved = @comment.save
     respond_to do |format|
       format.html do
@@ -21,7 +20,6 @@ def create
 
         redirect_to project_story_path(@comment.story.project_id, @comment.story_id)
       end
-      format.js
     end
   end
 
@@ -37,15 +35,14 @@ def update
           render :edit
         end
       end
-      format.js
     end
   end
 
   def destroy
     @comment.destroy
     respond_to do |format|
-      format.html { redirect_to project_story_path(@comment.story.project_id, @comment.story_id), notice: "comment was successfully destroyed." }
-      format.json { head :no_content }
+        flash[:success] = "Comment deleted!"
+        format.html { redirect_to project_story_path(@comment.story.project_id, @comment.story_id) }
     end
   end
 

diff --git a/app/controllers/stories_controller.rb b/app/controllers/stories_controller.rb
@@ -46,7 +46,7 @@ def bulk_destroy
 
   def show
     @estimate = Estimate.find_by(story: @story, user: current_user)
-    @comments = Comment.order("created_at").where(story: @story)
+    @comments = @story.comments.order(:created_at)
     @comment = Comment.new
   end
 

diff --git a/app/views/comments/_comment.html.erb b/app/views/comments/_comment.html.erb
@@ -1,7 +1,7 @@
 <div class="comment-card">
-  <p class="bold"><%= comment.user.name %>:</p>
-  <p><%= comment.body %></p>
-  <p><%= comment.created_at %><p>
-  <%= link_to "Edit Comment", edit_project_story_comment_path(@project.id, @story.id, comment.id), class: "link-blue" %> |
-  <%= link_to "Delete", project_story_comment_path(@project.id, @story.id, comment.id), method: :delete, data: { confirm: "Are you sure?", comment_id: @comment.id }, remote: true , title: "Delete" %>
+  <p class="bold"><%= comment.user.name %>: <%= markdown(comment.body) %> <%= comment.created_at %><p>
+  <% if current_user == comment.user %>
+    <%= link_to "Edit Comment", edit_project_story_comment_path(@project.id, @story.id, comment.id), class: "link-blue" %> |
+    <%= link_to "Delete", project_story_comment_path(@project.id, @story.id, comment.id), method: :delete, data: { confirm: "Are you sure?", comment_id: @comment.id }, remote: true , title: "Delete" %>
+  <% end %>
 </div>
diff --git a/app/views/comments/_form.html.erb b/app/views/comments/_form.html.erb
@@ -1,7 +1,5 @@
-<div>
-  <%= form_with model: [@project, @story, @comment] do |form| %>
-    <%= form.text_area :body, rows: 6 %>
-    <%= form.submit class: "button green"%>
-    <%= link_to "Back", project_story_path(@comment.story.project_id, @comment.story_id), id:"back", class: "button" if action_name == "edit" %>
-  <% end %>
-</div>
+<%= form_with model: [project, story, comment] do |form| %>
+  <%= form.text_area :body, rows: 6 %>
+  <%= form.submit class: "button green"%>
+  <%= link_to "Back", project_story_path(comment.story.project_id, @comment.story_id), id:"back", class: "button" if action_name == "edit" %>
+<% end %>
diff --git a/app/views/stories/show.html.erb b/app/views/stories/show.html.erb
@@ -11,14 +11,12 @@
     <% end %>
   </div>
 
-  <% if @comments %>
-    <div class="comments-section">
-      <h4>Comments</h4>
-      <% @comments.each do |comment| %>
-        <%= render "comments/comment", story: @story, project: @project, comment: comment %>
-      <% end %>
-    </div>
-  <% end %>
+  <div class="comments-section">
+    <h4>Comments</h4>
+    <% @comments.each do |comment| %>
+      <%= render "comments/comment", story: @story, project: @project, comment: comment %>
+    <% end %>
+  </div>
 
   <div class="comment-form-container">
     <p class="bold">Add a new comment</p>

diff --git a/spec/controllers/comments_controller_spec.rb b/spec/controllers/comments_controller_spec.rb
@@ -47,7 +47,7 @@
       expect(response).to redirect_to project_story_path(project.id, story.id)
     end
 
-    it "disallows destroying another users' estimate" do
+    it "disallows destroying another users' comment" do
       user2 = FactoryBot.create(:user)
       comment2 = FactoryBot.create(:comment, story: story, user: user2)
 
@@ -73,7 +73,7 @@
   end
 
   describe "#edit as other user" do
-    it "disallows editing another users' estimate" do
+    it "disallows editing another users' comment" do
       user2 = FactoryBot.create(:user)
       comment2 = FactoryBot.create(:comment, story: story, user: user2)
 
@@ -97,7 +97,7 @@
       expect(comment.reload.body).to eq "test123"
     end
 
-    it "disallows updating another users' estimate" do
+    it "disallows updating another users' comment" do
       user2 = FactoryBot.create(:user)
       comment2 = FactoryBot.create(:comment, story: story, user: user2)