@chevre/domain 22.2.0-alpha.9 → 22.3.0-alpha.0

package/lib/chevre/repo/action.js

@@ -25,6 +25,30 @@ const factory = require("../factory");
 const settings_1 = require("../settings");
 const action_1 = require("./mongoose/schemas/action");
 const actionRecipe_1 = require("./mongoose/schemas/actionRecipe");
+const AVAILABLE_PROJECT_FIELDS = [
+    'project',
+    'actionStatus',
+    'typeOf',
+    'description',
+    'agent',
+    'recipient',
+    'result',
+    'error',
+    'object',
+    'startDate',
+    'endDate',
+    'purpose',
+    'potentialActions',
+    'amount',
+    'fromLocation',
+    'toLocation',
+    'instrument',
+    'location',
+    'replacer',
+    'targetCollection',
+    'sameAs',
+    'cancelAction'
+];
 /**
  * アクションリポジトリ
  */
@@ -432,24 +456,33 @@ class ActionRepo {
         var _a;
         return __awaiter(this, void 0, void 0, function* () {
             const conditions = ActionRepo.CREATE_MONGO_CONDITIONS(params);
-            let projection = {};
+            let positiveProjectionFields = AVAILABLE_PROJECT_FIELDS;
             if (Array.isArray(inclusion) && inclusion.length > 0) {
-                inclusion.forEach((field) => {
-                    projection[field] = 1;
-                });
+                positiveProjectionFields = inclusion.filter((key) => AVAILABLE_PROJECT_FIELDS.includes(key));
             }
             else {
-                projection = {
-                    __v: 0,
-                    createdAt: 0,
-                    updatedAt: 0
-                };
                 if (Array.isArray(exclusion) && exclusion.length > 0) {
-                    exclusion.forEach((field) => {
-                        projection[field] = 0;
-                    });
+                    positiveProjectionFields = positiveProjectionFields.filter((key) => !exclusion.includes(key));
                 }
             }
+            const projection = Object.assign({ _id: 0, id: { $toString: '$_id' } }, Object.fromEntries(positiveProjectionFields.map((key) => ([key, 1]))));
+            // let projection: { [key: string]: number } = {};
+            // 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' && params.limit > 0) {
                 const page = (typeof params.page === 'number' && params.page > 0) ? params.page : 1;
@@ -464,50 +497,36 @@ class ActionRepo {
             // const explainResult = await (<any>query).explain();
             // console.log(explainResult[0].executionStats.allPlansExecution.map((e: any) => e.executionStages.inputStage));
             return query.setOptions({ maxTimeMS: settings_1.MONGO_MAX_TIME_MS })
-                .exec()
-                .then((docs) => docs.map((doc) => doc.toObject()));
+                .lean() // 2024-08-26~
+                .exec();
         });
     }
     /**
      * アクション開始
      */
     start(attributes, options) {
+        var _a, _b;
         return __awaiter(this, void 0, void 0, function* () {
-            const startedAction = yield this.actionModel.create(Object.assign(Object.assign({}, attributes), { actionStatus: factory.actionStatusType.ActiveActionStatus, startDate: new Date() }))
-                .then((doc) => doc.toObject());
+            const startDate = new Date();
+            // const startedAction: IAction<T> = await this.actionModel.create<AnyKeys<IAction<T>>>({
+            //     ...attributes,
+            //     actionStatus: factory.actionStatusType.ActiveActionStatus,
+            //     startDate
+            // })
+            //     .then((doc) => doc.toObject());
+            const creatingAction = Object.assign(Object.assign({}, attributes), { actionStatus: factory.actionStatusType.ActiveActionStatus, startDate });
+            // reimplemnt with insertMany(2024-08-29~)
+            const result = yield this.actionModel.insertMany(creatingAction, { rawResult: true });
+            const id = (_b = (_a = result.insertedIds) === null || _a === void 0 ? void 0 : _a[0]) === null || _b === void 0 ? void 0 : _b.toHexString();
+            if (typeof id !== 'string') {
+                throw new factory.errors.Internal('action not saved');
+            }
             // add recipe(2024-06-09~)
             const savingRecipe = options === null || options === void 0 ? void 0 : options.recipe;
             if ((savingRecipe === null || savingRecipe === void 0 ? void 0 : savingRecipe.typeOf) === 'Recipe') {
-                yield this.upsertRecipe(Object.assign(Object.assign({}, savingRecipe), { recipeFor: { id: startedAction.id, typeOf: startedAction.typeOf } }));
-            }
-            return startedAction;
-        });
-    }
-    /**
-     * アクション完了
-     */
-    complete(params) {
-        var _a;
-        return __awaiter(this, void 0, void 0, function* () {
-            if (((_a = params.recipe) === null || _a === void 0 ? void 0 : _a.typeOf) === 'Recipe') {
-                yield this.upsertRecipe(Object.assign(Object.assign({}, params.recipe), { recipeFor: { id: params.id, typeOf: params.typeOf } }));
-            }
-            const doc = yield this.actionModel.findOneAndUpdate({
-                typeOf: { $eq: params.typeOf },
-                _id: { $eq: params.id }
-            }, {
-                $set: {
-                    actionStatus: factory.actionStatusType.CompletedActionStatus,
-                    result: params.result,
-                    endDate: new Date()
-                }
-            }, { new: true })
-                .select({ __v: 0, createdAt: 0, updatedAt: 0 })
-                .exec();
-            if (doc === null) {
-                throw new factory.errors.NotFound(this.actionModel.modelName);
+                yield this.upsertRecipe(Object.assign(Object.assign({}, savingRecipe), { recipeFor: { id, typeOf: creatingAction.typeOf } }));
             }
-            return doc.toObject();
+            return { id, startDate, typeOf: creatingAction.typeOf };
         });
     }
     completeWithVoid(params) {
@@ -526,6 +545,7 @@ class ActionRepo {
                     endDate: new Date()
                 }
             }, { new: false, projection: { _id: 1 } })
