From 3fc60c6b080e41d400769a376bb26c048fd2fa7a Mon Sep 17 00:00:00 2001 From: yichaulin Date: Fri, 22 Jul 2016 15:13:50 +0800 Subject: [PATCH 1/8] initialise commit in localhost --- Gemfile.lock | 144 ++++++++++++++++++++++-------------------- config/application.rb | 2 +- 2 files changed, 75 insertions(+), 71 deletions(-) diff --git a/Gemfile.lock b/Gemfile.lock index e1b93b6..fcadcf3 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -36,59 +36,61 @@ GEM minitest (~> 5.1) thread_safe (~> 0.3, >= 0.3.4) tzinfo (~> 1.1) - arel (6.0.0) - bcrypt (3.1.10) + arel (6.0.3) + bcrypt (3.1.11) binding_of_caller (0.7.2) debug_inspector (>= 0.0.1) builder (3.2.2) - byebug (5.0.0) - columnize (= 0.9.0) - coffee-rails (4.1.0) + byebug (9.0.5) + coffee-rails (4.1.1) coffee-script (>= 2.2.0) - railties (>= 4.0.0, < 5.0) + railties (>= 4.0.0, < 5.1.x) coffee-script (2.4.1) coffee-script-source execjs - coffee-script-source (1.9.1.1) - columnize (0.9.0) + coffee-script-source (1.10.0) + concurrent-ruby (1.0.2) debug_inspector (0.0.2) - devise (3.5.1) + devise (4.2.0) bcrypt (~> 3.0) orm_adapter (~> 0.1) - railties (>= 3.2.6, < 5) + railties (>= 4.1.0, < 5.1) responders - thread_safe (~> 0.1) warden (~> 1.2.3) diff-lcs (1.2.5) erubis (2.7.0) - execjs (2.5.2) - faker (1.4.3) + execjs (2.7.0) + faker (1.6.5) i18n (~> 0.5) - globalid (0.3.5) + globalid (0.3.6) activesupport (>= 4.1.0) i18n (0.7.0) - jbuilder (2.3.0) - activesupport (>= 3.0.0, < 5) + jbuilder (2.6.0) + activesupport (>= 3.0.0, < 5.1) multi_json (~> 1.2) - jquery-rails (4.0.4) - rails-dom-testing (~> 1.0) + jquery-rails (4.1.1) + rails-dom-testing (>= 1, < 3) railties (>= 4.2.0) thor (>= 0.14, < 2.0) json (1.8.3) - kaminari (0.16.3) + kaminari (0.17.0) actionpack (>= 3.0.0) activesupport (>= 3.0.0) - loofah (2.0.2) + loofah (2.0.3) nokogiri (>= 1.5.9) - mail (2.6.3) - mime-types (>= 1.16, < 3) - mime-types (2.6.1) - mini_portile (0.6.2) - minitest (5.7.0) - multi_json (1.11.1) - nokogiri (1.6.6.2) - mini_portile (~> 0.6.0) + mail (2.6.4) + mime-types (>= 1.16, < 4) + mime-types (3.1) + mime-types-data (~> 3.2015) + mime-types-data (3.2016.0521) + mini_portile2 (2.1.0) + minitest (5.9.0) + multi_json (1.12.1) + nokogiri (1.6.8) + mini_portile2 (~> 2.1.0) + pkg-config (~> 1.1.7) orm_adapter (0.5.0) + pkg-config (1.1.7) rack (1.6.4) rack-test (0.6.3) rack (>= 1.0) @@ -105,69 +107,71 @@ GEM sprockets-rails rails-deprecated_sanitizer (1.0.3) activesupport (>= 4.2.0.alpha) - rails-dom-testing (1.0.6) + rails-dom-testing (1.0.7) activesupport (>= 4.2.0.beta, < 5.0) nokogiri (~> 1.6.0) rails-deprecated_sanitizer (>= 1.0.1) - rails-html-sanitizer (1.0.2) + rails-html-sanitizer (1.0.3) loofah (~> 2.0) railties (4.2.2) actionpack (= 4.2.2) activesupport (= 4.2.2) rake (>= 0.8.7) thor (>= 0.18.1, < 2.0) - rake (10.4.2) - rdoc (4.2.0) - responders (2.1.0) - railties (>= 4.2.0, < 5) - rspec-core (3.3.2) - rspec-support (~> 3.3.0) - rspec-expectations (3.3.1) + rake (11.2.2) + rdoc (4.2.2) + json (~> 1.4) + responders (2.2.0) + railties (>= 4.2.0, < 5.1) + rspec-core (3.5.1) + rspec-support (~> 3.5.0) + rspec-expectations (3.5.0) diff-lcs (>= 1.2.0, < 2.0) - rspec-support (~> 3.3.0) - rspec-mocks (3.3.2) + rspec-support (~> 3.5.0) + rspec-mocks (3.5.0) diff-lcs (>= 1.2.0, < 2.0) - rspec-support (~> 3.3.0) - rspec-rails (3.3.3) - actionpack (>= 3.0, < 4.3) - activesupport (>= 3.0, < 4.3) - railties (>= 3.0, < 4.3) - rspec-core (~> 3.3.0) - rspec-expectations (~> 3.3.0) - rspec-mocks (~> 3.3.0) - rspec-support (~> 3.3.0) - rspec-support (3.3.0) - sass (3.4.15) - sass-rails (5.0.3) - railties (>= 4.0.0, < 5.0) + rspec-support (~> 3.5.0) + rspec-rails (3.5.1) + actionpack (>= 3.0) + activesupport (>= 3.0) + railties (>= 3.0) + rspec-core (~> 3.5.0) + rspec-expectations (~> 3.5.0) + rspec-mocks (~> 3.5.0) + rspec-support (~> 3.5.0) + rspec-support (3.5.0) + sass (3.4.22) + sass-rails (5.0.5) + railties (>= 4.0.0, < 6) sass (~> 3.1) sprockets (>= 2.8, < 4.0) sprockets-rails (>= 2.0, < 4.0) - tilt (~> 1.1) + tilt (>= 1.1, < 3) sdoc (0.4.1) json (~> 1.7, >= 1.7.7) rdoc (~> 4.0) - spring (1.3.6) - sprockets (3.2.0) - rack (~> 1.0) - sprockets-rails (2.3.2) - actionpack (>= 3.0) - activesupport (>= 3.0) - sprockets (>= 2.8, < 4.0) - sqlite3 (1.3.10) + spring (1.7.2) + sprockets (3.7.0) + concurrent-ruby (~> 1.0) + rack (> 1, < 3) + sprockets-rails (3.1.1) + actionpack (>= 4.0) + activesupport (>= 4.0) + sprockets (>= 3.0.0) + sqlite3 (1.3.11) thor (0.19.1) thread_safe (0.3.5) - tilt (1.4.1) - turbolinks (2.5.3) - coffee-rails + tilt (2.0.5) + turbolinks (5.0.0) + turbolinks-source (~> 5) + turbolinks-source (5.0.0) tzinfo (1.2.2) thread_safe (~> 0.1) - uglifier (2.7.1) - execjs (>= 0.3.0) - json (>= 1.8.0) - warden (1.2.3) + uglifier (3.0.0) + execjs (>= 0.3.0, < 3) + warden (1.2.6) rack (>= 1.0) - web-console (2.1.3) + web-console (2.3.0) activemodel (>= 4.0) binding_of_caller (>= 0.7.2) railties (>= 4.0) @@ -195,4 +199,4 @@ DEPENDENCIES web-console (~> 2.0) BUNDLED WITH - 1.10.5 + 1.12.5 diff --git a/config/application.rb b/config/application.rb index 4d3aa47..9ebd74d 100644 --- a/config/application.rb +++ b/config/application.rb @@ -1,7 +1,7 @@ require File.expand_path('../boot', __FILE__) require 'rails/all' - +require 'yaml' # Require the gems listed in Gemfile, including any gems # you've limited to :test, :development, or :production. Bundler.require(*Rails.groups) From e181fc51bddca0f0f55c1ea6fdeab551ebc99b5d Mon Sep 17 00:00:00 2001 From: yichaulin Date: Fri, 22 Jul 2016 15:39:13 +0800 Subject: [PATCH 2/8] add comment delete feature with Ajax --- app/controllers/comments_controller.rb | 6 +++++- app/views/comments/destroy.js.erb | 1 + app/views/messages/show.html.erb | 4 +++- 3 files changed, 9 insertions(+), 2 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..f7c354a 100644 --- a/app/controllers/comments_controller.rb +++ b/app/controllers/comments_controller.rb @@ -16,7 +16,11 @@ 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..1426a1e --- /dev/null +++ b/app/views/comments/destroy.js.erb @@ -0,0 +1 @@ +$("#comment-<%= @comment.id %>").remove(); diff --git a/app/views/messages/show.html.erb b/app/views/messages/show.html.erb index 41401f6..c04529a 100644 --- a/app/views/messages/show.html.erb +++ b/app/views/messages/show.html.erb @@ -19,13 +19,15 @@ <% @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, :data => { :confirm => "Are u sure?", :remote => true} %> <% end %>

