Преглед изворни кода

rename a function for get page date from ES result

yusuketk пре 7 година
родитељ
комит
b4f8914c74
2 измењених фајлова са 5 додато и 5 уклоњено
  1. 4 4
      src/server/models/page.js
  2. 1 1
      src/server/routes/search.js

+ 4 - 4
src/server/models/page.js

@@ -749,9 +749,10 @@ module.exports = function(crowi) {
     return await findListFromBuilderAndViewer(builder, currentUser, showAnyoneKnowsLink, opt);
   };
 
-  pageSchema.statics.findListByPageIds = async function(ids, option) {
+  pageSchema.statics.getPageListByEsResult = async function(resultPages, option) {
     const User = crowi.model('User');
 
+    const ids = resultPages.map((page) => { return page._id });
     const opt = Object.assign({}, option);
     const builder = new PageQueryBuilder(this.find({ _id: { $in: ids } }));
 
@@ -765,11 +766,10 @@ module.exports = function(crowi) {
     builder.populateDataToList(User.USER_PUBLIC_FIELDS, User.IMAGE_POPULATION);
     const pages = await builder.query.exec('find');
     pages.map((page) => {
-      const elm = ids.find((data) => { return page.id === data._id });
-      page._doc.tags = elm._source.tag_names;
+      const data = resultPages.find((data) => { return page.id === data._id });
+      page._doc.tags = data._source.tag_names;
       return page;
     });
-
     const result = {
       pages, totalCount, offset: opt.offset, limit: opt.limit,
     };

+ 1 - 1
src/server/routes/search.js

@@ -69,7 +69,7 @@ module.exports = function(crowi, app) {
         scoreMap[esPage._id] = esPage._score;
       }
 
-      const findResult = await Page.findListByPageIds(esResult.data);
+      const findResult = await Page.getPageListByEsResult(esResult.data);
 
       result.meta = esResult.meta;
       result.totalCount = findResult.totalCount;