From 81a6b886367a2e170b4d51ed94905215adc4ea2b Mon Sep 17 00:00:00 2001 From: TzuYuan Date: Fri, 22 Jul 2016 18:14:55 +0800 Subject: [PATCH 1/9] Ajax delete comment --- app/controllers/comments_controller.rb | 8 +++++++- app/views/comments/destroy.js.erb | 1 + app/views/messages/show.html.erb | 7 ++++--- 3 files changed, 12 insertions(+), 4 deletions(-) create mode 100644 app/views/comments/destroy.js.erb diff --git a/app/controllers/comments_controller.rb b/app/controllers/comments_controller.rb index e9d6aaa..5318b5e 100644 --- a/app/controllers/comments_controller.rb +++ b/app/controllers/comments_controller.rb @@ -16,7 +16,13 @@ def destroy @comment = current_user.comments.find( params[:id] ) @comment.destroy - redirect_to :back + respond_to do |format| + format.html { + redirect_to :back + } + + format.js + end end protected diff --git a/app/views/comments/destroy.js.erb b/app/views/comments/destroy.js.erb new file mode 100644 index 0000000..e02f77e --- /dev/null +++ b/app/views/comments/destroy.js.erb @@ -0,0 +1 @@ +$("#comment-<%= @comment.id %>").remove(); \ No newline at end of file diff --git a/app/views/messages/show.html.erb b/app/views/messages/show.html.erb index 41401f6..6668207 100644 --- a/app/views/messages/show.html.erb +++ b/app/views/messages/show.html.erb @@ -18,14 +18,15 @@ <% end %> <% @message.comments.each do |comment| %> - +

<%= simple_format comment.content %> at <%= comment.created_at.to_s(:short) %> by <%= comment.user.display_name %> <% if comment.user == current_user %> <%# TODO: 修改成 AJAX 版本的刪除 %> - <%= link_to "Delete", message_comment_path(@message, comment), :method => :delete, :data => { :confirm => "Are u sure?"} %> + <%= link_to "Delete", message_comment_path(@message, comment), :method => :delete, remote: true %> + <% end %>

