Skip to content
Open

Owen #49

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
3 changes: 3 additions & 0 deletions app/assets/javascripts/api_controller.coffee
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
# Place all the behaviors and hooks related to the matching controller here.
# All this logic will automatically be available in application.js.
# You can use CoffeeScript in this file: http://coffeescript.org/
3 changes: 3 additions & 0 deletions app/assets/javascripts/api_v1/messages.coffee
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
# Place all the behaviors and hooks related to the matching controller here.
# All this logic will automatically be available in application.js.
# You can use CoffeeScript in this file: http://coffeescript.org/
3 changes: 3 additions & 0 deletions app/assets/stylesheets/api_controller.scss
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
// Place all the styles related to the api_controller controller here.
// They will automatically be included in application.css.
// You can use Sass (SCSS) here: http://sass-lang.com/
3 changes: 3 additions & 0 deletions app/assets/stylesheets/api_v1/messages.scss
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
// Place all the styles related to the api_v1::messages controller here.
// They will automatically be included in application.css.
// You can use Sass (SCSS) here: http://sass-lang.com/
3 changes: 3 additions & 0 deletions app/controllers/api_controller_controller.rb
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
class ApiControllerController < ApplicationController

end
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
end

end
6 changes: 5 additions & 1 deletion app/controllers/comments_controller.rb
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,12 @@ def create
def destroy
@comment = current_user.comments.find( params[:id] )
@comment.destroy
respond_to do |format|
format.html { redirect_to :back }
format.js { render "/messages/comment_block"}
end

redirect_to :back

end

protected
Expand Down
10 changes: 5 additions & 5 deletions app/controllers/messages_controller.rb
Original file line number Diff line number Diff line change
Expand Up @@ -3,20 +3,20 @@ 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] )
# TODO: fix N+1 queries for user and comments done
@messages = Message.order("id DESC").includes(:user, :comments).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
2 changes: 2 additions & 0 deletions app/helpers/api_controller_helper.rb
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
module ApiControllerHelper
end
2 changes: 2 additions & 0 deletions app/helpers/api_v1/messages_helper.rb
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
module ApiV1::MessagesHelper
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 :message
belongs_to :user
end
9 changes: 9 additions & 0 deletions app/models/message.rb
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,15 @@ class Message < ActiveRecord::Base
belongs_to :user

has_many :comments, :dependent => :destroy
has_many :likes, :dependent => :destroy
has_many :likes_by, :through => :likes, :source => :user, :dependent => :destroy

has_many :subscriptions, :dependent => :destroy
has_many :subscriptions_by, :through => :likes, :source => :user, :dependent => :destroy

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

def last_comment_summary
self.comments.last.try(:content).try(:truncate, 20)
Expand Down
6 changes: 6 additions & 0 deletions app/models/subscription.rb
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
class Subscription < ActiveRecord::Base

belongs_to :message
belongs_to :user

end
9 changes: 9 additions & 0 deletions app/models/user.rb
Original file line number Diff line number Diff line change
Expand Up @@ -7,12 +7,21 @@ class User < ActiveRecord::Base
has_many :messages
has_many :comments

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

has_many :subscriptions, :dependent => :destroy
has_many :subscriptions_by, :through => :likes, :source => :message, :dependent => :destroy

def display_name
self.email.split("@").first
end

def posts_count
# TODO: 請完成我



end

def words_count
Expand Down
4 changes: 4 additions & 0 deletions app/views/api_v1/messages/index.json.jbuilder
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@

json.data do
json.array! @messages, :id, :status, :category_name, :title, :content, :created_at
end
3 changes: 3 additions & 0 deletions app/views/messages/comment_block.js.erb
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@

$("#comment-block-<%= @comment.id %>").remove();

23 changes: 14 additions & 9 deletions app/views/messages/show.html.erb
Original file line number Diff line number Diff line change
Expand Up @@ -18,14 +18,19 @@
<% 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>

<div id="comment-block-<%= comment.id %>">


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


</div>

<% end %>



7 changes: 7 additions & 0 deletions config/routes.rb
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,13 @@
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".

Expand Down
11 changes: 11 additions & 0 deletions db/migrate/20160722101806_create_subscriptions.rb
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
class CreateSubscriptions < ActiveRecord::Migration
def change
create_table :subscriptions do |t|

t.integer :user_id, index: :true
t.integer :message_id, index: :true
t.timestamps null: false

end
end
end
11 changes: 11 additions & 0 deletions db/migrate/20160722101811_create_likes.rb
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
class CreateLikes < ActiveRecord::Migration
def change
create_table :likes do |t|

t.integer :user_id, index: :true
t.integer :message_id, index: :true
t.timestamps null: false

end
end
end
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: 20160722101811) 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 "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

add_index "subscriptions", ["message_id"], name: "index_subscriptions_on_message_id"
add_index "subscriptions", ["user_id"], name: "index_subscriptions_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
5 changes: 5 additions & 0 deletions spec/controllers/api_controller_controller_spec.rb
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
require 'rails_helper'

RSpec.describe ApiControllerController, type: :controller do

end
5 changes: 5 additions & 0 deletions spec/controllers/api_v1/messages_controller_spec.rb
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
require 'rails_helper'

RSpec.describe ApiV1::MessagesController, type: :controller do

end
15 changes: 15 additions & 0 deletions spec/helpers/api_controller_helper_spec.rb
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
require 'rails_helper'

# Specs in this file have access to a helper object that includes
# the ApiControllerHelper. For example:
#
# describe ApiControllerHelper 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 ApiControllerHelper, type: :helper do
pending "add some examples to (or delete) #{__FILE__}"
end
15 changes: 15 additions & 0 deletions spec/helpers/api_v1/messages_helper_spec.rb
Original file line number Diff line number Diff line change
@@ -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
5 changes: 5 additions & 0 deletions spec/models/like_spec.rb
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
require 'rails_helper'

RSpec.describe Like, type: :model do
pending "add some examples to (or delete) #{__FILE__}"
end
5 changes: 5 additions & 0 deletions spec/models/subscription_spec.rb
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
require 'rails_helper'

RSpec.describe Subscription, type: :model do
pending "add some examples to (or delete) #{__FILE__}"
end