From 0205a12956603fda9ec77890a6ee41a1ad7aa7a0 Mon Sep 17 00:00:00 2001
From: Sam <sam.saffron@gmail.com>
Date: Fri, 10 Feb 2017 13:02:25 -0500
Subject: [PATCH] add user action and correct icon for small post

---
 .../initializers/extend-for-assigns.js.es6    | 10 ++-
 config/locales/client.en.yml                  |  1 +
 plugin.rb                                     | 67 +++++++++++--------
 3 files changed, 46 insertions(+), 32 deletions(-)

diff --git a/assets/javascripts/discourse/initializers/extend-for-assigns.js.es6 b/assets/javascripts/discourse/initializers/extend-for-assigns.js.es6
index 2073625..a18bca1 100644
--- a/assets/javascripts/discourse/initializers/extend-for-assigns.js.es6
+++ b/assets/javascripts/discourse/initializers/extend-for-assigns.js.es6
@@ -1,8 +1,12 @@
-//function initializeWithApi() {
-//};
-//
+import { withPluginApi } from 'discourse/lib/plugin-api';
+
+function initialize(api) {
+  api.addPostSmallActionIcon('assigned','user-plus');
+};
+
 export default {
   name: 'extend-for-assign',
   initialize() {
+    withPluginApi('0.8', initialize);
   }
 };
diff --git a/config/locales/client.en.yml b/config/locales/client.en.yml
index c64d045..a920f8d 100644
--- a/config/locales/client.en.yml
+++ b/config/locales/client.en.yml
@@ -3,6 +3,7 @@ en:
     action_codes:
       assigned: "assigned"
     discourse_assign:
+      assign_notification: "<i title='assigned' class='fa fa-user-plus'></i><p><span>{{username}}</span> {{description}}</p>"
       assign:
         title: "Assign"
         help: "Assign Topic to User"
diff --git a/plugin.rb b/plugin.rb
index 7593aa6..e89fbd6 100644
--- a/plugin.rb
+++ b/plugin.rb
@@ -4,24 +4,6 @@
 # authors: Sam Saffron
 
 after_initialize do
-  sql =<<SQL
-  CREATE TABLE IF NOT EXISTS assigned_users(
-    id SERIAL NOT NULL PRIMARY KEY,
-    topic_id integer NOT NULL,
-    assigned_to_id integer NOT NULL,
-    assigned_by_id integer,
-    created_at timestamp without time zone
-  )
-SQL
-
-  User.exec_sql(sql)
-
-
-  class ::AssignedUser < ActiveRecord::Base
-    belongs_to :topic
-    belongs_to :assigned_to, class_name: 'User'
-    belongs_to :assigned_by, class_name: 'User'
-  end
 
   module ::DiscourseAssign
     class Engine < ::Rails::Engine
@@ -33,6 +15,10 @@ SQL
   class ::DiscourseAssign::AssignController < Admin::AdminController
     before_filter :ensure_logged_in
 
+    def unassign
+      _topic_id = params.require(:topic_id)
+    end
+
     def assign
       topic_id = params.require(:topic_id)
       username = params.require(:username)
@@ -42,19 +28,42 @@ SQL
 
       raise Discourse::NotFound unless assign_to
 
-      assigned = AssignedUser.where(topic_id: topic.id).first_or_initialize
-      assigned.assigned_to_id = assign_to.id
-      assigned.assigned_by_id = current_user.id
-      assigned.save!
+      topic.custom_fields["assigned_to_id"] = assign_to.id
+      topic.custom_fields["assigned_by_id"] = current_user.id
+      topic.save!
 
-      topic.add_moderator_post(current_user,
-                               I18n.t('discourse_assign.assigned_to',
-                                       username: assign_to.username),
-                               { bump: false,
-                                 post_type: Post.types[:small_action],
-                                 action_code: "assigned"})
+      #Scheduler::Defer.later "add moderator post" do
 
-      render json: {status: "ok"}
+        UserAction.log_action!(action_type: UserAction::ASSIGNED,
+                              user_id: assign_to.id,
+                              acting_user_id: current_user.id,
+                              target_post_id: topic.posts.find_by(post_number: 1).id,
+                              target_topic_id: topic.id)
+
+        topic.add_moderator_post(current_user,
+                                 I18n.t('discourse_assign.assigned_to',
+                                         username: assign_to.username),
+                                 { bump: false,
+                                   post_type: Post.types[:small_action],
+                                   action_code: "assigned"})
+
+        unless false && current_user.id == assign_to.id
+
+          Notification.create!(notification_type: Notification.types[:custom],
+                             user_id: assign_to.id,
+                             topic_id: topic.id,
+                             post_number: 1,
+                             data: {
+                               message: 'discourse_assign.assign_notification',
+                               display_username: current_user.username,
+                               topic_title: topic.title
+                             }.to_json
+                            )
+        end
+
+      #end
+
+      render json: success_json
     end
 
     DiscourseAssign::Engine.routes.draw do