Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions app/controllers/api_v1/messages_controller.rb
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
class ApiV1::MessagesController < ApplicationController
def index
@messages = Message.all
render :json => @messages.order("id DESC").to_json(only: [:id, :status, :category_name, :title, :content, :created_at])

end
end
4 changes: 3 additions & 1 deletion app/controllers/comments_controller.rb
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,9 @@ def destroy
@comment = current_user.comments.find( params[:id] )
@comment.destroy

redirect_to :back
respond_to do |format|
format.js
end
end

protected
Expand Down
26 changes: 20 additions & 6 deletions app/controllers/messages_controller.rb
Original file line number Diff line number Diff line change
@@ -1,22 +1,22 @@
class MessagesController < ApplicationController

before_action :authenticate_user!, :except => [:index, :show]

before_action :set_message, :only => :like
def index
# TODO: fix N+1 queries for user and comments
@messages = Message.order("id DESC").page( params[:page] )

@messages = Message.includes(:user, :comments).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
end

Expand Down Expand Up @@ -58,11 +58,25 @@ def destroy

redirect_to root_path
end
def like
if current_user.liked_message?(@message)
current_user.liked_messages.delete(@message)
else
current_user.liked_messages << @message
end
respond_to do |format|
format.html {redirect_to message_path(@message)}
format.js
end
end

protected

def message_params
params.require(:message).permit(:title, :content, :category_name)
end
def set_message
@message = Message.find( params[:id] )
end

end
4 changes: 4 additions & 0 deletions app/models/like.rb
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
class Like < ActiveRecord::Base
belongs_to :user
belongs_to :message
end
8 changes: 8 additions & 0 deletions app/models/message.rb
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,17 @@ class Message < ActiveRecord::Base
belongs_to :user

has_many :comments, :dependent => :destroy
has_many :likes, :dependent => :destroy
has_many :likes_users, :through => :likes, :source => :user
has_many :subscribes, :dependent => :destroy
has_many :subscribes_users, :through => :subscribes, :source => :user

def last_comment_summary
self.comments.last.try(:content).try(:truncate, 20)
end

scope :pending, -> {where( :status => "pending" )}
scope :completed, -> {where( :status => "completed" )}
scope :within_days, -> {where( ["created_at >= ?", Time.now - params[:days].to_i.days ] )}

end
4 changes: 4 additions & 0 deletions app/models/subscribe.rb
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
class Subscribe < ActiveRecord::Base
belongs_to :user
belongs_to :message
end
13 changes: 10 additions & 3 deletions app/models/user.rb
Original file line number Diff line number Diff line change
Expand Up @@ -6,13 +6,21 @@ class User < ActiveRecord::Base

has_many :messages
has_many :comments

has_many :likes, :dependent => :destroy
has_many :liked_messages, :through => :likes, :source => :message
has_many :subscribes, :dependent => :destroy
has_many :subscribed_messages, :through => :subscribes, :source => :message

def display_name
self.email.split("@").first
self.email.split("@").firstpe
end
def liked_message?(message) # "?"是希望得到true/false
self.liked_messages.include?(message)
end

def posts_count
# TODO: 請完成我
self.messages.count + self.comments.count
end

def words_count
Expand All @@ -28,5 +36,4 @@ def words_count

return count
end

end
1 change: 1 addition & 0 deletions app/views/comments/destroy.js.erb
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
$('#c-<%= @comment.id %>').remove();
5 changes: 5 additions & 0 deletions app/views/messages/_like.html.erb
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
<%if current_user.liked_message?(@message)%>
<%= button_to "Unlike", like_message_path(@message), :remote => true %>
<%else%>
<%= button_to "Like", like_message_path(@message), :remote => true %>
<%end%>
5 changes: 5 additions & 0 deletions app/views/messages/like.js.erb
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
<% if current_user.liked_message?(@message)%>
$("#like input[type=submit]").val("Unlike");
<%else%>
$("#like input[type=submit]").val("Like");
<%end%>
38 changes: 30 additions & 8 deletions app/views/messages/show.html.erb
Original file line number Diff line number Diff line change
Expand Up @@ -14,18 +14,40 @@
<p>
<%= f.submit %>
</p>


<% end %>
<div id="like">
<%= render :partial => "like"%>
</div>

<% @message.comments.each do |comment| %>
<div id="c-<%= comment.id %>">
<p><%= 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, :remote => true, :data => { :confirm => "Are u sure?"} %>
<% end %>
</p>
</div>

<% end %>














<% @message.comments.each do |comment| %>

<p><%= 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?"} %>
<% end %>
</p>

<% end %>

11 changes: 11 additions & 0 deletions config/routes.rb
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,19 @@

resources :messages do
resources :comments
member do
post :like
end
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".

Expand Down
22 changes: 21 additions & 1 deletion db/schema.rb
Original file line number Diff line number Diff line change
Expand Up @@ -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: 20161009042845) do

create_table "comments", force: :cascade do |t|
t.text "content"
Expand All @@ -23,6 +23,16 @@

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

add_index "likes", ["message_id"], name: "index_likes_on_message_id"
add_index "likes", ["user_id"], name: "index_likes_on_user_id"

create_table "messages", force: :cascade do |t|
t.string "title"
t.text "content"
Expand All @@ -36,6 +46,16 @@
add_index "messages", ["status"], name: "index_messages_on_status"
add_index "messages", ["user_id"], name: "index_messages_on_user_id"

create_table "subscribes", force: :cascade do |t|
t.datetime "created_at", null: false
t.datetime "updated_at", null: false
t.integer "user_id"
t.integer "message_id"
end

add_index "subscribes", ["message_id"], name: "index_subscribes_on_message_id"
add_index "subscribes", ["user_id"], name: "index_subscribes_on_user_id"

create_table "users", force: :cascade do |t|
t.string "email", default: "", null: false
t.string "encrypted_password", default: "", null: false
Expand Down
4 changes: 3 additions & 1 deletion spec/models/user_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -25,11 +25,13 @@
describe "#words_count" do
before do
# TODO: 加 Message 和 Comment 測試資料
m = Message.create!(user: @user, title: "global disaster", content: "cause many damage")
Comment.create!(user: @user, content: "typhoon is terrible", message: m)
end

it "加總該使用者的所有 Mesasge 和 Comment 的總字數" do
# TODO: 測試 words_count 方法

expect(@user.words_count).to eq(8)
end
end

Expand Down