@chevre/domain 21.2.0-alpha.33 → 21.2.0-alpha.34

package/lib/chevre/repo/assetTransaction.js

@@ -248,7 +248,9 @@ class MongoRepository {
      */
     start(params) {
         return __awaiter(this, void 0, void 0, function* () {
-            return this.transactionModel.create(Object.assign(Object.assign({}, params), { typeOf: params.typeOf, status: factory.transactionStatusType.InProgress, startDate: new Date(), endDate: undefined, tasksExportationStatus: factory.transactionTasksExportationStatus.Unexported }))
+            return this.transactionModel.create(Object.assign(Object.assign({}, params), { typeOf: params.typeOf, status: factory.transactionStatusType.InProgress, startDate: new Date(), endDate: undefined, tasksExportAction: {
+                    actionStatus: factory.actionStatusType.PotentialActionStatus
+                }, tasksExportationStatus: factory.transactionTasksExportationStatus.Unexported }))
                 .then((doc) => doc.toObject());
         });
     }
@@ -349,7 +351,9 @@ class MongoRepository {
      */
     startAndConfirm(params) {
         return __awaiter(this, void 0, void 0, function* () {
-            return this.transactionModel.create(Object.assign(Object.assign({ _id: params.id, typeOf: params.typeOf }, params), { startDate: new Date(), status: factory.transactionStatusType.Confirmed, tasksExportationStatus: factory.transactionTasksExportationStatus.Unexported, endDate: new Date(), result: params.result, potentialActions: params.potentialActions }))
+            return this.transactionModel.create(Object.assign(Object.assign({}, params), { _id: params.id, typeOf: params.typeOf, startDate: new Date(), status: factory.transactionStatusType.Confirmed, tasksExportAction: {
+                    actionStatus: factory.actionStatusType.PotentialActionStatus
+                }, tasksExportationStatus: factory.transactionTasksExportationStatus.Unexported, endDate: new Date(), result: params.result, potentialActions: params.potentialActions }))
                 .then((doc) => doc.toObject());
         });
     }
@@ -367,10 +371,9 @@ class MongoRepository {
             }
             const typeOfIn = (_a = params.typeOf) === null || _a === void 0 ? void 0 : _a.$in;
             return this.transactionModel.findOneAndUpdate(Object.assign(Object.assign(Object.assign(Object.assign({}, (typeof ((_b = params.project) === null || _b === void 0 ? void 0 : _b.id) === 'string') ? { 'project.id': { $eq: params.project.id } } : undefined), (Array.isArray(typeOfIn)) ? { typeOf: { $in: typeOfIn } } : undefined), { status: { $eq: params.status }, tasksExportationStatus: { $eq: factory.transactionTasksExportationStatus.Unexported } }), (typeof params.id === 'string') ? { _id: { $eq: params.id } } : undefined), {
-                tasksExportAction: {
-                    agent: { name: params.tasksExportAction.agent.name },
-                    startDate: new Date()
-                },
+                'tasksExportAction.actionStatus': factory.actionStatusType.ActiveActionStatus,
+                'tasksExportAction.agent': { name: params.tasksExportAction.agent.name },
+                'tasksExportAction.startDate': new Date(),
                 tasksExportationStatus: factory.transactionTasksExportationStatus.Exporting
             }, { new: true })
                 .select({
@@ -410,6 +413,9 @@ class MongoRepository {
                         _id: { $eq: reexportingTransaction.id },
                         tasksExportationStatus: { $eq: factory.transactionTasksExportationStatus.Exporting }
                     }, {
+                        tasksExportAction: {
+                            actionStatus: factory.actionStatusType.PotentialActionStatus
+                        },
                         tasksExportationStatus: factory.transactionTasksExportationStatus.Unexported
                     })
                         .exec();
@@ -420,20 +426,6 @@ class MongoRepository {
                     });
                 }
             }