+                .lean()
                 .exec();
             if (doc === null) {
                 throw new factory.errors.NotFound(this.actionModel.modelName);
@@ -548,6 +568,7 @@ class ActionRepo {
                 $set: Object.assign({ actionStatus: factory.actionStatusType.CanceledActionStatus }, (cancelAction !== undefined) ? { cancelAction } : undefined // cancelAction連携(2024-05-26~)
                 )
             }, { new: false, projection: { _id: 1 } })
+                .lean()
                 .exec();
             if (doc === null) {
                 // 既にCanceledActionStatusであればok
@@ -564,32 +585,6 @@ class ActionRepo {
                 .exec();
         });
     }
-    /**
-     * アクション失敗
-     */
-    giveUpWithObject(params) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const actionError = (Array.isArray(params.error))
-                ? params.error.map((e) => (Object.assign(Object.assign({}, e), { message: e.message, name: e.name })))
-                : Object.assign(Object.assign({}, params.error), { message: params.error.message, name: params.error.name });
-            const doc = yield this.actionModel.findOneAndUpdate({
-                typeOf: { $eq: params.typeOf },
-                _id: { $eq: params.id }
-            }, {
-                $set: {
-                    actionStatus: factory.actionStatusType.FailedActionStatus,
-                    error: actionError,
-                    endDate: new Date()
-                }
-            }, { new: true })
-                .select({ __v: 0, createdAt: 0, updatedAt: 0 })
-                .exec();
-            if (doc === null) {
-                throw new factory.errors.NotFound(this.actionModel.modelName);
-            }
-            return doc.toObject();
-        });
-    }
     /**
      * アクション失敗
      */
@@ -611,8 +606,8 @@ class ActionRepo {
                     error: actionError,
                     endDate: new Date()
                 }
-            }, { new: true })
-                .select({ _id: 1 })
+            }, { new: true, projection: { _id: 1 } })
+                .lean()
                 .exec();
             if (doc === null) {
                 throw new factory.errors.NotFound(this.actionModel.modelName);
@@ -636,6 +631,7 @@ class ActionRepo {
                 },
                 $unset: { endDate: 1 }
             }, { new: false, projection: { _id: 1 } })
