#1197 updated comment service references

pencilblue · Mar 14, 2017 · 64f519e · 64f519e
1 parent db87b0f
commit 64f519e
Show file tree

Hide file tree

Showing 7 changed files with 63 additions and 43 deletions.
diff --git a/controllers/base_controller.js b/controllers/base_controller.js
@@ -349,11 +349,12 @@ var uuid = require('uuid');
     /**
      * Retrieves a context object that contains the necessary information for
      * service prototypes
-     * @method getServiceContext
+     * @param {object} [base] The custom set of attributes that should be provided.  Any items from the derived context
+     * will override the base attributes
      * @return {Object}
      */
-    BaseController.prototype.getServiceContext = function(){
-        return Object.assign({}, this.context);
+    BaseController.prototype.getServiceContext = function(base){
+        return Object.assign(base || {}, this.context);
     };
 
     /**

diff --git a/include/service/entities/content/content_view_loader.js b/include/service/entities/content/content_view_loader.js
@@ -64,7 +64,7 @@ class ContentViewLoader {
          * @property commentService
          * @type {CommentService}
          */
-        this.commentService = context.commentService || new CommentService(context);
+        this.commentService = context.commentService;
     }
 
     /**

diff --git a/plugins/pencilblue/controllers/api/content/get_articles.js b/plugins/pencilblue/controllers/api/content/get_articles.js
@@ -22,10 +22,10 @@ var async = require('async');
 module.exports = function(pb) {
 
     //pb dependencies
-    var util = pb.util;
-    var BaseController   = pb.BaseController;
-    var Comments         = pb.CommentService;
-    var ArticleServiceV2 = pb.ArticleServiceV2;
+    const ArticleServiceV2 = pb.ArticleServiceV2;
+    const BaseController   = pb.BaseController;
+    const CommentService = pb.CommentService;
+    const util = pb.util;
 
     /**
      * Get articles within indices, for real time pagination
@@ -45,19 +45,20 @@ module.exports = function(pb) {
             var contentService = new pb.ContentService();
             contentService.getSettings(function(err, contentSettings) {
 
-                //set the content settings
-                self.contentSettings = contentSettings;
-
                 //create the service
-                var asContext = self.getServiceContext();
-                asContext.contentSettings = contentSettings;
-                self.service = new pb.ArticleServiceV2(asContext);
+                self.contentSettings = contentSettings;
+                self.service = new pb.ArticleServiceV2(self.getServiceContext({
+                    contentSettings: contentSettings
+                }));
 
                 //create the loader context
-                var cvlContext  = self.getServiceContext();
-                cvlContext.service = self.service;
-                cvlContext.contentSettings = contentSettings;
-                self.contentViewLoader = new pb.ContentViewLoader(cvlContext);
+                self.contentViewLoader = new pb.ContentViewLoader(self.getServiceContext({
+                    contentSettings: contentSettings,
+                    service: self.service,
+                    commentService: new CommentService(self.getServiceContext({
+                        articleService: self.service
+                    }))
+                }));
 
                 //call back
                 cb(err, !util.isError(err));

diff --git a/plugins/pencilblue/controllers/article.js b/plugins/pencilblue/controllers/article.js
@@ -18,7 +18,9 @@
 module.exports = function(pb) {
 
     //pb dependencies
-    var util = pb.util;
+    const util = pb.util;
+    const BaseController = pb.BaseController;
+    const CommentService = pb.CommentService;
 
     /**
      * Loads a single article
@@ -27,11 +29,11 @@ module.exports = function(pb) {
      * @extends BaseController
      */
     function ArticleViewController(){}