-            // await this.transactionModel.updateMany(
-            //     {
-            //         tasksExportationStatus: { $eq: factory.transactionTasksExportationStatus.Exporting },
-            //         updatedAt: {
-            //             $lt: moment()
-            //                 .add(-params.intervalInMinutes, 'minutes')
-            //                 .toDate()
-            //         }
-            //     },
-            //     {
-            //         tasksExportationStatus: factory.transactionTasksExportationStatus.Unexported
-            //     }
-            // )
-            //     .exec();
         });
     }
     /**
@@ -489,6 +481,7 @@ class MongoRepository {
             }, {
                 tasksExportationStatus: factory.transactionTasksExportationStatus.Exported,
                 tasksExportedAt: endDate,
+                'tasksExportAction.actionStatus': factory.actionStatusType.CompletedActionStatus,
                 'tasksExportAction.endDate': endDate
             })
                 .exec();

package/lib/chevre/repo/transaction.js

@@ -264,7 +264,9 @@ class MongoRepository {
             else {
                 expires = params.expires;
             }
-            return this.transactionModel.create(Object.assign(Object.assign({}, params), { typeOf: params.typeOf, status: factory.transactionStatusType.InProgress, startDate, endDate: undefined, expires, tasksExportationStatus: factory.transactionTasksExportationStatus.Unexported }))
+            return this.transactionModel.create(Object.assign(Object.assign({}, params), { typeOf: params.typeOf, status: factory.transactionStatusType.InProgress, startDate, endDate: undefined, expires, tasksExportAction: {
+                    actionStatus: factory.actionStatusType.PotentialActionStatus
+                }, tasksExportationStatus: factory.transactionTasksExportationStatus.Unexported }))
                 .then((doc) => doc.toObject());
         });
     }
@@ -478,10 +480,9 @@ class MongoRepository {
             }
             const typeOfIn = (_a = params.typeOf) === null || _a === void 0 ? void 0 : _a.$in;
             return this.transactionModel.findOneAndUpdate(Object.assign(Object.assign(Object.assign(Object.assign({}, (params.project !== undefined) ? { 'project.id': { $eq: params.project.id } } : undefined), (Array.isArray(typeOfIn)) ? { typeOf: { $in: typeOfIn } } : undefined), { status: { $eq: params.status }, tasksExportationStatus: { $eq: factory.transactionTasksExportationStatus.Unexported } }), (typeof params.id === 'string') ? { _id: { $eq: params.id } } : undefined), {
-                tasksExportAction: {
-                    agent: { name: params.tasksExportAction.agent.name },
-                    startDate: new Date()
-                },
+                'tasksExportAction.actionStatus': factory.actionStatusType.ActiveActionStatus,
+                'tasksExportAction.agent': { name: params.tasksExportAction.agent.name },
+                'tasksExportAction.startDate': new Date(),
                 tasksExportationStatus: factory.transactionTasksExportationStatus.Exporting
             }, { new: true })
                 .select({
@@ -521,6 +522,9 @@ class MongoRepository {
                         _id: { $eq: reexportingTransaction.id },
                         tasksExportationStatus: { $eq: factory.transactionTasksExportationStatus.Exporting }
                     }, {
+                        tasksExportAction: {
+                            actionStatus: factory.actionStatusType.PotentialActionStatus
+                        },
                         tasksExportationStatus: factory.transactionTasksExportationStatus.Unexported
                     })
                         .exec();
@@ -531,20 +535,6 @@ class MongoRepository {
                     });
                 }
             }
-            // await this.transactionModel.updateMany(
-            //     {
-            //         tasksExportationStatus: { $eq: factory.transactionTasksExportationStatus.Exporting },
-            //         updatedAt: {
-            //             $lt: moment()
-            //                 .add(-params.intervalInMinutes, 'minutes')
-            //                 .toDate()
-            //         }
-            //     },
-            //     {
-            //         tasksExportationStatus: factory.transactionTasksExportationStatus.Unexported
-            //     }
-            // )
-            //     .exec();
         });
     }
     /**
@@ -600,6 +590,7 @@ class MongoRepository {
             }, {
                 tasksExportationStatus: factory.transactionTasksExportationStatus.Exported,
                 tasksExportedAt: endDate,
+                'tasksExportAction.actionStatus': factory.actionStatusType.CompletedActionStatus,
                 'tasksExportAction.endDate': endDate
             })
                 .exec();

package/lib/chevre/service/offer.js

@@ -186,7 +186,7 @@ function createAggregateScreeningEventIfNotExist(params) {
             }
         }
         if (aggregateTasks.length > 0) {
-            yield repos.task.saveMany(aggregateTasks);
+            yield repos.task.saveMany(aggregateTasks, { emitImmediately: true });
         }
     });
 }

package/lib/chevre/service/payment/any/onPaid.js

@@ -46,7 +46,7 @@ function onPaid(payAction) {
             }));
         }
         // タスク保管
-        return repos.task.saveMany(taskAttributes);
+        return repos.task.saveMany(taskAttributes, { emitImmediately: true });
     });
 }
 exports.onPaid = onPaid;

package/lib/chevre/service/payment/any/onRefund.js

@@ -92,7 +92,7 @@ function onRefund(refundAction) {
             }));
         }
         // タスク保管
-        return repos.task.saveMany(taskAttributes);
+        return repos.task.saveMany(taskAttributes, { emitImmediately: true });
     });
 }
 exports.onRefund = onRefund;

package/lib/chevre/service/product.js

@@ -77,10 +77,6 @@ function onRegistered(actionAttributes, __) {
             }
         }
         // タスク保管
-        // saveManyに変更(2023-02-01~)
-        yield repos.task.saveMany(taskAttributes);
-        // await Promise.all(taskAttributes.map(async (taskAttribute) => {
-        //     return repos.task.save(taskAttribute);
-        // }));
+        yield repos.task.saveMany(taskAttributes, { emitImmediately: true });
     });
 }

package/lib/chevre/service/reserve/cancelReservation.js

@@ -144,7 +144,6 @@ function cancelPendingReservation(actionAttributesList) {
                 // canceledReservationId: canceledReservation?.id
                 );
                 yield repos.action.complete({ typeOf: action.typeOf, id: action.id, result: actionResult });
-                // await onReservationCanceledByAction(actionAttributes)({ task: repos.task });
                 if (actionObject.typeOf === factory.reservationType.ReservationPackage) {
                     // 最新のconfirmedReservationsを検索
                     canceledReservations = yield repos.reservation.search({
@@ -297,7 +296,6 @@ function cancelReservation(actionAttributesList) {
                 // canceledReservationId: canceledReservation?.id
                 );
                 yield repos.action.complete({ typeOf: action.typeOf, id: action.id, result: actionResult });
-                // await onReservationCanceledByAction(actionAttributes)({ task: repos.task });
                 let canceledReservations = [];
                 if (actionAttributes.object.typeOf === factory.reservationType.ReservationPackage) {
                     const reservationNumber = actionAttributes.object.reservationNumber;

package/lib/chevre/service/reserve/potentialActions/onReservationCanceled.d.ts

@@ -4,9 +4,6 @@ type IEventReservation = factory.reservation.IReservation<factory.reservationTyp
 /**
  * 予約取消後のアクション
  */