+                .lean()
                 .exec();
             if (doc === null) {
                 throw new factory.errors.NotFound(this.actionModel.modelName);
@@ -664,33 +660,43 @@ class ActionRepo {
     }
     findById(params, inclusion, exclusion) {
         return __awaiter(this, void 0, void 0, function* () {
-            let projection = {};
+            let positiveProjectionFields = AVAILABLE_PROJECT_FIELDS;
             if (Array.isArray(inclusion) && inclusion.length > 0) {
-                inclusion.forEach((field) => {
-                    projection[field] = 1;
-                });
+                positiveProjectionFields = inclusion.filter((key) => AVAILABLE_PROJECT_FIELDS.includes(key));
             }
             else {
-                projection = {
-                    __v: 0,
-                    createdAt: 0,
-                    updatedAt: 0
-                };
                 if (Array.isArray(exclusion) && exclusion.length > 0) {
-                    exclusion.forEach((field) => {
-                        projection[field] = 0;
-                    });
+                    positiveProjectionFields = positiveProjectionFields.filter((key) => !exclusion.includes(key));
                 }
             }
+            const projection = Object.assign({ _id: 0, id: { $toString: '$_id' } }, Object.fromEntries(positiveProjectionFields.map((key) => ([key, 1]))));
+            // let projection: { [key: string]: number } = {};
+            // 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 doc = yield this.actionModel.findOne({
                 typeOf: { $eq: params.typeOf },
                 _id: { $eq: params.id }
             }, projection)
+                .lean() // 2024-08-26~
                 .exec();
             if (doc === null) {
                 throw new factory.errors.NotFound(this.actionModel.modelName);
             }
-            return doc.toObject();
+            return doc;
         });
     }
     findPayAction(params) {
@@ -712,17 +718,60 @@ class ActionRepo {
     /**
      * 取引に対するアクションを検索する
      */
+    // tslint:disable-next-line:cyclomatic-complexity max-func-body-length
     searchByPurpose(params) {
-        var _a, _b, _c, _d, _e, _f, _g, _h;
+        var _a, _b, _c, _d, _e, _f;
         return __awaiter(this, void 0, void 0, function* () {
-            return this.search(Object.assign(Object.assign(Object.assign(Object.assign({ purpose: {
-                    id: { $in: [params.purpose.id] },
-                    typeOf: { $in: [params.purpose.typeOf] }
-                }, object: Object.assign(Object.assign({}, (typeof ((_b = (_a = params.object) === null || _a === void 0 ? void 0 : _a.typeOf) === null || _b === void 0 ? void 0 : _b.$eq) === 'string')
-                    ? { typeOf: { $eq: params.object.typeOf.$eq } }
-                    : undefined), (typeof ((_d = (_c = params.object) === null || _c === void 0 ? void 0 : _c.paymentMethodId) === null || _d === void 0 ? void 0 : _d.$eq) === 'string')
-                    ? { paymentMethodId: { $eq: params.object.paymentMethodId.$eq } }
-                    : undefined) }, (typeof ((_e = params.actionStatus) === null || _e === void 0 ? void 0 : _e.$eq) === 'string') ? { actionStatus: { $in: [params.actionStatus.$eq] } } : undefined), (typeof params.typeOf === 'string') ? { typeOf: { $eq: params.typeOf } } : undefined), (Array.isArray((_f = params.id) === null || _f === void 0 ? void 0 : _f.$nin)) ? { id: { $nin: (_g = params.id) === null || _g === void 0 ? void 0 : _g.$nin } } : undefined), (typeof ((_h = params.sort) === null || _h === void 0 ? void 0 : _h.startDate) === 'number') ? { sort: params.sort } : undefined), [], []);
+            const andConditions = [
+                { 'purpose.typeOf': { $exists: true, $eq: params.purpose.typeOf } },
+                { 'purpose.id': { $exists: true, $eq: params.purpose.id } }
+            ];
+            // const idNin = params.id?.$nin;
+            // if (Array.isArray(idNin)) {
+            //     andConditions.push({ _id: { $nin: idNin } });
+            // }
+            const objectPaymentMethodIdEq = (_b = (_a = params.object) === null || _a === void 0 ? void 0 : _a.paymentMethodId) === null || _b === void 0 ? void 0 : _b.$eq;
+            if (typeof objectPaymentMethodIdEq === 'string') {
+                andConditions.push({ 'object.paymentMethodId': { $exists: true, $eq: objectPaymentMethodIdEq } });
+            }
+            const objectTypeOfEq = (_d = (_c = params.object) === null || _c === void 0 ? void 0 : _c.typeOf) === null || _d === void 0 ? void 0 : _d.$eq;
+            if (typeof objectTypeOfEq === 'string') {
+                andConditions.push({ 'object.typeOf': { $exists: true, $eq: objectTypeOfEq } });
+            }
+            if (typeof params.typeOf === 'string') {
+                andConditions.push({ typeOf: { $eq: params.typeOf } });
+            }
+            const actionStatusEq = (_e = params.actionStatus) === null || _e === void 0 ? void 0 : _e.$eq;
+            if (typeof actionStatusEq === 'string') {
+                andConditions.push({ actionStatus: { $eq: actionStatusEq } });
+            }
+            const positiveProjectionFields = [
+                'project',
+                'actionStatus',
+                'typeOf',
+                'description',
+                'agent',
+                'recipient',
+                'result',
+                'error',
+                'object',
+                'startDate',
+                'endDate',
+                'purpose',
+                'potentialActions',
+                'instrument',
+                'location',
+                'sameAs',
+                'cancelAction'
+            ];
+            const projection = Object.assign({ _id: 0, id: { $toString: '$_id' } }, Object.fromEntries(positiveProjectionFields.map((key) => ([key, 1]))));
+            const query = this.actionModel.find((andConditions.length > 0) ? { $and: andConditions } : {}, projection);
+            if (typeof ((_f = params.sort) === null || _f === void 0 ? void 0 : _f.startDate) === 'number') {
+                query.sort({ startDate: params.sort.startDate });
+            }
+            return query.setOptions({ maxTimeMS: settings_1.MONGO_MAX_TIME_MS })
+                .lean()
+                .exec();
         });
     }
     /**
@@ -731,33 +780,43 @@ class ActionRepo {
     searchByOrderNumber(params) {
         var _a;
         return __awaiter(this, void 0, void 0, function* () {
-            const conditions = {
+            const filter = {
                 $or: [
-                    { 'object.orderNumber': params.orderNumber },
-                    { 'purpose.orderNumber': params.orderNumber }
+                    { 'object.orderNumber': { $eq: params.orderNumber } },
+                    { 'purpose.orderNumber': { $eq: params.orderNumber } }
                 ]
             };
-            const query = this.actionModel.find(conditions)
-                .select({ __v: 0, createdAt: 0, updatedAt: 0 });
+            const projection = Object.assign({ _id: 0, id: { $toString: '$_id' } }, Object.fromEntries(AVAILABLE_PROJECT_FIELDS.map((key) => ([key, 1]))));
+            const query = this.actionModel.find(filter, projection);
+            // .select({ __v: 0, createdAt: 0, updatedAt: 0 });
             // tslint:disable-next-line:no-single-line-block-comment
             /* istanbul ignore else */
             if (((_a = params.sort) === null || _a === void 0 ? void 0 : _a.startDate) !== undefined) {
                 query.sort({ startDate: params.sort.startDate });
             }
-            return query.exec()
-                .then((docs) => docs.map((doc) => doc.toObject()));
+            return query
+                .lean() // 2024-08-26~
+                .exec();
         });
     }
     searchBySameAs(params) {
         var _a;
         return __awaiter(this, void 0, void 0, function* () {
+            const projection = {
+                _id: 0,
+                id: { $toString: '$_id' },
+                actionStatus: 1,
+                error: 1,
+                purpose: 1
+            };
             const query = this.actionModel.find(Object.assign({ typeOf: { $eq: params.typeOf.$eq }, 'sameAs.id': { $exists: true, $eq: params.sameAs.id.$eq } }, (typeof ((_a = params.purpose) === null || _a === void 0 ? void 0 : _a.id.$eq) === 'string')
                 ? { 'purpose.id': { $exists: true, $eq: params.purpose.id.$eq } }
-                : undefined))
-                .select({ _id: 1, actionStatus: 1, error: 1, purpose: 1 })
+                : undefined), projection)
+                // .select({ _id: 1, actionStatus: 1, error: 1, purpose: 1 })
                 .limit(1);
-            return query.exec()
-                .then((docs) => docs.map((doc) => doc.toObject()));
+            return query
+                .lean() // 2024-08-26~
+                .exec();
         });
     }
     deleteByProject(params) {
@@ -768,7 +827,7 @@ class ActionRepo {
                 .exec();
         });
     }
