Merge remote-tracking branch 'origin/dev_aliyun' into dev_aliyun

app/controllers/comments_controller.rb

@@ -32,7 +32,12 @@ class CommentsController < ApplicationController
 
   # 列表
   def index
-    discusses = @hack.discusses.where(root_id: nil)
+    discusses =
+        if current_user.admin_or_business?
+          @hack.discusses.where(root_id: nil)
+        else
+          @hack.discusses.where(root_id: nil, hidden: false)
+        end
     @discusses_count = discusses.count
     @discusses= paginate discusses
   end
@@ -45,7 +50,8 @@ class CommentsController < ApplicationController
 
   # 隐藏、取消隐藏
   def hidden
-    if @hack.manager?(current_user)
+    if current_user.admin_or_business?
+      @discuss = @hack.discusses.where(id: params[:id]).first
       @discuss.update_attribute(:hidden, params[:hidden] == "1")
       sucess_status
     else

app/controllers/hacks_controller.rb

@@ -98,12 +98,20 @@ class HacksController < ApplicationController
   # 发布功能
   def publish
     @hack.update_attribute(:status, 1)
+    base_attrs = {
+        trigger_user_id: current_user.id, viewed: 0, tiding_type: 'System', user_id: @hack.user_id,
+    }
+    @hack.tidings.create!(base_attrs)
     render_ok
   end
 
   # 取消发布
   def cancel_publish
     @hack.update_attribute(:status, 0)
+    base_attrs = {
+        trigger_user_id: current_user.id, viewed: 0, tiding_type: 'System', user_id: @hack.user_id
+    }
+    @hack.tidings.create!(base_attrs)
     render_ok
   end
 

app/models/discuss.rb

@@ -52,16 +52,19 @@ class Discuss < ApplicationRecord
   private
 
   def send_tiding
-    base_attrs = {
-      trigger_user_id: user_id, parent_container_id: challenge_id, parent_container_type: 'Challenge',
-      belong_container_id: dis_id, belong_container_type: dis_type, viewed: 0, tiding_type: 'Comment'
-    }
-    user_id =
     if dis_type == 'Shixun'
-          has_parent? ? parent.user_id : Challenge.find(challenge_id).user_id
+      user_id = has_parent? ? parent.user_id : Challenge.find(challenge_id).user_id
+      parent_container_type = 'Challenge'
+      challenge_id = challenge_id
     elsif dis_type == 'Hack'
-          has_parent? ? parent.user_id : Hack.find(dis_id).user_id
+      user_id = has_parent? ? parent.user_id : Hack.find(dis_id).user_id
+      parent_container_type = 'Hack'
+      challenge_id = nil
     end
+    base_attrs = {
+        trigger_user_id: user_id, parent_container_id: challenge_id, parent_container_type: parent_container_type,
+        belong_container_id: dis_id, belong_container_type: dis_type, viewed: 0, tiding_type: 'Comment'
+    }
     tidings.create!(base_attrs.merge(user_id: user_id))
   end
 end

app/models/hack.rb

@@ -13,6 +13,8 @@ class Hack < ApplicationRecord
   has_many :discusses, as: :dis, dependent: :destroy
   # 点赞
   has_many :praise_treads, as: :praise_tread_object, dependent: :destroy
+  # 消息
+  has_many :tidings, as: :container, dependent: :destroy
 
   belongs_to :user
 
@@ -21,6 +23,8 @@ class Hack < ApplicationRecord
   scope :opening, -> {where(open_or_not: 1)}
   scope :mine, -> (author_id){ where(user_id: author_id) }
 
+  after_destroy :send_delete_tiding
+
   def language
     if hack_codes.count == 1
       hack_codes.first.language
@@ -49,4 +53,12 @@ class Hack < ApplicationRecord
     user_id == user.id || user.admin_or_business?
   end
 
+  private
+  def send_delete_tiding
+    base_attrs = {
+        user_id: user_id, viewed: 0, tiding_type: 'Delete', trigger_user_id: current_user.id
+    }
+    tidings.create!(base_attrs)
+  end
+
 end

app/models/praise_tread.rb

@@ -12,7 +12,7 @@ class PraiseTread < ApplicationRecord
     case self.praise_tread_object_type
       when  "Memo","Message","Issue"
         self.tidings << Tiding.new(:trigger_user_id => self.user_id, :user_id => self.praise_tread_object.author_id, :parent_container_id => self.praise_tread_object_id, :parent_container_type => self.praise_tread_object_type, :viewed => 0, :tiding_type => "Praise")
-      when "Discuss","Challenge","HomeworkCommon","JournalsForMessage","Journal","GraduationTopic","GraduationTask"
+      when "Discuss","Challenge","HomeworkCommon","JournalsForMessage","Journal","GraduationTopic","GraduationTask", "Hack"
         self.tidings << Tiding.new(:trigger_user_id => self.user_id, :user_id => self.praise_tread_object.user_id, :parent_container_id => self.praise_tread_object_id, :parent_container_type => self.praise_tread_object_type, :viewed => 0, :tiding_type => "Praise")
     end
   end

app/views/comments/_discuss.json.jbuilder

@@ -5,6 +5,7 @@ json.id discuss.id
 json.content content_safe(discuss.content)
 json.time time_from_now(discuss.created_at)
 json.hack_id discuss.dis_id
+json.hidden discuss.hidden
 # 主贴和回复有一些不同点
 if discuss.parent_id
   json.can_delete discuss.can_deleted?(current_user)

app/views/hack_user_lastest_codes/show.json.jbuilder

@@ -1,5 +1,5 @@
 json.hack do
-  json.(@hack, :name, :difficult, :time_limit, :description, :score, :identifier, :status, :praises_count)
+  json.(@hack, :id, :name, :difficult, :time_limit, :description, :score, :identifier, :status, :praises_count)
   json.language @hack.language
   json.username @hack.user.real_name
   json.code @my_hack.code
@@ -16,5 +16,6 @@ end
 json.user do
   json.partial! 'users/user', user: current_user
   json.hack_manager @hack.manager?(current_user)
+  json.admin current_user.admin_or_business?
 
 end

config/routes.rb

@@ -71,6 +71,8 @@ Rails.application.routes.draw do
       resources :comments do
         collection do
           post :reply
+        end
+        member do
           post :hidden
         end
       end