+
<% end %> From c1741883998ee6ac324b69fbcac50555eebd3a50 Mon Sep 17 00:00:00 2001 From: yichaulin Date: Fri, 22 Jul 2016 15:46:54 +0800 Subject: [PATCH 3/8] fix N+1 problem --- app/controllers/messages_controller.rb | 2 ++ 1 file changed, 2 insertions(+) diff --git a/app/controllers/messages_controller.rb b/app/controllers/messages_controller.rb index 96f65e5..e76f719 100644 --- a/app/controllers/messages_controller.rb +++ b/app/controllers/messages_controller.rb @@ -18,6 +18,8 @@ def index # TODO: @messages = @messages.within_days(params[:days].to_i) @messages = @messages.where( ["created_at >= ?", Time.now - params[:days].to_i.days ] ) end + + @messages = @messages.includes(:comments, :user) end def show From ee8a359fd9ac4da9f02e87e55b98092578892819 Mon Sep 17 00:00:00 2001 From: yichaulin Date: Fri, 22 Jul 2016 15:58:59 +0800 Subject: [PATCH 4/8] restructure by using model scope --- app/controllers/messages_controller.rb | 10 +++------- app/models/message.rb | 4 ++++ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/app/controllers/messages_controller.rb b/app/controllers/messages_controller.rb index e76f719..062da50 100644 --- a/app/controllers/messages_controller.rb +++ b/app/controllers/messages_controller.rb @@ -3,20 +3,16 @@ class MessagesController < ApplicationController before_action :authenticate_user!, :except => [:index, :show] def index - # TODO: fix N+1 queries for user and comments @messages = Message.order("id DESC").page( params[:page] ) 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.within_days(params[:days].to_i) end @messages = @messages.includes(:comments, :user) diff --git a/app/models/message.rb b/app/models/message.rb index e24a8b2..97034c4 100644 --- a/app/models/message.rb +++ b/app/models/message.rb @@ -4,6 +4,10 @@ class Message < ActiveRecord::Base has_many :comments, :dependent => :destroy + scope :pending, -> { where( :status => "pending" ) } + scope :completed, -> { where( :status => "completed" ) } + scope :within_days, ->(before_days) { where( ["created_at >= ?", Time.now - before_days.days ] ) } + def last_comment_summary self.comments.last.try(:content).try(:truncate, 20) end From 93e2adc260b5783e7ede9e412d66b524ee0cdeda Mon Sep 17 00:00:00 2001 From: yichaulin Date: Fri, 22 Jul 2016 16:04:33 +0800 Subject: [PATCH 5/8] add posts_count method in user model --- Gemfile | 2 +- Gemfile.lock | 9 --------- app/models/user.rb | 3 ++- 3 files changed, 3 insertions(+), 11 deletions(-) diff --git a/Gemfile b/Gemfile index bde2f2e..7c0a1b5 100644 --- a/Gemfile +++ b/Gemfile @@ -43,7 +43,7 @@ group :development, :test do gem 'byebug' # Access an IRB console on exception pages or by using <%= console %> in views - gem 'web-console', '~> 2.0' + # gem 'web-console', '~> 2.0', group: :development # Spring speeds up development by keeping your application running in the background. Read more: https://github.com/rails/spring gem 'spring' diff --git a/Gemfile.lock b/Gemfile.lock index fcadcf3..c5b945b 100644 --- a/Gemfile.lock +++ b/Gemfile.lock @@ -38,8 +38,6 @@ GEM tzinfo (~> 1.1) arel (6.0.3) bcrypt (3.1.11) - binding_of_caller (0.7.2) - debug_inspector (>= 0.0.1) builder (3.2.2) byebug (9.0.5) coffee-rails (4.1.1) @@ -50,7 +48,6 @@ GEM execjs coffee-script-source (1.10.0) concurrent-ruby (1.0.2) - debug_inspector (0.0.2) devise (4.2.0) bcrypt (~> 3.0) orm_adapter (~> 0.1) @@ -171,11 +168,6 @@ GEM execjs (>= 0.3.0, < 3) warden (1.2.6) rack (>= 1.0) - web-console (2.3.0) - activemodel (>= 4.0) - binding_of_caller (>= 0.7.2) - railties (>= 4.0) - sprockets-rails (>= 2.0, < 4.0) PLATFORMS ruby @@ -196,7 +188,6 @@ DEPENDENCIES sqlite3 turbolinks uglifier (>= 1.3.0) - web-console (~> 2.0) BUNDLED WITH 1.12.5 diff --git a/app/models/user.rb b/app/models/user.rb index 6d01aa9..48ff065 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -12,7 +12,8 @@ def display_name end def posts_count - # TODO: 請完成我 + # TODO: 我完成了 + self.messages.size + self.comments.size end def words_count From 60e455762ebdc3c8dab4f0d7f188439a9bad9486 Mon Sep 17 00:00:00 2001 From: yichaulin Date: Fri, 22 Jul 2016 16:14:00 +0800 Subject: [PATCH 6/8] add user.word_count rspec --- spec/models/user_spec.rb | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/spec/models/user_spec.rb b/spec/models/user_spec.rb index 528cc38..aa3f9ea 100644 --- a/spec/models/user_spec.rb +++ b/spec/models/user_spec.rb @@ -25,11 +25,18 @@ describe "#words_count" do before do # TODO: 加 Message 和 Comment 測試資料 + @user = User.create!( :email => "ooxx@example.org", :password => "12345678") + + m = Message.create!( :user => @user, :content => "Who's your daddy?" ) + Comment.create!( :user => @user, :message => m, :content => "Fuck you" ) + end it "加總該使用者的所有 Mesasge 和 Comment 的總字數" do # TODO: 測試 words_count 方法 + expect(@user.words_count).to eq(5) + end end From 9362a8bf91a2577e8562d828a4b1227a1baa8f27 Mon Sep 17 00:00:00 2001 From: yichaulin Date: Fri, 22 Jul 2016 16:29:39 +0800 Subject: [PATCH 7/8] add api for getting all messages --- app/controllers/api/v1/messages_controller.rb | 20 +++++++++++++++++++ app/controllers/api_controller.rb | 2 ++ config/routes.rb | 6 ++++++ 3 files changed, 28 insertions(+) create mode 100644 app/controllers/api/v1/messages_controller.rb create mode 100644 app/controllers/api_controller.rb diff --git a/app/controllers/api/v1/messages_controller.rb b/app/controllers/api/v1/messages_controller.rb new file mode 100644 index 0000000..a3953ac --- /dev/null +++ b/app/controllers/api/v1/messages_controller.rb @@ -0,0 +1,20 @@ +class Api::V1::MessagesController < ApiController + + def index + # 列出所有 Message 訊息，包括 id, status, category_name, title, content 和 created_at。 + + messages = Message.all + + datas = [] + + messages.each do |m| + datas << {:id => m.id, :status => m.status, :category_name => m.category_name, + :title => m.title, :content => m.content, :created_at => m.created_at} + end + + result = {:datas => datas} + + render :json => result.to_json, :status => 200 + + end +end \ No newline at end of file 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/config/routes.rb b/config/routes.rb index 74d4dbf..62a212c 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -5,6 +5,12 @@ resources :comments end + #GET /api/v1/messages + + scope :path => "api/v1", :module => "api/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". From 46346645bdd3f8e487107268bd195b91c936bde2 Mon Sep 17 00:00:00 2001 From: yichaulin Date: Fri, 22 Jul 2016 16:53:38 +0800 Subject: [PATCH 8/8] add subscribed_user and liked_user relation model --- app/controllers/messages_controller.rb | 3 +++ app/models/message.rb | 12 ++++++++++++ app/models/user.rb | 7 +++++++ app/models/user_like_message_relation.rb | 4 ++++ app/models/user_subscribe_message_relation.rb | 4 ++++ app/views/messages/show.html.erb | 11 +++++++++++ ...2083407_create_user_like_message_relations.rb | 9 +++++++++ ...24_create_user_subscribe_message_relations.rb | 9 +++++++++ db/schema.rb | 16 +++++++++++++++- lib/tasks/dev.rake | 9 +++++++++ spec/models/user_like_message_relation_spec.rb | 5 +++++ .../user_subscribe_message_relation_spec.rb | 5 +++++ 12 files changed, 93 insertions(+), 1 deletion(-) create mode 100644 app/models/user_like_message_relation.rb create mode 100644 app/models/user_subscribe_message_relation.rb create mode 100644 db/migrate/20160722083407_create_user_like_message_relations.rb create mode 100644 db/migrate/20160722083424_create_user_subscribe_message_relations.rb create mode 100644 spec/models/user_like_message_relation_spec.rb create mode 100644 spec/models/user_subscribe_message_relation_spec.rb diff --git a/app/controllers/messages_controller.rb b/app/controllers/messages_controller.rb index 062da50..ef7b548 100644 --- a/app/controllers/messages_controller.rb +++ b/app/controllers/messages_controller.rb @@ -21,6 +21,9 @@ def index def show @message = Message.find( params[:id] ) @comment = Comment.new + + @subscribed_users = @message.subscribed_users + @liked_users = @message.liked_users end def new diff --git a/app/models/message.rb b/app/models/message.rb index 97034c4..0ce5e1c 100644 --- a/app/models/message.rb +++ b/app/models/message.rb @@ -4,10 +4,22 @@ class Message < ActiveRecord::Base has_many :comments, :dependent => :destroy + has_many :user_like_message_relations + has_many :liked_users, :through => :user_like_message_relations, :source => :user + + has_many :user_subscribe_message_relations + has_many :subscribed_users, :through => :user_subscribe_message_relations, :source => :user + + + + scope :pending, -> { where( :status => "pending" ) } scope :completed, -> { where( :status => "completed" ) } scope :within_days, ->(before_days) { where( ["created_at >= ?", Time.now - before_days.days ] ) } + + + def last_comment_summary self.comments.last.try(:content).try(:truncate, 20) end diff --git a/app/models/user.rb b/app/models/user.rb index 48ff065..ef55a0d 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -7,6 +7,13 @@ class User < ActiveRecord::Base has_many :messages has_many :comments + has_many :user_like_message_relations + has_many :liked_messages, :through => :user_like_message_relations, :source => :message + + has_many :user_subscribe_message_relations + has_many :subscribed_messages, :through => :user_subscribe_message_relations, :source => :message + + def display_name self.email.split("@").first end diff --git a/app/models/user_like_message_relation.rb b/app/models/user_like_message_relation.rb new file mode 100644 index 0000000..d5b15cd --- /dev/null +++ b/app/models/user_like_message_relation.rb @@ -0,0 +1,4 @@ +class UserLikeMessageRelation < ActiveRecord::Base + belongs_to :user + belongs_to :message +end diff --git a/app/models/user_subscribe_message_relation.rb b/app/models/user_subscribe_message_relation.rb new file mode 100644 index 0000000..6337f8a --- /dev/null +++ b/app/models/user_subscribe_message_relation.rb @@ -0,0 +1,4 @@ +class UserSubscribeMessageRelation < ActiveRecord::Base + belongs_to :user + belongs_to :message +end diff --git a/app/views/messages/show.html.erb b/app/views/messages/show.html.erb index c04529a..1c829a7 100644 --- a/app/views/messages/show.html.erb +++ b/app/views/messages/show.html.erb @@ -17,6 +17,17 @@ <% end %> +