-    updateAuthorizeEventOfferAction(params) {
+    reCompleteAuthorizeEventOfferAction(params) {
         return __awaiter(this, void 0, void 0, function* () {
             return this.actionModel.findOneAndUpdate({
                 // typeOf: factory.actionType.AuthorizeAction,
@@ -783,13 +842,13 @@ class ActionRepo {
                     result: params.result,
                     endDate: new Date()
                 }
-            }, { new: true })
+            }, { new: true, projection: { _id: 1 } })
+                .lean()
                 .exec()
                 .then((doc) => {
                 if (doc === null) {
                     throw new factory.errors.NotFound(this.actionModel.modelName);
                 }
-                return doc.toObject();
             });
         });
     }
@@ -802,10 +861,11 @@ class ActionRepo {
     findByIdAndUpdate(params) {
         return __awaiter(this, void 0, void 0, function* () {
             yield this.actionModel.findOneAndUpdate({ _id: { $eq: params.id } }, params.update, { projection: { _id: 1 } })
+                .lean()
                 .exec()
                 .then((doc) => {
                 if (doc === null) {
-                    throw new factory.errors.ArgumentNull(this.actionModel.modelName);
+                    throw new factory.errors.NotFound(this.actionModel.modelName);
                 }
             });
         });
@@ -1358,29 +1418,6 @@ class ActionRepo {
                 .exec();
         });
     }
