@chevre/domain 20.2.0-alpha.41 → 20.2.0-alpha.42

package/lib/chevre/repo/action.d.ts

@@ -35,7 +35,7 @@ export declare class MongoRepository {
     /**
      * アクション検索
      */
-    search<T extends factory.actionType>(params: factory.action.ISearchConditions, projection?: any): Promise<IAction<T>[]>;
+    search<T extends factory.actionType>(params: factory.action.ISearchConditions, inclusion: string[], exclusion: string[]): Promise<IAction<T>[]>;
     /**
      * アクション開始
      */

package/lib/chevre/repo/action.js

@@ -386,16 +386,28 @@ class MongoRepository {
     /**
      * アクション検索
      */
-    search(params, projection) {
+    search(params, inclusion, exclusion) {
         return __awaiter(this, void 0, void 0, function* () {
             const conditions = MongoRepository.CREATE_MONGO_CONDITIONS(params);
-            const query = this.actionModel.find((conditions.length > 0) ? { $and: conditions } : {}, (projection !== undefined && projection !== null)
-                ? projection
-                : {
+            let projection = {};
+            if (Array.isArray(inclusion) && inclusion.length > 0) {
+                inclusion.forEach((field) => {
+                    projection[field] = 1;
+                });
+            }
+            else {
+                projection = {
                     __v: 0,
                     createdAt: 0,
                     updatedAt: 0
-                });
+                };
+                if (Array.isArray(exclusion) && exclusion.length > 0) {
+                    exclusion.forEach((field) => {
+                        projection[field] = 0;
+                    });
+                }
+            }
+            const query = this.actionModel.find((conditions.length > 0) ? { $and: conditions } : {}, projection);
             if (typeof params.limit === 'number') {
                 const page = (typeof params.page === 'number') ? params.page : 1;
                 query.limit(params.limit)
@@ -507,7 +519,7 @@ class MongoRepository {
                 project: { id: { $eq: params.project.id } },
                 typeOf: { $eq: factory.actionType.PayAction },
                 object: { paymentMethod: { paymentMethodId: { $eq: params.paymentMethodId } } }
-            });
+            }, [], []);
             return payActions.shift();
         });
     }

package/lib/chevre/service/report/telemetry.js

@@ -181,7 +181,7 @@ function createSellerFlow(measuredFrom, measuredThrough, sellerId) {
         const actionsOnExpiredTransactions = yield repos.action.search({
             typeOf: { $eq: factory.actionType.AuthorizeAction },
             purpose: { id: { $in: expiredTransactionIds } }
-        });
+        }, [], []);
         debug(actionsOnExpiredTransactions.length, 'actionsOnExpiredTransactions found.');
         const numbersOfActionsOnExpired = expiredTransactionIds.map((transactionId) => {
             return actionsOnExpiredTransactions.filter((action) => action.purpose.id === transactionId).length;

package/package.json

@@ -120,5 +120,5 @@
     "postversion": "git push origin --tags",
     "prepublishOnly": "npm run clean && npm run build && npm test && npm run doc"
   },
-  "version": "20.2.0-alpha.41"
+  "version": "20.2.0-alpha.42"
 }