-    util.inherits(ArticleViewController, pb.BaseController);
+    util.inherits(ArticleViewController, BaseController);
 
     /**
      * @method init
-     * @param {Object} content
+     * @param {Object} context
      * @param {Function} cb
      */
     ArticleViewController.prototype.init = function(context, cb) {
@@ -45,9 +47,12 @@ module.exports = function(pb) {
             self.service = new pb.ArticleServiceV2(self.getServiceContext());
 
             //create the loader context
-            var context     = self.getServiceContext();
-            context.service = self.service;
-            self.contentViewLoader = new pb.ContentViewLoader(context);
+            self.contentViewLoader = new pb.ContentViewLoader(self.getServiceContext({
+                service: service,
+                commentService: new CommentService(self.getServiceContext({
+                    articleService: self.service
+                }))
+            }));
 
             cb(null, true);
         };

diff --git a/plugins/pencilblue/controllers/blog.js b/plugins/pencilblue/controllers/blog.js
@@ -18,7 +18,8 @@
 module.exports = function(pb) {
 
     //pb dependencies
-    var util = pb.util;
+    const CommentService = pb.CommentService;
+    const util = pb.util;
 
     /**
      * Loads a section
@@ -40,15 +41,18 @@ module.exports = function(pb) {
 
                 //create the service
                 self.contentSettings = contentSettings;
-                var asContext = self.getServiceContext();
-                asContext.contentSettings = contentSettings;
-                self.service = new pb.ArticleServiceV2(asContext);
+                self.service = new pb.ArticleServiceV2(self.getServiceContext({
+                    contentSettings: contentSettings
+                }));
 
                 //create the loader context
-                var cvlContext             = self.getServiceContext();
-                cvlContext.contentSettings = contentSettings;
-                cvlContext.service         = self.service;
-                self.contentViewLoader     = new pb.ContentViewLoader(cvlContext);
+                self.contentViewLoader = new pb.ContentViewLoader(self.getServiceContext({
+                    contentSettings: contentSettings,
+                    service: self.service,
+                    commentService: new CommentService(self.getServiceContext({
+                        articleService: self.service
+                    }))
+                }));
 
                 cb(null, true);
             });

diff --git a/plugins/pencilblue/controllers/page.js b/plugins/pencilblue/controllers/page.js
@@ -19,7 +19,8 @@
 module.exports = function(pb) {
 
     //pb dependencies
-    var util = pb.util;
+    const CommentService = pb.CommentService;
+    const util = pb.util;
 
     /**
      * Loads a single article
@@ -48,7 +49,10 @@ module.exports = function(pb) {
             //create the loader context
             var context     = self.getServiceContext();
             context.service = self.service;
-            self.contentViewLoader = new pb.ContentViewLoader(context);
+            self.contentViewLoader = new pb.ContentViewLoader(self.getServiceContext({
+                service: self.service,
+                commentService: new CommentService(self.getServiceContext())
+            }));
 
             cb(null, true);
         };

diff --git a/plugins/pencilblue/controllers/section.js b/plugins/pencilblue/controllers/section.js
@@ -19,7 +19,8 @@
 module.exports = function(pb) {
 
     //pb dependencies
-    var util = pb.util;
+    const CommentService = pb.CommentService;
+    const util = pb.util;
 
     /**
      * Loads a section
@@ -45,20 +46,24 @@ module.exports = function(pb) {
                 if (util.isError(err)) {
                     return cb(err);
                 }
+
                 //create the service
                 self.contentSettings = contentSettings;
-                var asContext = self.getServiceContext();
-                asContext.contentSettings = contentSettings;
-                self.service = new pb.ArticleServiceV2(asContext);
+                self.service = new pb.ArticleServiceV2(self.getServiceContext({
+                    contentSettings: contentSettings
+                }));
 
                 //create the loader context
-                var cvlContext             = self.getServiceContext();
-                cvlContext.contentSettings = contentSettings;
-                cvlContext.service         = self.service;
-                self.contentViewLoader     = new pb.ContentViewLoader(cvlContext);
+                self.contentViewLoader = new pb.ContentViewLoader(self.getServiceContext({
+                    contentSettings: contentSettings,
+                    service: self.service,
+                    commentService: new CommentService(self.getServiceContext({
+                        articleService: self.service
+                    }))
+                }));
 
                 //provide a dao
-                self.dao                   = new pb.DAO();
+                self.dao = new pb.DAO();
 
                 cb(null, true);
             });