@chevre/domain 21.2.0-alpha.5 → 21.2.0-alpha.50

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;
 /**
  * 予約取消時アクション
  */
@@ -19,26 +19,26 @@ const settings_1 = require("../../../settings");
 const offer_1 = require("../../offer");
 const factory_1 = require("../factory");
 const informReservations = settings_1.settings.onReservationStatusChanged.informReservation;
-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) {
@@ -50,7 +50,7 @@ function onReservationCanceled(canceledReservations, useInformReservation) {
                 if (Array.isArray(informReservations)) {
                     // やや遅延させる(確定通知が未達の可能性を考慮して)
                     const informTaskRunsAt = moment(now)
-                        .add(INFORM_TASK_DELAY_IN_SECONDS, 'seconds')
+                        .add(settings_1.INFORM_RESERVATION_TASK_DELAY_IN_SECONDS, 'seconds')
                         .toDate();
                     const reservations4inform = canceledReservations.map((r) => {
                         return {
@@ -91,7 +91,7 @@ function onReservationCanceled(canceledReservations, useInformReservation) {
             }
             // タスク保管
             if (taskAttributes.length > 0) {
-                yield repos.task.saveMany(taskAttributes);
+                yield repos.task.saveMany(taskAttributes, { emitImmediately: true });
             }
             // 冗長な作成を避ける
             yield (0, offer_1.createAggregateScreeningEventIfNotExist)({

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

@@ -19,7 +19,6 @@ const settings_1 = require("../../../settings");
 const offer_1 = require("../../offer");
 const factory_1 = require("../factory");
 const informReservations = settings_1.settings.onReservationStatusChanged.informReservation;
-const INFORM_TASK_DELAY_IN_SECONDS = 30;
 // tslint:disable-next-line:max-func-body-length
 function onReservationCheckedIn(params) {
     // tslint:disable-next-line:max-func-body-length
@@ -31,7 +30,7 @@ function onReservationCheckedIn(params) {
         if (Array.isArray(informReservations)) {
             // やや遅延させる(確定通知が未達の可能性を考慮して)
             const informTaskRunsAt = moment(params.now)
-                .add(INFORM_TASK_DELAY_IN_SECONDS, 'seconds')
+                .add(settings_1.INFORM_RESERVATION_TASK_DELAY_IN_SECONDS, 'seconds')
                 .toDate();
             informReservations.forEach((informReservation) => {
                 var _a;
@@ -107,7 +106,7 @@ function onReservationCheckedIn(params) {
             });
         }
         if (tasks.length > 0) {
-            yield repos.task.saveMany(tasks);
+            yield repos.task.saveMany(tasks, { emitImmediately: true });
         }
         // 冗長な作成を避ける
         const reservationForIds = (_a = params.object.reservationFor) === null || _a === void 0 ? void 0 : _a.ids;

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/reserve/potentialActions/onReservationUsed.js

@@ -19,7 +19,6 @@ const settings_1 = require("../../../settings");
 const offer_1 = require("../../offer");
 const factory_1 = require("../factory");
 const informReservations = settings_1.settings.onReservationStatusChanged.informReservation;
-const INFORM_TASK_DELAY_IN_SECONDS = 30;
 /**
  * 予約使用
  */
@@ -32,7 +31,7 @@ function onReservationUsed(action, attendedReservation) {
         if (Array.isArray(informReservations)) {
             // やや遅延させる(確定通知が未達の可能性を考慮して)
             const informTaskRunsAt = moment(now)
-                .add(INFORM_TASK_DELAY_IN_SECONDS, 'seconds')
+                .add(settings_1.INFORM_RESERVATION_TASK_DELAY_IN_SECONDS, 'seconds')
                 .toDate();
             const reservation4inform = {
                 typeOf: attendedReservation.typeOf,
@@ -97,7 +96,7 @@ function onReservationUsed(action, attendedReservation) {
             }
         }
         if (tasks.length > 0) {
-            yield repos.task.saveMany(tasks);
+            yield repos.task.saveMany(tasks, { emitImmediately: true });
         }
         // 冗長な作成を避ける
         yield (0, offer_1.createAggregateScreeningEventIfNotExist)({

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

@@ -31,13 +31,6 @@ function verifyToken4reservation(params) {
                     orderNumber: payload.orderNumber,
                     reservationId: params.reservationId
                 });
-                // 注文検索
-                // const order: Pick<factory.order.IOrder, 'orderStatus' | 'acceptedOffers'> =
-                //     await repos.order.findByOrderNumber({
-                //         orderNumber: payload.orderNumber,
-                //         inclusion: ['orderStatus', 'acceptedOffers'],
-                //         exclusion: []
-                //     });
                 // ステータス検証
                 switch (order.orderStatus) {
                     case factory.orderStatus.OrderDelivered:
@@ -75,7 +68,7 @@ function useReservation(params) {
         // 取得属性最適化(2023-01-30~)
         const reservation = yield repos.reservation.findById({
             id: reservationId,
-            inclusion: ['id', 'issuedThrough', 'project', 'reservationFor', 'reservationNumber', 'reservedTicket', 'typeOf']
+            inclusion: ['_id', 'issuedThrough', 'project', 'reservationFor', 'reservationNumber', 'reservedTicket', 'typeOf']
         });
         // instrument?.tokenを検証
         const token = (_a = params === null || params === void 0 ? void 0 : params.instrument) === null || _a === void 0 ? void 0 : _a.token;

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/lib/chevre/service/task/voidReserveTransaction.js

@@ -17,6 +17,7 @@ const offer_1 = require("../../repo/rateLimit/offer");
 const reservation_1 = require("../../repo/reservation");
 const stockHolder_1 = require("../../repo/stockHolder");
 const task_1 = require("../../repo/task");
+const transaction_1 = require("../../repo/transaction");
 const EventOfferService = require("../offer/event");
 /**
  * タスク実行関数
@@ -38,7 +39,8 @@ function call(data) {
             stockHolder: stockHolderRepo,
             offerRateLimit: offerRateLimitRepo,
             reservation: reservationRepo,
-            task: taskRepo
+            task: taskRepo,
+            transaction: new transaction_1.MongoRepository(settings.connection)
         });
     });
 }

package/lib/chevre/service/task.d.ts

@@ -16,11 +16,20 @@ export type TaskOperation<T> = (repos: {
     task: TaskRepo;
 }) => Promise<T>;
 export type IOperation<T> = (settings: IConnectionSettings) => Promise<T>;
+export declare function executeById(params: {
+    id: string;
+    executor?: {
+        name: string;
+    };
+}): IOperation<void>;
 /**
  * タスク名でタスクをひとつ実行する
  */
 export declare function executeByName<T extends factory.taskName>(params: {
     name: T;
+    executor?: {
+        name: string;
+    };
 }): IOperation<void>;
 /**
  * タスクを実行する

package/lib/chevre/service/task.js

@@ -9,7 +9,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     });
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.notifyAbortedTasks = exports.abort = exports.retry = exports.execute = exports.executeByName = void 0;
+exports.notifyAbortedTasks = exports.abort = exports.retry = exports.execute = exports.executeByName = exports.executeById = void 0;
 /**
  * タスクサービス
  */
@@ -18,19 +18,54 @@ const factory = require("../factory");
 const task_1 = require("../repo/task");
 const NotificationService = require("./notification");
 const factory_1 = require("./notification/factory");
+const credentials_1 = require("../credentials");
 const settings_1 = require("../settings");
 const debug = createDebug('chevre-domain:service:task');
+const DEFAULT_EXECUTOR_NAME = `${process.env.GAE_APPLICATION}:${process.env.GAE_SERVICE}:jobs`;
+function executeById(params) {
+    return (settings) => __awaiter(this, void 0, void 0, function* () {
+        var _a;
+        const taskRepo = new task_1.MongoRepository(settings.connection);
+        // 未実行のタスクを取得
+        // tslint:disable-next-line:no-null-keyword
+        let task = null;
+        try {
+            task = yield taskRepo.executeById({
+                id: params.id,
+                executor: {
+                    name: (typeof ((_a = params.executor) === null || _a === void 0 ? void 0 : _a.name) === 'string') ? params.executor.name : DEFAULT_EXECUTOR_NAME
+                }
+            });
+        }
+        catch (error) {
+            // tslint:disable-next-line:no-single-line-block-comment
+            /* istanbul ignore next */
+            debug('service.task.executeById error:', error);
+        }
+        // タスクがなければ終了
+        if (task !== null) {
+            yield execute(task)(settings);
+        }
+    });
+}
+exports.executeById = executeById;
 /**
  * タスク名でタスクをひとつ実行する
  */
 function executeByName(params) {
     return (settings) => __awaiter(this, void 0, void 0, function* () {
+        var _a;
         const taskRepo = new task_1.MongoRepository(settings.connection);
         // 未実行のタスクを取得
         // tslint:disable-next-line:no-null-keyword
         let task = null;
         try {
-            task = yield taskRepo.executeOneByName(params);
+            task = yield taskRepo.executeOneByName({
+                name: params.name,
+                executor: {
+                    name: (typeof ((_a = params.executor) === null || _a === void 0 ? void 0 : _a.name) === 'string') ? params.executor.name : DEFAULT_EXECUTOR_NAME
+                }
+            });
         }
         catch (error) {
             // tslint:disable-next-line:no-single-line-block-comment
@@ -106,7 +141,9 @@ function abort(params) {
             }
             // 開発者へ報告
             const message = (0, factory_1.task2lineNotify)({ task: abortedTask });
-            yield NotificationService.report2developers(message.subject, message.content)();
+            yield NotificationService.report2developers(message.subject, message.content)({
+                accessToken: credentials_1.credentials.lineNotify.accessTokenAlert
+            });
         }
     });
 }
@@ -123,7 +160,9 @@ function notifyAbortedTasks(params) {
         if (abortedTasks.length > 0) {
             // 開発者へ報告
             const message = (0, factory_1.tasks2lineNotify)({ tasks: abortedTasks });
-            yield NotificationService.report2developers(message.subject, message.content)();
+            yield NotificationService.report2developers(message.subject, message.content)({
+                accessToken: credentials_1.credentials.lineNotify.accessTokenAlert
+            });
         }
     });
 }

package/lib/chevre/service/transaction/moneyTransfer.js

@@ -545,7 +545,9 @@ function searchAuthorizeActions(params) {
             purpose: {
                 typeOf: params.transaction.typeOf,
                 id: params.transaction.id
-            }
+            },
+            // Completedに絞る(2023-05-16~)
+            actionStatus: { $eq: factory.actionStatusType.CompletedActionStatus }
         });
         // 万が一このプロセス中に他処理が発生してもそれらを無視するように、endDateでフィルタリング
         authorizeActions = authorizeActions.filter((a) => {
@@ -576,9 +578,7 @@ function exportTasksById(params) {
             transaction,
             runsAt: taskRunsAt
         });
-        // saveManyに変更(2023-02-01~)
-        yield repos.task.saveMany(taskAttributes);
-        // await Promise.all(taskAttributes.map(async (a) => repos.task.save(a)));
+        yield repos.task.saveMany(taskAttributes, { emitImmediately: true });
     });
 }
 exports.exportTasksById = exportTasksById;

package/lib/chevre/service/transaction/orderProgramMembership.js

@@ -213,7 +213,8 @@ function processPlaceOrder(params) {
                     orderDate: new Date()
                 }
             },
-            potentialActions: params.potentialActions
+            potentialActions: params.potentialActions,
+            saveAuthorizeActions: true
         })(repos);
     });
 }

package/lib/chevre/service/transaction/placeOrder/exportTasks/factory.js

@@ -78,7 +78,35 @@ function createTasks(params) {
             object: transaction
         }
     };
-    taskAttributes.push(...triggerWebhookTaskAttributes, deleteTransactionTask);
+    // 確定取引にも決済承認中止タスクを追加(2023-05-03~)
+    const voidPaymentTaskAttributes = {
+        project: transaction.project,
+        name: factory.taskName.VoidPayTransaction,
+        status: factory.taskStatus.Ready,
+        runsAt: taskRunsAt,
+        remainingNumberOfTries: 10,
+        numberOfTried: 0,
+        executionResults: [],
+        data: {
+            project: transaction.project,
+            purpose: { typeOf: transaction.typeOf, id: transaction.id }
+        }
+    };
+    // 確定取引にも興行オファー承認中止タスクを追加(2023-05-09~)
+    const voidReserveTaskAttributes = {
+        project: transaction.project,
+        name: factory.taskName.VoidReserveTransaction,
+        status: factory.taskStatus.Ready,
+        runsAt: taskRunsAt,
+        remainingNumberOfTries: 10,
+        numberOfTried: 0,
+        executionResults: [],
+        data: {
+            project: transaction.project,
+            purpose: { typeOf: transaction.typeOf, id: transaction.id }
+        }
+    };
+    taskAttributes.push(...triggerWebhookTaskAttributes, deleteTransactionTask, voidPaymentTaskAttributes, voidReserveTaskAttributes);
     switch (transaction.status) {
         case factory.transactionStatusType.Confirmed:
             const potentialActions = transaction.potentialActions;
@@ -107,22 +135,8 @@ function createTasks(params) {
             };
             taskAttributes.push(placeOrderTaskAttributes);
             break;
-        // 期限切れor中止の場合は、タスクリストを作成する
         case factory.transactionStatusType.Canceled:
         case factory.transactionStatusType.Expired:
-            const voidReserveTaskAttributes = {
-                project: transaction.project,
-                name: factory.taskName.VoidReserveTransaction,
-                status: factory.taskStatus.Ready,
-                runsAt: taskRunsAt,
-                remainingNumberOfTries: 10,
-                numberOfTried: 0,
-                executionResults: [],
-                data: {
-                    project: transaction.project,
-                    purpose: { typeOf: transaction.typeOf, id: transaction.id }
-                }
-            };
             const voidRegisterServiceTaskAttributes = {
                 project: transaction.project,
                 name: factory.taskName.VoidRegisterServiceTransaction,
@@ -136,19 +150,6 @@ function createTasks(params) {
                     purpose: { typeOf: transaction.typeOf, id: transaction.id }
                 }
             };
-            const voidPaymentTaskAttributes = {
-                project: transaction.project,
-                name: factory.taskName.VoidPayTransaction,
-                status: factory.taskStatus.Ready,
-                runsAt: taskRunsAt,
-                remainingNumberOfTries: 10,
-                numberOfTried: 0,
-                executionResults: [],
-                data: {
-                    project: transaction.project,
-                    purpose: { typeOf: transaction.typeOf, id: transaction.id }
-                }
-            };
             const voidMoneyTransferTaskAttributes = {
                 project: transaction.project,
                 name: factory.taskName.VoidMoneyTransferTransaction,
@@ -162,7 +163,7 @@ function createTasks(params) {
                     purpose: { typeOf: transaction.typeOf, id: transaction.id }
                 }
             };
-            taskAttributes.push(voidReserveTaskAttributes, voidRegisterServiceTaskAttributes, voidPaymentTaskAttributes, voidMoneyTransferTaskAttributes);
+            taskAttributes.push(voidRegisterServiceTaskAttributes, voidMoneyTransferTaskAttributes);
             break;
         default:
             throw new factory.errors.NotImplemented(`Transaction status "${transaction.status}" not implemented.`);

package/lib/chevre/service/transaction/placeOrder.js

@@ -36,11 +36,7 @@ function exportTasksById(params) {
             transaction,
             runsAt: taskRunsAt
         });
-        // saveManyに変更(2023-02-01~)
-        yield repos.task.saveMany(taskAttributes);
-        // await Promise.all(taskAttributes.map(async (taskAttribute) => {
-        //     await repos.task.save(taskAttribute);
-        // }));
+        yield repos.task.saveMany(taskAttributes, { emitImmediately: true });
     });
 }
 exports.exportTasksById = exportTasksById;