- +
<% end %> From df78984505273545787b74dfcf790049da70c79d Mon Sep 17 00:00:00 2001 From: TzuYuan Date: Fri, 22 Jul 2016 18:32:23 +0800 Subject: [PATCH 2/9] fix N + 1 queries --- app/controllers/messages_controller.rb | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/app/controllers/messages_controller.rb b/app/controllers/messages_controller.rb index 96f65e5..bfa34bd 100644 --- a/app/controllers/messages_controller.rb +++ b/app/controllers/messages_controller.rb @@ -4,7 +4,8 @@ class MessagesController < ApplicationController def index # TODO: fix N+1 queries for user and comments - @messages = Message.order("id DESC").page( params[:page] ) + #@messages = Message.order("id DESC").page( params[:page] ) + @messages = Message.includes(:comments).includes(:user).order("id DESC").page( params[:page] ) if params[:status] == "pending" # TODO: @messages = @messages.pending From c16a0344102fc5abe80becdc6f6aa4d7e5ad4a33 Mon Sep 17 00:00:00 2001 From: TzuYuan Date: Fri, 22 Jul 2016 19:13:26 +0800 Subject: [PATCH 3/9] refactoring scope --- app/controllers/messages_controller.rb | 7 ++++--- app/models/message.rb | 7 +++++++ 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/app/controllers/messages_controller.rb b/app/controllers/messages_controller.rb index bfa34bd..66a347e 100644 --- a/app/controllers/messages_controller.rb +++ b/app/controllers/messages_controller.rb @@ -9,15 +9,16 @@ def index if params[:status] == "pending" # TODO: @messages = @messages.pending - @messages = @messages.where( :status => "pending" ) + @messages = @messages.pending elsif params[:status] == "completed" # TODO: @messages = @messages.completed - @messages = @messages.where( :status => "completed" ) + @messages = @messages.completed end if params[:days] # TODO: @messages = @messages.within_days(params[:days].to_i) - @messages = @messages.where( ["created_at >= ?", Time.now - params[:days].to_i.days ] ) + #@messages = @messages.where( ["created_at >= ?", Time.now - params[:days].to_i.days ] ) + @messages.within_days(Time.now - 7.days) end end diff --git a/app/models/message.rb b/app/models/message.rb index e24a8b2..ab8af5b 100644 --- a/app/models/message.rb +++ b/app/models/message.rb @@ -7,5 +7,12 @@ class Message < ActiveRecord::Base def last_comment_summary self.comments.last.try(:content).try(:truncate, 20) end + + scope :pending, -> { where( :status => "pending" ) } + scope :completed, -> { where( :status => "completed" ) } + + def self.within_days(t=Time.now) + where("created_at >= ?", t) + end end From 16cbb6bc30bc2fe44d67751fa50c3fcc39d8c953 Mon Sep 17 00:00:00 2001 From: TzuYuan Date: Fri, 22 Jul 2016 20:00:49 +0800 Subject: [PATCH 4/9] add posts_count --- app/models/user.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/models/user.rb b/app/models/user.rb index 6d01aa9..ca3af8a 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -12,7 +12,7 @@ def display_name end def posts_count - # TODO: 請完成我 + self.messages.size + self.comments.size end def words_count From ae9834875b75a6b9caa385750ca23cfd003ec96c Mon Sep 17 00:00:00 2001 From: TzuYuan Date: Fri, 22 Jul 2016 21:02:26 +0800 Subject: [PATCH 5/9] add words_count unit test --- spec/models/user_spec.rb | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/spec/models/user_spec.rb b/spec/models/user_spec.rb index 528cc38..4c430dd 100644 --- a/spec/models/user_spec.rb +++ b/spec/models/user_spec.rb @@ -24,13 +24,17 @@ describe "#words_count" do before do - # TODO: 加 Message 和 Comment 測試資料 + other_user = User.create!( :email => "ooxx@example.org", :password => "12345678") + @user = other_user + m1 = Message.create!( :user => other_user, :title => "1", :content => "2" ) + Comment.create!( :user => other_user, :message => m1, :content => "3" ) end it "加總該使用者的所有 Mesasge 和 Comment 的總字數" do # TODO: 測試 words_count 方法 - + expect( @user.words_count ).to eq(3) end + end end From de9694e538b6d76d95810df8e76d86a23313b041 Mon Sep 17 00:00:00 2001 From: TzuYuan Date: Sat, 23 Jul 2016 21:24:48 +0800 Subject: [PATCH 6/9] Add messages api --- app/controllers/api_controller.rb | 2 ++ app/controllers/api_v1/messages_controller.rb | 5 +++++ app/views/api_v1/messages/index.json.jbuilder | 12 ++++++++++++ config/routes.rb | 5 +++++ .../api_v1/messages_controller_spec.rb | 5 +++++ spec/helpers/api_v1/messages_helper_spec.rb | 15 +++++++++++++++ 6 files changed, 44 insertions(+) create mode 100644 app/controllers/api_controller.rb create mode 100644 app/controllers/api_v1/messages_controller.rb create mode 100644 app/views/api_v1/messages/index.json.jbuilder create mode 100644 spec/controllers/api_v1/messages_controller_spec.rb create mode 100644 spec/helpers/api_v1/messages_helper_spec.rb diff --git a/app/controllers/api_controller.rb b/app/controllers/api_controller.rb new file mode 100644 index 0000000..75bb517 --- /dev/null +++ b/app/controllers/api_controller.rb @@ -0,0 +1,2 @@ +class ApiController < ActionController::Base +end \ No newline at end of file diff --git a/app/controllers/api_v1/messages_controller.rb b/app/controllers/api_v1/messages_controller.rb new file mode 100644 index 0000000..c1198d4 --- /dev/null +++ b/app/controllers/api_v1/messages_controller.rb @@ -0,0 +1,5 @@ +class ApiV1::MessagesController < ApiController + def index + @messages = Message.all + end +end diff --git a/app/views/api_v1/messages/index.json.jbuilder b/app/views/api_v1/messages/index.json.jbuilder new file mode 100644 index 0000000..c019c53 --- /dev/null +++ b/app/views/api_v1/messages/index.json.jbuilder @@ -0,0 +1,12 @@ + json.data @messages do |m| + json.id m.id + json.status m.status + if m.category_name + json.category_name m.category_name + else + json.category_name + end + json.title m.title + json.content m.content + json.created_at m.created_at + end \ No newline at end of file diff --git a/config/routes.rb b/config/routes.rb index 74d4dbf..6a95fbf 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -5,6 +5,11 @@ resources :comments end + + scope :path => '/api/v1/', :module => "api_v1", :as => 'v1', :defaults => { :format => :json } do + resources :messages + end + # The priority is based upon order of creation: first created -> highest priority. # See how all your routes lay out with "rake routes". diff --git a/spec/controllers/api_v1/messages_controller_spec.rb b/spec/controllers/api_v1/messages_controller_spec.rb new file mode 100644 index 0000000..e1f1525 --- /dev/null +++ b/spec/controllers/api_v1/messages_controller_spec.rb @@ -0,0 +1,5 @@ +require 'rails_helper' + +RSpec.describe ApiV1::MessagesController, type: :controller do + +end diff --git a/spec/helpers/api_v1/messages_helper_spec.rb b/spec/helpers/api_v1/messages_helper_spec.rb new file mode 100644 index 0000000..e078b0d --- /dev/null +++ b/spec/helpers/api_v1/messages_helper_spec.rb @@ -0,0 +1,15 @@ +require 'rails_helper' + +# Specs in this file have access to a helper object that includes +# the ApiV1::MessagesHelper. For example: +# +# describe ApiV1::MessagesHelper do +# describe "string concat" do +# it "concats two strings with spaces" do +# expect(helper.concat_strings("this","that")).to eq("this that") +# end +# end +# end +RSpec.describe ApiV1::MessagesHelper, type: :helper do + pending "add some examples to (or delete) #{__FILE__}" +end From 503ea7d73a244563f1140e87212392e0f661a3e1 Mon Sep 17 00:00:00 2001 From: TzuYuan Date: Sat, 23 Jul 2016 22:20:32 +0800 Subject: [PATCH 7/9] Q7-1 add like and subscription model, and add foreign keys --- app/models/like.rb | 4 ++++ app/models/message.rb | 4 ++++ app/models/subscription.rb | 4 ++++ app/models/user.rb | 4 ++++ .../20160723132640_create_subscriptions.rb | 9 +++++++++ db/migrate/20160723132702_create_likes.rb | 9 +++++++++ db/schema.rb | 16 +++++++++++++++- spec/models/like_spec.rb | 5 +++++ spec/models/subscription_spec.rb | 5 +++++ 9 files changed, 59 insertions(+), 1 deletion(-) create mode 100644 app/models/like.rb create mode 100644 app/models/subscription.rb create mode 100644 db/migrate/20160723132640_create_subscriptions.rb create mode 100644 db/migrate/20160723132702_create_likes.rb create mode 100644 spec/models/like_spec.rb create mode 100644 spec/models/subscription_spec.rb diff --git a/app/models/like.rb b/app/models/like.rb new file mode 100644 index 0000000..88c087f --- /dev/null +++ b/app/models/like.rb @@ -0,0 +1,4 @@ +class Like < ActiveRecord::Base + belongs_to :user + belongs_to :message +end diff --git a/app/models/message.rb b/app/models/message.rb index ab8af5b..5414dd7 100644 --- a/app/models/message.rb +++ b/app/models/message.rb @@ -1,6 +1,10 @@ class Message < ActiveRecord::Base belongs_to :user + has_many :subscriptions + has_many :likes + has_many :liked_users, :through => :likes, :source => :user + has_many :subscript_users, :through => :subscriptions, :source => :user has_many :comments, :dependent => :destroy diff --git a/app/models/subscription.rb b/app/models/subscription.rb new file mode 100644 index 0000000..24876ed --- /dev/null +++ b/app/models/subscription.rb @@ -0,0 +1,4 @@ +class Subscription < ActiveRecord::Base + belongs_to :user + belongs_to :message +end diff --git a/app/models/user.rb b/app/models/user.rb index ca3af8a..af92c9b 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -6,6 +6,10 @@ class User < ActiveRecord::Base has_many :messages has_many :comments + has_many :subscriptions + has_many :likes + has_many :like_messages, :through => :likes, :source => :message + has_many :like_subscriptions, :through => :subscriptions, :source => :like def display_name self.email.split("@").first diff --git a/db/migrate/20160723132640_create_subscriptions.rb b/db/migrate/20160723132640_create_subscriptions.rb new file mode 100644 index 0000000..a2ec9f8 --- /dev/null +++ b/db/migrate/20160723132640_create_subscriptions.rb @@ -0,0 +1,9 @@ +class CreateSubscriptions < ActiveRecord::Migration + def change + create_table :subscriptions do |t| + t.integer :user_id + t.integer :message_id + t.timestamps null: false + end + end +end diff --git a/db/migrate/20160723132702_create_likes.rb b/db/migrate/20160723132702_create_likes.rb new file mode 100644 index 0000000..3afd704 --- /dev/null +++ b/db/migrate/20160723132702_create_likes.rb @@ -0,0 +1,9 @@ +class CreateLikes < ActiveRecord::Migration + def change + create_table :likes do |t| + t.integer :user_id + t.integer :message_id + t.timestamps null: false + end + end +end diff --git a/db/schema.rb b/db/schema.rb index ef7b5c0..f177c1e 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -11,7 +11,7 @@ # # It's strongly recommended that you check this file into your version control system. -ActiveRecord::Schema.define(version: 20150728165437) do +ActiveRecord::Schema.define(version: 20160723132702) do create_table "comments", force: :cascade do |t| t.text "content" @@ -23,6 +23,13 @@ add_index "comments", ["message_id"], name: "index_comments_on_message_id" + create_table "likes", force: :cascade do |t| + t.integer "user_id" + t.integer "message_id" + t.datetime "created_at", null: false + t.datetime "updated_at", null: false + end + create_table "messages", force: :cascade do |t| t.string "title" t.text "content" @@ -36,6 +43,13 @@ add_index "messages", ["status"], name: "index_messages_on_status" add_index "messages", ["user_id"], name: "index_messages_on_user_id" + create_table "subscriptions", force: :cascade do |t| + t.integer "user_id" + t.integer "message_id" + t.datetime "created_at", null: false + t.datetime "updated_at", null: false + end + create_table "users", force: :cascade do |t| t.string "email", default: "", null: false t.string "encrypted_password", default: "", null: false diff --git a/spec/models/like_spec.rb b/spec/models/like_spec.rb new file mode 100644 index 0000000..76ea93d --- /dev/null +++ b/spec/models/like_spec.rb @@ -0,0 +1,5 @@ +require 'rails_helper' + +RSpec.describe Like, type: :model do + pending "add some examples to (or delete) #{__FILE__}" +end diff --git a/spec/models/subscription_spec.rb b/spec/models/subscription_spec.rb new file mode 100644 index 0000000..d40bf0b --- /dev/null +++ b/spec/models/subscription_spec.rb @@ -0,0 +1,5 @@ +require 'rails_helper' + +RSpec.describe Subscription, type: :model do + pending "add some examples to (or delete) #{__FILE__}" +end From b55af048c38e56df47fbce6bfcb79dc1a34ad1bb Mon Sep 17 00:00:00 2001 From: TzuYuan Date: Sat, 23 Jul 2016 23:36:31 +0800 Subject: [PATCH 8/9] Q7-2 add fake data: each message randomly be liked, subscript by two users --- lib/tasks/dev.rake | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/lib/tasks/dev.rake b/lib/tasks/dev.rake index 4673e72..be8e8f9 100644 --- a/lib/tasks/dev.rake +++ b/lib/tasks/dev.rake @@ -21,6 +21,15 @@ namespace :dev do m.comments.create!( :content => Faker::Lorem.paragraph, :user => users.sample ) end + + 1.times do + sample_id_1 = users.sample.id + sample_id_2 = users.sample.id + m.likes.create!( :user_id => sample_id_1 ) + m.subscriptions.create!( :user_id => sample_id_2 ) + end + + end end From dd8229b6d7b74493dfc870ac1091ddcf3aaaae08 Mon Sep 17 00:00:00 2001 From: TzuYuan Date: Sat, 23 Jul 2016 23:37:40 +0800 Subject: [PATCH 9/9] Q7-3 display message is liked, subscript by user in show --- app/views/messages/show.html.erb | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/app/views/messages/show.html.erb b/app/views/messages/show.html.erb index 6668207..8ebd32a 100644 --- a/app/views/messages/show.html.erb +++ b/app/views/messages/show.html.erb @@ -2,6 +2,16 @@ <%= simple_format @message.content %> +

This message is liked by:

+ <% @message.likes.each do |like| %> + <%= like.user.display_name %> + <% end %> + +

This message is subscript by:

+ <% @message.subscriptions.each do |subscription| %> + <%= subscription.user.display_name %> + <% end %> +

Comments list

<%= form_for [@message, @comment] do |f| %>