-export declare function onReservationCanceledByAction(actionAttributes: factory.action.cancel.reservation.IAttributes): (repos: {
-    task: TaskRepo;
-}) => Promise<void>;
 export declare function onReservationCanceled(canceledReservations: IEventReservation[], useInformReservation: boolean): (repos: {
     task: TaskRepo;
 }) => Promise<void>;

package/lib/chevre/service/reserve/potentialActions/onReservationCanceled.js

@@ -9,7 +9,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     });
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.onReservationCanceled = exports.onReservationCanceledByAction = void 0;
+exports.onReservationCanceled = void 0;
 /**
  * 予約取消時アクション
  */
@@ -23,22 +23,23 @@ const INFORM_TASK_DELAY_IN_SECONDS = 30;
 /**
  * 予約取消後のアクション
  */
-function onReservationCanceledByAction(actionAttributes) {
-    return (repos) => __awaiter(this, void 0, void 0, function* () {
-        const potentialActions = actionAttributes.potentialActions;
-        const taskAttributes = [];
-        // tslint:disable-next-line:no-single-line-block-comment
-        /* istanbul ignore else */
-        if (potentialActions !== undefined) {
-            // no op
-        }
-        // タスク保管
-        if (taskAttributes.length > 0) {
-            yield repos.task.saveMany(taskAttributes);
-        }
-    });
-}
-exports.onReservationCanceledByAction = onReservationCanceledByAction;
+// export function onReservationCanceledByAction(
+//     actionAttributes: factory.action.cancel.reservation.IAttributes
+// ) {
+//     return async (repos: {
+//         task: TaskRepo;
+//     }) => {
+//         const potentialActions = actionAttributes.potentialActions;
+//         const taskAttributes: factory.task.IAttributes<factory.taskName>[] = [];
+//         if (potentialActions !== undefined) {
+//             // no op
+//         }
+//         // タスク保管
+//         if (taskAttributes.length > 0) {
+//             await repos.task.saveMany(taskAttributes, { emitImmediately: true });
+//         }
+//     };
+// }
 function onReservationCanceled(canceledReservations, useInformReservation) {
     return (repos) => __awaiter(this, void 0, void 0, function* () {
         if (Array.isArray(canceledReservations) && canceledReservations.length > 0) {

package/lib/chevre/service/reserve/potentialActions/onReservationConfirmed.js

@@ -57,38 +57,9 @@ function onReservationConfirmedByAction(actionAttributes
                 }));
             }
         }