Liked Users

+<% @liked_users.each do |user| %> +

<%=user.email %>

+<% end %> + +

Subscribed Users

+<% @subscribed_users.each do |user| %> +

<%=user.email %>

+<% end %> + +

Comments

<% @message.comments.each do |comment| %>
diff --git a/db/migrate/20160722083407_create_user_like_message_relations.rb b/db/migrate/20160722083407_create_user_like_message_relations.rb new file mode 100644 index 0000000..d1e373a --- /dev/null +++ b/db/migrate/20160722083407_create_user_like_message_relations.rb @@ -0,0 +1,9 @@ +class CreateUserLikeMessageRelations < ActiveRecord::Migration + def change + create_table :user_like_message_relations do |t| + t.integer :user_id + t.integer :message_id + t.timestamps null: false + end + end +end diff --git a/db/migrate/20160722083424_create_user_subscribe_message_relations.rb b/db/migrate/20160722083424_create_user_subscribe_message_relations.rb new file mode 100644 index 0000000..98db03d --- /dev/null +++ b/db/migrate/20160722083424_create_user_subscribe_message_relations.rb @@ -0,0 +1,9 @@ +class CreateUserSubscribeMessageRelations < ActiveRecord::Migration + def change + create_table :user_subscribe_message_relations 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..6020ae5 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: 20160722083424) do create_table "comments", force: :cascade do |t| t.text "content" @@ -36,6 +36,20 @@ add_index "messages", ["status"], name: "index_messages_on_status" add_index "messages", ["user_id"], name: "index_messages_on_user_id" + create_table "user_like_message_relations", 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 "user_subscribe_message_relations", 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/lib/tasks/dev.rake b/lib/tasks/dev.rake index 4673e72..31b38e6 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 + + User.all.sample(2).each do |user| + m.user_like_message_relations.create(:user_id => user.id) + end + + User.all.sample(2).each do |user| + m.user_subscribe_message_relations.create(:user_id => user.id) + end + end end diff --git a/spec/models/user_like_message_relation_spec.rb b/spec/models/user_like_message_relation_spec.rb new file mode 100644 index 0000000..a01e58d --- /dev/null +++ b/spec/models/user_like_message_relation_spec.rb @@ -0,0 +1,5 @@ +require 'rails_helper' + +RSpec.describe UserLikeMessageRelation, type: :model do + pending "add some examples to (or delete) #{__FILE__}" +end diff --git a/spec/models/user_subscribe_message_relation_spec.rb b/spec/models/user_subscribe_message_relation_spec.rb new file mode 100644 index 0000000..788f5ed --- /dev/null +++ b/spec/models/user_subscribe_message_relation_spec.rb @@ -0,0 +1,5 @@ +require 'rails_helper' + +RSpec.describe UserSubscribeMessageRelation, type: :model do + pending "add some examples to (or delete) #{__FILE__}" +end