Merge pull request #17 from vigetlabs/comments

Comments

Author: paulmckissock

app/controllers/articles_controller.rb

@@ -6,6 +6,8 @@ def index
 
   def show
     @article = Article.find(params[:id])
+    @comments = @article.comments.order(created_at: :desc)
+    @comment = Comment.new
   end
 
   def new

app/controllers/comments_controller.rb

@@ -0,0 +1,22 @@
+class CommentsController < ApplicationController
+  before_action :authorized
+
+  def create
+    @article = Article.find(params[:article_id])
+    @comment = @article.comments.new(comment_params)
+    @comment.user = current_user
+
+    if @comment.save
+      redirect_to @article
+    else
+      @comments = @article.comments.order(created_at: :desc)
+      render "articles/show", status: :unprocessable_entity
+    end
+  end
+
+  private
+
+  def comment_params
+    params.require(:comment).permit(:text)
+  end
+end

app/models/article.rb

@@ -7,6 +7,7 @@
 
 class Article < ApplicationRecord
   belongs_to :user
+  has_many :comments
   validates :title, presence: true
   validates :link, presence: true
 end

app/models/comment.rb

@@ -0,0 +1,5 @@
+class Comment < ApplicationRecord
+  belongs_to :article
+  belongs_to :user
+  validates :text, presence: true
+end

app/models/user.rb

@@ -1,6 +1,7 @@
 class User < ApplicationRecord
   has_secure_password
   has_many :articles
+  has_many :comments
 
   validates :name, presence: true, uniqueness: true
   validates :email, presence: true, uniqueness: true, format: {with: URI::MailTo::EMAIL_REGEXP, message: "must be a valid email address"}

app/views/articles/show.html.erb

@@ -1,3 +1,20 @@
 <h1><%= @article.title %></h1>
 <p><%= link_to @article.link, @article.link %></p>
-<%= link_to 'Back to Home', root_path, class: 'btn btn-primary' %>
+
+<%= form_with(model: [@article, @comment], local: true) do |form| %>
+  <div class="field">
+    <%= form.text_area :text %>
+  </div>
+  <div class="actions">
+    <%= form.submit %>
+  </div>
+<% end %>
+
+<h2>Comments</h2>
+<ul>
+  <% @comments.each do |comment| %>
+    <li>
+      <%= comment.text %> - Posted by <%= comment.user.name %> on <%= comment.created_at.strftime("%B %d, %Y at %I:%M %p") %>
+    </li>
+  <% end %>
+</ul>

config/routes.rb

@@ -1,6 +1,8 @@
 Rails.application.routes.draw do
   root "articles#index"
-  resources :articles
+  resources :articles do
+    resources :comments, only: [:create]
+  end
   resources :users, only: [:create, :show]
   get "/signup", to: "users#new"
   get "/login", to: "sessions#new"

db/migrate/20240614183349_create_comments.rb

@@ -0,0 +1,10 @@
+class CreateComments < ActiveRecord::Migration[7.1]
+  def change
+    create_table :comments do |t|
+      t.string :text, null: false
+      t.references :article, null: false, foreign_key: true
+      t.references :user, null: false, foreign_key: true
+      t.timestamps
+    end
+  end
+end

db/schema.rb

@@ -10,6 +10,7 @@
 # Clear existing records
 User.destroy_all
 Article.destroy_all
+Comment.destroy_all
 
 # Create users
 users = [
@@ -37,3 +38,14 @@
     user: users.sample
   )
 end
+
+articles = Article.all
+
+# Create comments
+90.times do |i|
+  Comment.create!(
+    text: "Sample Comment #{i + 1}",
+    article: articles.sample,
+    user: users.sample
+  )
+end

db/seeds.rb

@@ -0,0 +1,35 @@
+require "test_helper"
+
+class CommentsControllerTest < ActionDispatch::IntegrationTest
+  def setup
+    @user = create(:user)
+    @article = create(:article, user: @user)
+    @comment_params = {text: "This is a test comment"}
+  end
+  test "should not create comment when not logged in" do
+    assert_no_difference "Comment.count" do
+      post article_comments_path(@article), params: {comment: @comment_params}
+    end
+    assert_redirected_to login_path
+  end
+
+  describe "when logged in" do
+    before do
+      @user = create(:user) # There are errors if I don't add this line. didn't need this in articles_controller_test
+      log_in_as(@user)
+    end
+
+    it "should create comment when logged in" do
+      assert_difference("Comment.count", 1) do
+        post article_comments_path(@article), params: {comment: @comment_params}
+      end
+      assert_redirected_to @article
+    end
+    it "should not create comment with invalid params" do
+      assert_no_difference "Comment.count" do
+        post article_comments_path(@article), params: {comment: {text: ""}}
+      end
+      assert_response :unprocessable_entity
+    end
+  end
+end

test/controllers/comments_controller_test.rb

@@ -0,0 +1,28 @@
+require "test_helper"
+
+class CommentTest < ActiveSupport::TestCase
+  def setup
+    @user = create(:user)
+    @article = create(:article, user: @user)
+    @comment = Comment.new(text: "This is a test comment", article: @article, user: @user)
+  end
+
+  test "should be valid" do
+    assert @comment.valid?
+  end
+
+  test "text should be present" do
+    @comment.text = " "
+    assert_not @comment.valid?
+  end
+
+  test "should belong to an article" do
+    @comment.article = nil
+    assert_not @comment.valid?
+  end
+
+  test "should belong to a user" do
+    @comment.user = nil
+    assert_not @comment.valid?
+  end
+end