-        // inform galobally
-        // if (Array.isArray(informReservations)) {
-        //     const reservation4inform: IReservation4informConfirmed = maskUnderName(confirmedReservation);
-        //     taskAttributes.push(...informReservations.map<ITriggerWebhookTaskAttributes>((informReservation) => {
-        //         const informUrl: string = String(informReservation.recipient?.url);
-        //         const informReservationAttributes: InformReservationActionattributes = {
-        //             agent: confirmedReservation.project,
-        //             object: [reservation4inform],
-        //             project: confirmedReservation.project,
-        //             recipient: {
-        //                 id: '',
-        //                 name: informUrl,
-        //                 typeOf: factory.creativeWorkType.WebApplication,
-        //                 url: informUrl
-        //             },
-        //             typeOf: factory.actionType.InformAction
-        //         };
-        //         return {
-        //             project: actionAttributes.project,
-        //             name: factory.taskName.TriggerWebhook,
-        //             status: factory.taskStatus.Ready,
-        //             runsAt: now,
-        //             remainingNumberOfTries: NUM_TRY_INFORM_RESERVATION,
-        //             numberOfTried: 0,
-        //             executionResults: [],
-        //             data: informReservationAttributes
-        //         };
-        //     }));
-        // }
         // タスク保管
         if (taskAttributes.length > 0) {
-            yield repos.task.saveMany(taskAttributes);
+            yield repos.task.saveMany(taskAttributes, { emitImmediately: true });
         }
     });
 }
@@ -142,7 +113,7 @@ function onReservationConfirmed(confirmedReservations) {
             }
             // タスク保管
             if (taskAttributes.length > 0) {
-                yield repos.task.saveMany(taskAttributes);
+                yield repos.task.saveMany(taskAttributes, { emitImmediately: true });
             }
         }
     });

package/lib/chevre/service/task/confirmRegisterServiceTransaction.js

@@ -95,7 +95,7 @@ function onRegistered(actionAttributes) {
             taskAttributes.push(...orderProgramMembershipTasks);
         }
         // タスク保管
-        yield repos.task.saveMany(taskAttributes);
+        yield repos.task.saveMany(taskAttributes, { emitImmediately: true });
     });
 }
 exports.onRegistered = onRegistered;

package/lib/chevre/service/task/returnPayTransaction.js

@@ -219,10 +219,6 @@ function onRefund(refundActionAttributes) {
             });
         }
         // タスク保管
-        // saveManyに変更(2023-02-01~)
-        yield repos.task.saveMany(taskAttributes);
-        // await Promise.all(taskAttributes.map(async (taskAttribute) => {
-        //     return repos.task.save(taskAttribute);
-        // }));
+        yield repos.task.saveMany(taskAttributes, { emitImmediately: true });
     });
 }

package/package.json

@@ -117,5 +117,5 @@
     "postversion": "git push origin --tags",
     "prepublishOnly": "npm run clean && npm run build && npm test && npm run doc"
   },
-  "version": "21.2.0-alpha.33"
+  "version": "21.2.0-alpha.34"
 }