From 2dbe071f969adc54fa392687f4f3928553361e55 Mon Sep 17 00:00:00 2001
From: Robin Ward <robin.ward@gmail.com>
Date: Fri, 11 Mar 2016 15:50:57 -0500
Subject: [PATCH] FIX: N+1 query, loadscript error

---
 .../initializers/enable-staff-notes.js.es6    | 15 ++++++-----
 plugin.rb                                     | 25 ++++++++++++++-----
 2 files changed, 28 insertions(+), 12 deletions(-)

diff --git a/assets/javascripts/discourse/initializers/enable-staff-notes.js.es6 b/assets/javascripts/discourse/initializers/enable-staff-notes.js.es6
index 498529a..3182571 100644
--- a/assets/javascripts/discourse/initializers/enable-staff-notes.js.es6
+++ b/assets/javascripts/discourse/initializers/enable-staff-notes.js.es6
@@ -1,5 +1,6 @@
 import { withPluginApi } from 'discourse/lib/plugin-api';
 import showModal from 'discourse/lib/show-modal';
+import loadScript from 'discourse/lib/load-script';
 
 export default {
   name: 'enable-staff-notes',
@@ -11,12 +12,14 @@ export default {
 
     withPluginApi('0.2', api => {
       function showStaffNotes(userId, callback) {
-        return store.find('staff-note', { user_id: userId }).then(model => {
-          const controller = showModal('staff-notes', { model, title: 'staff_notes.title' });
-          controller.reset();
-          controller.set('userId', userId);
-          controller.set('callback', callback);
-          return controller;
+        return loadScript('defer/html-sanitizer-bundle').then(() => {
+          return store.find('staff-note', { user_id: userId }).then(model => {
+            const controller = showModal('staff-notes', { model, title: 'staff_notes.title' });
+            controller.reset();
+            controller.set('userId', userId);
+            controller.set('callback', callback);
+            return controller;
+          });
         });
       }
 
diff --git a/plugin.rb b/plugin.rb
index e527189..573a19a 100644
--- a/plugin.rb
+++ b/plugin.rb
@@ -71,10 +71,7 @@ after_initialize do
     end
 
     def created_by
-      user = User.where(id: object[:created_by]).first
-      return nil if user.blank?
-
-      BasicUserSerializer.new(user, scope: scope, root: false)
+      BasicUserSerializer.new(object[:created_by], scope: scope, root: false)
     end
 
     def created_at
@@ -94,7 +91,7 @@ after_initialize do
       notes = ::DiscourseStaffNotes.notes_for(params[:user_id])
       render json: {
         extras: { username: user.username },
-        staff_notes: serialize_data(notes, ::StaffNoteSerializer)
+        staff_notes: create_json(notes)
       }
     end
 
@@ -103,7 +100,7 @@ after_initialize do
       raise Discourse::NotFound if user.blank?
       staff_note = ::DiscourseStaffNotes.add_note(user, params[:staff_note][:raw], current_user.id)
 
-      render json: serialize_data(staff_note, ::StaffNoteSerializer)
+      render json: create_json(staff_note)
     end
 
     def destroy
@@ -114,6 +111,22 @@ after_initialize do
       render json: success_json
     end
 
+    protected
+
+      def create_json(obj)
+        # Avoid n+1
+        if obj.is_a?(Array)
+          by_ids = {}
+          User.where(id: obj.map {|o| o[:created_by] }).each do |u|
+            by_ids[u.id] = u
+          end
+          obj.each {|o| o[:created_by] = by_ids[o[:created_by].to_i] }
+        else
+          obj[:created_by] = User.where(id: obj[:created_by]).first
+        end
+
+        serialize_data(obj, ::StaffNoteSerializer)
+      end
   end
 
   whitelist_staff_user_custom_field(STAFF_NOTE_COUNT_FIELD)