package/lib/chevre/service/transaction/placeOrderInProgress/factory.js

@@ -4,7 +4,7 @@ exports.createStartParams = void 0;
 const factory = require("../../../factory");
 function createStartParams(params, passport, seller, broker) {
     var _a, _b, _c, _d;
-    const transactionObject = Object.assign(Object.assign(Object.assign(Object.assign(Object.assign({ passportToken: (typeof ((_a = params.object.passport) === null || _a === void 0 ? void 0 : _a.token) === 'string') ? params.object.passport.token : undefined, authorizeActions: [] }, (passport !== undefined) ? { passport } : undefined), (params.object.clientUser !== undefined && params.object.clientUser !== null)
+    const transactionObject = Object.assign(Object.assign(Object.assign(Object.assign(Object.assign({ passportToken: (typeof ((_a = params.object.passport) === null || _a === void 0 ? void 0 : _a.token) === 'string') ? params.object.passport.token : undefined }, (passport !== undefined) ? { passport } : undefined), (params.object.clientUser !== undefined && params.object.clientUser !== null)
         ? { clientUser: params.object.clientUser }
         : undefined), (typeof ((_b = params.object) === null || _b === void 0 ? void 0 : _b.name) === 'string') ? { name: (_c = params.object) === null || _c === void 0 ? void 0 : _c.name } : undefined), (typeof (broker === null || broker === void 0 ? void 0 : broker.typeOf) === 'string') ? { broker: broker } : undefined), (typeof ((_d = params.object.customer) === null || _d === void 0 ? void 0 : _d.typeOf) === 'string') ? { customer: params.object.customer } : undefined);
     if (typeof seller.id !== 'string') {

package/lib/chevre/service/transaction/placeOrderInProgress/potentialActions/moneyTransfer.d.ts

@@ -3,4 +3,5 @@ export type IAuthorizeMoneyTransferOffer = factory.action.authorize.offer.moneyT
 export declare function createMoneyTransferActions(params: {
     order: factory.order.IOrder;
     transaction: factory.transaction.placeOrder.ITransaction;
+    authorizeActions: factory.action.authorize.IAction<factory.action.authorize.IAttributes<any, any>>[];
 }): Promise<factory.action.interact.confirm.moneyTransfer.IAttributes[]>;

package/lib/chevre/service/transaction/placeOrderInProgress/potentialActions/moneyTransfer.js

@@ -15,7 +15,7 @@ const order_1 = require("../../../../factory/order");
 function createMoneyTransferActions(params) {
     return __awaiter(this, void 0, void 0, function* () {
         const moneyTransferActions = [];
-        const authorizeMoneyTransferActions = params.transaction.object.authorizeActions
+        const authorizeMoneyTransferActions = params.authorizeActions
             .filter((a) => a.actionStatus === factory.actionStatusType.CompletedActionStatus)
             .filter((a) => a.object.typeOf === factory.offerType.Offer)
             .filter((a) => { var _a; return ((_a = a.object.itemOffered) === null || _a === void 0 ? void 0 : _a.typeOf) === factory.actionType.MoneyTransfer; });

package/lib/chevre/service/transaction/placeOrderInProgress/potentialActions/registerService.d.ts

@@ -2,4 +2,5 @@ import * as factory from '../../../../factory';
 export declare function createRegisterServiceActions(params: {
     order: factory.order.IOrder;
     transaction: factory.transaction.placeOrder.ITransaction;
+    authorizeActions: factory.action.authorize.IAction<factory.action.authorize.IAttributes<any, any>>[];
 }): Promise<factory.action.interact.confirm.registerService.IAttributes[]>;

package/lib/chevre/service/transaction/placeOrderInProgress/potentialActions/registerService.js

@@ -17,7 +17,7 @@ const order_1 = require("../../../../factory/order");
 function createRegisterServiceActions(params) {
     return __awaiter(this, void 0, void 0, function* () {
         const registerServiceActions = [];
-        const authorizeProductOfferActions = params.transaction.object.authorizeActions
+        const authorizeProductOfferActions = params.authorizeActions
             .filter((a) => a.actionStatus === factory.actionStatusType.CompletedActionStatus)
             .filter((a) => Array.isArray(a.object)
             && a.object.length > 0

package/lib/chevre/service/transaction/placeOrderInProgress/potentialActions.d.ts

@@ -7,4 +7,5 @@ export declare function createPotentialActions(params: {
     potentialActions?: factory.transaction.placeOrder.IPotentialActionsParams;
     transaction: factory.transaction.placeOrder.ITransaction;
     emailMessage?: factory.creativeWork.message.email.ICreativeWork;
+    authorizeActions: factory.action.authorize.IAction<factory.action.authorize.IAttributes<any, any>>[];
 }): Promise<factory.transaction.placeOrder.IPotentialActions>;

package/lib/chevre/service/transaction/placeOrderInProgress/result/acceptedOffers.d.ts

@@ -3,12 +3,14 @@ export type IAuthorizeMoneyTransferOffer = factory.action.authorize.offer.moneyT
 export type IAuthorizeSeatReservationOffer = factory.action.authorize.offer.seatReservation.IAction<factory.service.webAPI.Identifier>;
 export declare function createReservationAcceptedOffers(params: {
     transaction: factory.transaction.placeOrder.ITransaction;
+    authorizeActions: factory.action.authorize.IAction<factory.action.authorize.IAttributes<any, any>>[];
 }): {
     reservationAcceptedOffers: factory.order.IAcceptedOffer<factory.order.IReservation>[];
     reservationOrderItems: factory.order.IOrderedItem[];
 };
 export declare function createProductItems(params: {
     transaction: factory.transaction.placeOrder.ITransaction;
+    authorizeActions: factory.action.authorize.IAction<factory.action.authorize.IAttributes<any, any>>[];
 }): {
     productAcceptedOffers: factory.order.IAcceptedOffer<factory.order.IPermit>[];
     productOrderItems: factory.order.IOrderedItem[];
@@ -16,6 +18,7 @@ export declare function createProductItems(params: {
 export declare function createMoneyTransferAcceptedOffers(params: {
     transaction: factory.transaction.placeOrder.ITransaction;
     seller: factory.order.ISeller;
+    authorizeActions: factory.action.authorize.IAction<factory.action.authorize.IAttributes<any, any>>[];
 }): {
     moneyTransferAcceptedOffers: factory.order.IAcceptedOffer<factory.order.IMoneyTransfer>[];
     moneyTransferOrderItems: factory.order.IOrderedItem[];

package/lib/chevre/service/transaction/placeOrderInProgress/result/acceptedOffers.js

@@ -7,7 +7,7 @@ function createReservationAcceptedOffers(params) {
     const acceptedOffers = [];
     const orderedItems = [];
     // 座席予約に対する承認アクション取り出す
-    const seatReservationAuthorizeActions = params.transaction.object.authorizeActions
+    const seatReservationAuthorizeActions = params.authorizeActions
         .filter((a) => a.actionStatus === factory.actionStatusType.CompletedActionStatus
         && a.object.typeOf === factory.action.authorize.offer.seatReservation.ObjectType.SeatReservation);
     const eventIds = [];
@@ -85,7 +85,7 @@ function reservationOffers2orderedItem(params) {
 function createProductItems(params) {
     const acceptedOffers = [];
     const orderedItems = [];
-    const authorizePaymentCardOfferActions = params.transaction.object.authorizeActions
+    const authorizePaymentCardOfferActions = params.authorizeActions
         .filter((a) => a.actionStatus === factory.actionStatusType.CompletedActionStatus)
         .filter((a) => Array.isArray(a.object)
         && a.object.length > 0
@@ -117,7 +117,11 @@ function createProductItems(params) {
 exports.createProductItems = createProductItems;
 function createMoneyTransferAcceptedOffers(params) {
     // 通貨転送承認アクション
-    const authorizeMoneyTansferActions = params.transaction.object.authorizeActions
+    // const authorizeMoneyTansferActions = (<IAuthorizeMoneyTransferOffer[]>params.transaction.object.authorizeActions)
+    //     .filter((a) => a.actionStatus === factory.actionStatusType.CompletedActionStatus)
+    //     .filter((a) => a.object.typeOf === factory.offerType.Offer)
+    //     .filter((a) => a.object.itemOffered?.typeOf === factory.actionType.MoneyTransfer);
+    const authorizeMoneyTansferActions = params.authorizeActions
         .filter((a) => a.actionStatus === factory.actionStatusType.CompletedActionStatus)
         .filter((a) => a.object.typeOf === factory.offerType.Offer)
         .filter((a) => { var _a; return ((_a = a.object.itemOffered) === null || _a === void 0 ? void 0 : _a.typeOf) === factory.actionType.MoneyTransfer; });

package/lib/chevre/service/transaction/placeOrderInProgress/result.d.ts

@@ -9,4 +9,5 @@ export declare function createOrder(params: {
     orderDate: Date;
     orderStatus: factory.orderStatus;
     isGift: boolean;
+    authorizeActions: factory.action.authorize.IAction<factory.action.authorize.IAttributes<any, any>>[];
 }): factory.order.IOrder;

package/lib/chevre/service/transaction/placeOrderInProgress/result.js

@@ -23,7 +23,7 @@ function createOrder(params) {
     ];
     const orderedItems = [...reservationOrderItems, ...moneyTransferOrderItems, ...productOrderItems];
     // 決済方法をセット
-    const { paymentMethods, price } = createPaymentMethods({ transaction: params.transaction });
+    const { paymentMethods, price } = createPaymentMethods({ transaction: params.transaction, authorizeActions: params.authorizeActions });
     const discounts = [];
     const name = (typeof params.transaction.object.name === 'string') ? params.transaction.object.name : undefined;
     const broker = (typeof ((_a = params.transaction.object.broker) === null || _a === void 0 ? void 0 : _a.typeOf) === 'string') ? params.transaction.object.broker : undefined;
@@ -62,7 +62,7 @@ function createCustomer(params) {
 function createPaymentMethods(params) {
     const paymentMethods = [];
     let price = 0;
-    const authorizePaymentActions = params.transaction.object.authorizeActions
+    const authorizePaymentActions = params.authorizeActions
         .filter((a) => {
         var _a;
         return a.actionStatus === factory.actionStatusType.CompletedActionStatus

package/lib/chevre/service/transaction/placeOrderInProgress/validation/validateMovieTicket.d.ts

@@ -2,4 +2,4 @@ import * as factory from '../../../../factory';
 /**
  * 座席予約オファー承認に対してムビチケ承認条件が整っているかどうか検証する
  */
-export declare function validateMovieTicket(paymentMethodType: string, transaction: factory.transaction.placeOrder.ITransaction): void;
+export declare function validateMovieTicket(paymentMethodType: string, transaction: factory.transaction.placeOrder.ITransaction, authorizeActions: factory.action.authorize.IAction<factory.action.authorize.IAttributes<any, any>>[]): void;

package/lib/chevre/service/transaction/placeOrderInProgress/validation/validateMovieTicket.js

@@ -10,8 +10,8 @@ const debug = createDebug('cinerino-domain:service:validateMovieTicket');
 /**
  * 座席予約オファー承認に対してムビチケ承認条件が整っているかどうか検証する
  */
-function validateMovieTicket(paymentMethodType, transaction) {
-    const authorizeActions = transaction.object.authorizeActions;
+function validateMovieTicket(paymentMethodType, transaction, authorizeActions) {
+    // const authorizeActions = transaction.object.authorizeActions;
     const authorizeMovieTicketActions = authorizeActions.filter((a) => {
         var _a, _b, _c;
         return a.actionStatus === factory.actionStatusType.CompletedActionStatus