Use USER_PUBLIC_FIELDS of User model

lib/models/page.js

@@ -7,7 +7,6 @@ module.exports = function(crowi) {
     , GRANT_SPECIFIED = 3
     , GRANT_OWNER = 4
     , PAGE_GRANT_ERROR = 1
-    , USER_PUBLIC_FIELDS = '_id fbId image googleId name username email status createdAt' // TODO: どこか別の場所へ...
     , pageSchema;
 
   function isPortalPath(path) {
@@ -170,6 +169,7 @@ module.exports = function(crowi) {
 
   pageSchema.statics.populatePageData = function(pageData, revisionId) {
     var Page = crowi.model('Page');
+    var User = crowi.model('User');
 
     pageData.latestRevision = pageData.revision;
     if (revisionId) {
@@ -180,12 +180,12 @@ module.exports = function(crowi) {
 
     return new Promise(function(resolve, reject) {
       pageData.populate([
-        {path: 'creator', model: 'User', select: USER_PUBLIC_FIELDS},
+        {path: 'creator', model: 'User', select: User.USER_PUBLIC_FIELDS},
         {path: 'revision', model: 'Revision'},
         //{path: 'liker', options: { limit: 11 }},
         //{path: 'seenUsers', options: { limit: 11 }},
       ], function (err, pageData) {
-        Page.populate(pageData, {path: 'revision.author', model: 'User', select: USER_PUBLIC_FIELDS}, function(err, data) {
+        Page.populate(pageData, {path: 'revision.author', model: 'User', select: User.USER_PUBLIC_FIELDS}, function(err, data) {
           if (err) {
             return reject(err);
           }
@@ -198,12 +198,13 @@ module.exports = function(crowi) {
 
   pageSchema.statics.populatePageList = function(pageList) {
     var Page = self;
+    var User = crowi.model('User');
 
     return new Promise(function(resolve, reject) {
       Page.populate(
         pageList,
         [
-          {path: 'creator', model: 'User', select: USER_PUBLIC_FIELDS},
+          {path: 'creator', model: 'User', select: User.USER_PUBLIC_FIELDS},
           {path: 'revision', model: 'Revision'}
         ],
         function(err, pageList) {
@@ -211,7 +212,7 @@ module.exports = function(crowi) {
             return reject(err);
           }
 
-          Page.populate(pageList, {path: 'revision.author', model: 'User', select: USER_PUBLIC_FIELDS}, function(err, data) {
+          Page.populate(pageList, {path: 'revision.author', model: 'User', select: User.USER_PUBLIC_FIELDS}, function(err, data) {
             if (err) {
               return reject(err);
             }
@@ -376,6 +377,7 @@ module.exports = function(crowi) {
 
   pageSchema.statics.findListByPageIds = function(ids, option) {
     var Page = this;
+    var User = crowi.model('User');
     var limit = option.limit || 50;
     var offset = option.skip || 0;
 
@@ -391,7 +393,7 @@ module.exports = function(crowi) {
             return reject(err);
           }
 
-          Page.populate(pages, {path: 'revision.author', model: 'User', select: USER_PUBLIC_FIELDS}, function(err, data) {
+          Page.populate(pages, {path: 'revision.author', model: 'User', select: User.USER_PUBLIC_FIELDS}, function(err, data) {
             if (err) {
               return reject(err);
             }
@@ -404,6 +406,7 @@ module.exports = function(crowi) {
 
   pageSchema.statics.findListByCreator = function(user, option) {
     var Page = this;
+    var User = crowi.model('User');
     var limit = option.limit || 50;
     var offset = option.skip || 0;
 
@@ -419,7 +422,7 @@ module.exports = function(crowi) {
             return reject(err);
           }
 
-          Page.populate(pages, {path: 'revision.author', model: 'User', select: USER_PUBLIC_FIELDS}, function(err, data) {
+          Page.populate(pages, {path: 'revision.author', model: 'User', select: User.USER_PUBLIC_FIELDS}, function(err, data) {
             if (err) {
               return reject(err);
             }
@@ -432,6 +435,7 @@ module.exports = function(crowi) {
 
   pageSchema.statics.findListByStartWith = function(path, userData, option) {
     var Page = this;
+    var User = crowi.model('User');
 
     if (!option) {
       option = {sort: 'updatedAt', desc: -1, offset: 0, limit: 50};
@@ -470,7 +474,7 @@ module.exports = function(crowi) {
           return reject(err);
         }
 
-        Page.populate(pages, {path: 'revision.author', model: 'User', select: USER_PUBLIC_FIELDS}, function(err, data) {
+        Page.populate(pages, {path: 'revision.author', model: 'User', select: User.USER_PUBLIC_FIELDS}, function(err, data) {
           if (err) {
             return reject(err);
           }