Browse Source

Use addCondition methods

Taichi Masuyama 4 years ago
parent
commit
20168694d9

+ 4 - 1
packages/app/src/server/service/search-delegator/private-legacy-pages.ts

@@ -40,6 +40,9 @@ class PrivateLegacyPagesDelegator implements SearchDelegator<IPage, MongoTermsKe
     const findQueryBuilder = new PageQueryBuilder(Page.find());
     const findQueryBuilder = new PageQueryBuilder(Page.find());
     await findQueryBuilder.addConditionAsMigratablePages(user);
     await findQueryBuilder.addConditionAsMigratablePages(user);
 
 
+    this.addConditionByTerms(countQueryBuilder, terms);
+    this.addConditionByTerms(findQueryBuilder, terms);
+
     const total = await countQueryBuilder.query.count();
     const total = await countQueryBuilder.query.count();
 
 
     const _pages: PageDocument[] = await findQueryBuilder
     const _pages: PageDocument[] = await findQueryBuilder
@@ -62,7 +65,7 @@ class PrivateLegacyPagesDelegator implements SearchDelegator<IPage, MongoTermsKe
     };
     };
   }
   }
 
 
-  addConditionByTerms(builder: PageQueryBuilder, terms: MongoQueryTerms): PageQueryBuilder {
+  private addConditionByTerms(builder: PageQueryBuilder, terms: MongoQueryTerms): PageQueryBuilder {
     const {
     const {
       match, not_match: notMatch, prefix, not_prefix: notPrefix,
       match, not_match: notMatch, prefix, not_prefix: notPrefix,
     } = terms;
     } = terms;