-    /**
-     * 互換性維持対応専用
-     */
-    fixInstrumentTransactionNumber(params) {
-        var _a, _b;
-        return __awaiter(this, void 0, void 0, function* () {
-            const pendingTransactionNumber = (_b = (_a = params.object) === null || _a === void 0 ? void 0 : _a.pendingTransaction) === null || _b === void 0 ? void 0 : _b.transactionNumber;
-            const doc = yield this.actionModel.findOneAndUpdate({ _id: { $eq: params.id } }, {
-                $set: Object.assign({ 'instrument.transactionNumber': params.instrument.transactionNumber }, (typeof pendingTransactionNumber === 'string')
-                    ? { 'object.pendingTransaction.transactionNumber': pendingTransactionNumber }
-                    : undefined)
-            }, {
-                new: true,
-                projection: {
-                    _id: 1
-                }
-            })
-                .exec();
-            if (doc === null) {
-                throw new factory.errors.NotFound(this.actionModel.modelName);
-            }
-        });
-    }
     // tslint:disable-next-line:max-func-body-length
     agggregateByStatus(params) {
         return __awaiter(this, void 0, void 0, function* () {

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

@@ -1,20 +1,7 @@
 import type { Connection, PipelineStage } from 'mongoose';
 import * as factory from '../factory';
+import { IAggregateReservation } from './mongoose/schemas/aggregateReservation';
 type IMatchStage = PipelineStage.Match;
-export interface IAggregateReservation {
-    project: {
-        id: string;
-        typeOf: factory.organizationType.Project;
-    };
-    typeOf: 'AggregateReservation';
-    reservationFor: {
-        id: string;
-        typeOf: factory.eventType;
-        startDate: Date;
-    };
-    aggregateEntranceGate?: factory.event.event.IAggregateEntranceGate;
-    aggregateOffer?: factory.event.event.IAggregateOffer;
-}
 export interface IUpdateAggregateReservationParams {
     $set: {
         aggregateOffer?: factory.event.event.IAggregateOffer;