@chevre/domain 21.7.0-alpha.1 → 21.7.0-alpha.11

package/lib/chevre/service/order/deleteOrder.js

@@ -12,6 +12,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.deleteOrder = void 0;
 const factory_1 = require("../delivery/factory");
 const factory = require("../../factory");
+const settings_1 = require("../../settings");
 /**
  * 注文に関わるリソースを削除する
  * 冪等性を確保すること
@@ -38,6 +39,10 @@ function deleteOrder(params) {
         }
         // 経理レポート削除
         yield repos.accountingReport.deleteByOrderNumber({ mainEntity: { orderNumber: order.orderNumber } });
+        // 終了済の関連イベントを削除(2023-08-16~)
+        if (settings_1.USE_DELETE_EVENT_BY_ORDER) {
+            yield deleteEventsByOrder(order)(repos);
+        }
         // 注文削除
         yield repos.order.deleteByOrderNumber({ orderNumber: order.orderNumber });
     });
@@ -73,3 +78,40 @@ function deleteOwnershipInfosByOrder(order) {
         }
     });
 }
+function deleteEventsByOrder(order) {
+    return (repos) => __awaiter(this, void 0, void 0, function* () {
+        const now = new Date();
+        const acceptedOffers = (Array.isArray(order.acceptedOffers)) ? order.acceptedOffers : [];
+        const reservationForIds = acceptedOffers.filter((o) => {
+            return (o.itemOffered.typeOf === factory.reservationType.EventReservation
+                || o.itemOffered.typeOf === factory.reservationType.BusReservation)
+                && typeof o.itemOffered.reservationFor.id === 'string';
+        })
+            .map((o) => {
+            return String(o.itemOffered.reservationFor.id);
+        });
+        if (reservationForIds.length > 0) {
+            for (const reservationForId of reservationForIds) {
+                // 関連注文が存在しなければ削除
+                const relatedOrders = yield repos.order.search({
+                    limit: 1,
+                    page: 1,
+                    project: { id: { $eq: order.project.id } },
+                    acceptedOffers: {
+                        itemOffered: {
+                            reservationFor: { ids: [reservationForId] }
+                        }
+                    }
+                }, { _id: 1 });
+                if (relatedOrders.length === 0) {
+                    yield repos.event.deleteManyEndedByIds({
+                        typeOf: { $in: [factory.eventType.Event, factory.eventType.ScreeningEvent] },
+                        project: { id: order.project.id },
+                        ids: [reservationForId],
+                        endDate: { $lte: now }
+                    });
+                }
+            }
+        }
+    });
+}

package/lib/chevre/service/order/onOrderStatusChanged.d.ts

@@ -11,4 +11,5 @@ export declare function onOrderStatusChanged(params: {
     registerActionInProgress: RegisterServiceInProgressRepo;
     task: TaskRepo;
 }) => Promise<void>;
+export type IExternalOrder = Pick<factory.order.IOrder, 'project' | 'typeOf' | 'seller' | 'customer' | 'confirmationNumber' | 'orderNumber' | 'price' | 'priceCurrency' | 'orderDate' | 'name' | 'orderStatus' | 'orderedItem' | 'paymentMethods'>;
 export {};

package/lib/chevre/service/order/onOrderStatusChanged.js

@@ -23,6 +23,7 @@ const USE_CONFIRM_REGISTER_SERVICE_TRANSACTION = process.env.USE_CONFIRM_REGISTE
 const TOKEN_EXPIRES_IN = 604800;
 function onOrderStatusChanged(params) {
     return (repos) => __awaiter(this, void 0, void 0, function* () {
+        var _a, _b, _c;
         let tasks = [];
         const maskedCustomer = (0, order_1.createMaskedCustomer)(params.order, { noProfile: true });
         const simpleOrder = {
@@ -76,7 +77,13 @@ function onOrderStatusChanged(params) {
                     ...(0, factory_1.createInformTasks)(orderWithToken),
                     ...yield createConfirmPayTransactionTasks(params.order, simpleOrder)(repos),
                     ...yield createConfirmReserveTransactionTasks(params.order, simpleOrder)(repos),
-                    ...yield createConfirmRegisterServiceTransactionTasks(params.order, simpleOrder)(repos)
+                    ...yield createConfirmRegisterServiceTransactionTasks(params.order, simpleOrder)(repos),
+                    // 取引のpotentialActionsを適用(2023-08-17~)
+                    ...createOnPlaceOrderTasksByTransaction({
+                        object: params.order,
+                        // potentialActions: params.potentialActions
+                        potentialActions: (_c = (_b = (_a = params.placeOrderTransaction) === null || _a === void 0 ? void 0 : _a.potentialActions) === null || _b === void 0 ? void 0 : _b.order) === null || _c === void 0 ? void 0 : _c.potentialActions
+                    })
                 ];
                 break;
             case factory.orderStatus.OrderReturned:
@@ -363,3 +370,113 @@ function createReturnPayTransactionTasks(order, __, returnOrderTransaction) {
         return tasks;
     });
 }
+/**
+ * 注文作成後のアクション
+ */
+// export function onPlaceOrder(params: {
+//     object: factory.order.IOrder | IExternalOrder;
+//     potentialActions?: factory.action.trade.order.IPotentialActions;
+// }) {
+//     return async (repos: {
+//         task: TaskRepo;
+//     }) => {
+//         const potentialActions = params.potentialActions;
+//         const now = new Date();
+//         // potentialActionsのためのタスクを生成
+//         const taskAttributes: factory.task.IAttributes<factory.taskName>[] = [];
+//         // tslint:disable-next-line:no-single-line-block-comment
+//         /* istanbul ignore else */
+//         if (potentialActions !== undefined) {
+//             // tslint:disable-next-line:no-single-line-block-comment
+//             /* istanbul ignore else */
+//             if (potentialActions.sendOrder !== undefined) {
+//                 const sendOrderTask: factory.task.IAttributes<factory.taskName.SendOrder> = {
+//                     project: potentialActions.sendOrder.project,
+//                     name: factory.taskName.SendOrder,
+//                     status: factory.taskStatus.Ready,
+//                     runsAt: now, // なるはやで実行
+//                     remainingNumberOfTries: 10,
+//                     numberOfTried: 0,
+//                     executionResults: [],
+//                     // data: potentialActions.sendOrder
+//                     data: {
+//                         project: potentialActions.sendOrder.project,
+//                         object: {
+//                             ...potentialActions.sendOrder.object,
+//                             confirmationNumber: params.object.confirmationNumber
+//                         },
+//                         ...(potentialActions.sendOrder.potentialActions !== undefined)
+//                             ? { potentialActions: potentialActions.sendOrder.potentialActions }
+//                             : undefined
+//                     }
+//                 };
+//                 taskAttributes.push(sendOrderTask);
+//             }
+//             // ポイント付与
+//             // tslint:disable-next-line:no-single-line-block-comment
+//             /* istanbul ignore else */
+//             if (Array.isArray(potentialActions.givePointAward)) {
+//                 taskAttributes.push(...potentialActions.givePointAward.map(
+//                     (a): factory.task.IAttributes<factory.taskName.GivePointAward> => {
+//                         return {
+//                             project: a.project,
+//                             name: factory.taskName.GivePointAward,
+//                             status: factory.taskStatus.Ready,
+//                             runsAt: now, // なるはやで実行
+//                             remainingNumberOfTries: 10,
+//                             numberOfTried: 0,
+//                             executionResults: [],
+//                             data: a
+//                         };
+//                     }));
+//             }
+//         }
+//         // タスク保管
+//         await repos.task.saveMany(taskAttributes, { emitImmediately: true });
+//     };
+// }
+function createOnPlaceOrderTasksByTransaction(params) {
+    const potentialActions = params.potentialActions;
+    const now = new Date();
+    // potentialActionsのためのタスクを生成
+    const taskAttributes = [];
+    // tslint:disable-next-line:no-single-line-block-comment
+    /* istanbul ignore else */
+    if (potentialActions !== undefined) {
+        // tslint:disable-next-line:no-single-line-block-comment
+        /* istanbul ignore else */
+        if (potentialActions.sendOrder !== undefined) {
+            const sendOrderTask = {
+                project: potentialActions.sendOrder.project,
+                name: factory.taskName.SendOrder,
+                status: factory.taskStatus.Ready,
+                runsAt: now,
+                remainingNumberOfTries: 10,
+                numberOfTried: 0,
+                executionResults: [],
+                data: Object.assign({ project: potentialActions.sendOrder.project, object: Object.assign(Object.assign({}, potentialActions.sendOrder.object), { confirmationNumber: params.object.confirmationNumber }) }, (potentialActions.sendOrder.potentialActions !== undefined)
+                    ? { potentialActions: potentialActions.sendOrder.potentialActions }
+                    : undefined)
+            };
+            taskAttributes.push(sendOrderTask);
+        }
+        // ポイント付与
+        // tslint:disable-next-line:no-single-line-block-comment
+        /* istanbul ignore else */
+        if (Array.isArray(potentialActions.givePointAward)) {
+            taskAttributes.push(...potentialActions.givePointAward.map((a) => {
+                return {
+                    project: a.project,
+                    name: factory.taskName.GivePointAward,
+                    status: factory.taskStatus.Ready,
+                    runsAt: now,
+                    remainingNumberOfTries: 10,
+                    numberOfTried: 0,
+                    executionResults: [],
+                    data: a
+                };
+            }));
+        }
+    }
+    return taskAttributes;
+}

package/lib/chevre/service/order/placeOrder.d.ts

@@ -4,8 +4,8 @@ import { RedisRepository as RegisterServiceInProgressRepo } from '../../repo/act
 import { MongoRepository as OrderRepo } from '../../repo/order';
 import { MongoRepository as TaskRepo } from '../../repo/task';
 import { MongoRepository as TransactionRepo } from '../../repo/transaction';
+import { IExternalOrder } from './onOrderStatusChanged';
 import * as factory from '../../factory';
-type IExternalOrder = Pick<factory.order.IOrder, 'project' | 'typeOf' | 'seller' | 'customer' | 'confirmationNumber' | 'orderNumber' | 'price' | 'priceCurrency' | 'orderDate' | 'name' | 'orderStatus' | 'orderedItem' | 'paymentMethods'>;
 /**
  * 注文取引なしに注文を作成する
  */
@@ -15,7 +15,6 @@ declare function placeOrderWithoutTransaction(params: {
         id: string;
     };
     object: IExternalOrder;
-    potentialActions?: factory.action.trade.order.IPotentialActions;
 }): (repos: {
     accountingReport: AccountingReportRepo;
     action: ActionRepo;

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

@@ -98,12 +98,6 @@ function placeOrderWithoutTransaction(params) {
     return (repos) => __awaiter(this, void 0, void 0, function* () {
         var _a;
         const order = params.object;
-        // 注文番号から取引と注文をfixする
-        // const { order, placeOrderTransaction } = await createOrderFromBody({
-        //     project: { id: params.project.id },
-        //     confirmationNumber: params.object.confirmationNumber,
-        //     orderNumber: params.object.orderNumber
-        // })({ transaction: repos.transaction });
         // アクションを作成する(2022-04-11~)
         const maskedCustomer = (0, order_1.createMaskedCustomer)(order, { noProfile: true });
         const simpleOrder = {
@@ -145,21 +139,17 @@ function placeOrderWithoutTransaction(params) {
         yield repos.action.complete({ typeOf: orderActionAttributes.typeOf, id: action.id, result: {} });
         // 経理レポートを保管
         yield (0, createAccountingReportIfNotExist_1.createAccountingReportIfNotExist)(order)({ accountingReport: repos.accountingReport });
-        yield (0, onOrderStatusChanged_1.onOrderStatusChanged)({ order: order })({
-            registerActionInProgress: repos.registerActionInProgress,
-            task: repos.task
-        });
-        // 潜在アクション
-        yield onPlaceOrder({
-            object: order,
-            potentialActions: params.potentialActions
-        })(repos);
+        // await onOrderStatusChanged({ order: <factory.order.IOrder>order })({
+        //     registerActionInProgress: repos.registerActionInProgress,
+        //     task: repos.task
+        // });
     });
 }
 exports.placeOrderWithoutTransaction = placeOrderWithoutTransaction;
 /**
  * 注文を作成する
  */
+// tslint:disable-next-line:max-func-body-length
 function placeOrder(params) {
     return (repos) => __awaiter(this, void 0, void 0, function* () {
         var _a;
@@ -226,71 +216,22 @@ function placeOrder(params) {
             }
             yield repos.action.complete({ typeOf: orderActionAttributes.typeOf, id: action.id, result: {} });
         }
-        if (params.useOnOrderStatusChanged || params.useOnOrderStatusChanged === undefined) {
+        if (typeof params.useOnOrderStatusChanged !== 'boolean') {
+            throw new factory.errors.Argument('useOnOrderStatusChanged', 'must be boolean');
+        }
+        if (params.useOnOrderStatusChanged) {
             // 経理レポートを保管
             yield (0, createAccountingReportIfNotExist_1.createAccountingReportIfNotExist)(order)({ accountingReport: repos.accountingReport });
-            yield (0, onOrderStatusChanged_1.onOrderStatusChanged)({ order })({
+            yield (0, onOrderStatusChanged_1.onOrderStatusChanged)({ order, placeOrderTransaction })({
                 registerActionInProgress: repos.registerActionInProgress,
                 task: repos.task
             });
         }
-        // 潜在アクション
-        yield onPlaceOrder({
-            object: order,
-            potentialActions: params.potentialActions
-        })(repos);
+        // onOrderStatusChangedへ移行(2023-08-17~)
+        // await onPlaceOrder({
+        //     object: order,
+        //     potentialActions: params.potentialActions
+        // })(repos);
     });
 }
 exports.placeOrder = placeOrder;
-/**
- * 注文作成後のアクション
- */
-function onPlaceOrder(params) {
-    return (repos) => __awaiter(this, void 0, void 0, function* () {
-        const potentialActions = params.potentialActions;
-        const now = new Date();
-        // potentialActionsのためのタスクを生成
-        const taskAttributes = [];
-        // tslint:disable-next-line:no-single-line-block-comment
-        /* istanbul ignore else */
-        if (potentialActions !== undefined) {
-            // tslint:disable-next-line:no-single-line-block-comment
-            /* istanbul ignore else */
-            if (potentialActions.sendOrder !== undefined) {
-                const sendOrderTask = {
-                    project: potentialActions.sendOrder.project,
-                    name: factory.taskName.SendOrder,
-                    status: factory.taskStatus.Ready,
-                    runsAt: now,
-                    remainingNumberOfTries: 10,
-                    numberOfTried: 0,
-                    executionResults: [],
-                    // data: potentialActions.sendOrder
-                    data: Object.assign({ project: potentialActions.sendOrder.project, object: Object.assign(Object.assign({}, potentialActions.sendOrder.object), { confirmationNumber: params.object.confirmationNumber }) }, (potentialActions.sendOrder.potentialActions !== undefined)
-                        ? { potentialActions: potentialActions.sendOrder.potentialActions }
-                        : undefined)
-                };
-                taskAttributes.push(sendOrderTask);
-            }
-            // ポイント付与
-            // tslint:disable-next-line:no-single-line-block-comment
-            /* istanbul ignore else */
-            if (Array.isArray(potentialActions.givePointAward)) {
-                taskAttributes.push(...potentialActions.givePointAward.map((a) => {
-                    return {
-                        project: a.project,
-                        name: factory.taskName.GivePointAward,
-                        status: factory.taskStatus.Ready,
-                        runsAt: now,
-                        remainingNumberOfTries: 10,
-                        numberOfTried: 0,
-                        executionResults: [],
-                        data: a
-                    };
-                }));
-            }
-        }
-        // タスク保管
-        yield repos.task.saveMany(taskAttributes, { emitImmediately: true });
-    });
-}

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

@@ -80,28 +80,39 @@ function createMovieTicket(params) {
     };
 }
 function createAuthorizeResult(params) {
-    var _a, _b, _c, _d, _e, _f;
+    var _a, _b, _c, _d, _e, _f, _g;
     const payTransactionObject = params.payTransaction.object;
     const totalPaymentDue = (_a = payTransactionObject.paymentMethod) === null || _a === void 0 ? void 0 : _a.totalPaymentDue;
     if (typeof (totalPaymentDue === null || totalPaymentDue === void 0 ? void 0 : totalPaymentDue.typeOf) !== 'string') {
         throw new factory.errors.ServiceUnavailable('payTransaction.object.paymentMethod.totalPaymentDue undefined');
     }
-    const issuedThrough = Object.assign({ typeOf: payTransactionObject.typeOf, id: (typeof payTransactionObject.id === 'string') ? payTransactionObject.id : '' }, (typeof ((_c = (_b = payTransactionObject.serviceOutput) === null || _b === void 0 ? void 0 : _b.amount) === null || _c === void 0 ? void 0 : _c.currency) === 'string')
-        ? { serviceOutput: payTransactionObject.serviceOutput }
+    const issuedThrough = {
+        typeOf: payTransactionObject.typeOf,
+        id: (typeof payTransactionObject.id === 'string') ? payTransactionObject.id : ''
+    };
+    // 決済取引から決済カード通貨区分を取り出す
+    const paymentMethodAmountCurrencyByPayTransaction = (typeof ((_b = payTransactionObject.paymentMethod) === null || _b === void 0 ? void 0 : _b.amount) !== 'number')
+        ? (_d = (_c = payTransactionObject.paymentMethod) === null || _c === void 0 ? void 0 : _c.amount) === null || _d === void 0 ? void 0 : _d.currency
+        : undefined;
+    const paymentMethodAsObject = Object.assign({ typeOf: params.object.paymentMethod }, (payTransactionObject.typeOf === factory.service.paymentService.PaymentServiceType.CreditCard
+        && typeof paymentMethodAmountCurrencyByPayTransaction === 'string')
+        ? { amount: { currency: paymentMethodAmountCurrencyByPayTransaction } }
         : undefined);
     return {
-        accountId: (typeof ((_d = payTransactionObject.paymentMethod) === null || _d === void 0 ? void 0 : _d.accountId) === 'string')
+        accountId: (typeof ((_e = payTransactionObject.paymentMethod) === null || _e === void 0 ? void 0 : _e.accountId) === 'string')
             ? payTransactionObject.paymentMethod.accountId
             : '',
         // 廃止(2023-08-07~)
         // amount: params.object.amount,
         issuedThrough,
-        paymentMethod: params.object.paymentMethod,
+        // 完全廃止(paymentMethodAsObjectへ完全移行)(2023-08-16~)
+        // paymentMethod: params.object.paymentMethod,
+        paymentMethodAsObject,
         paymentStatus: factory.paymentStatusType.PaymentDue,
-        paymentMethodId: (typeof ((_e = payTransactionObject.paymentMethod) === null || _e === void 0 ? void 0 : _e.paymentMethodId) === 'string')
+        paymentMethodId: (typeof ((_f = payTransactionObject.paymentMethod) === null || _f === void 0 ? void 0 : _f.paymentMethodId) === 'string')
             ? payTransactionObject.paymentMethod.paymentMethodId
             : '',
-        name: (typeof ((_f = payTransactionObject.paymentMethod) === null || _f === void 0 ? void 0 : _f.name) === 'string')
+        name: (typeof ((_g = payTransactionObject.paymentMethod) === null || _g === void 0 ? void 0 : _g.name) === 'string')
             ? payTransactionObject.paymentMethod.name
             : params.object.paymentMethod,
         totalPaymentDue: totalPaymentDue,

package/lib/chevre/service/payment/creditCard.js

@@ -114,7 +114,9 @@ function processAuthorizeCreditCard(params) {
             shopPass: params.shopPass,
             orderId: params.orderId,
             jobCd: GMO.utils.util.JobCd.Auth,
-            amount: params.object.amount,
+            amount: (typeof params.object.amount === 'number')
+                ? params.object.amount
+                : params.object.amount.value,
             siteId: (_a = params.availableChannel.credentials) === null || _a === void 0 ? void 0 : _a.siteId,
             sitePass: (_b = params.availableChannel.credentials) === null || _b === void 0 ? void 0 : _b.sitePass
         };

package/lib/chevre/service/payment/paymentCard.js

@@ -127,7 +127,7 @@ function validatePaymentMethod(params, paymentServiceId) {
 }
 function processAccountTransaction(params) {
     return (repos) => __awaiter(this, void 0, void 0, function* () {
-        var _a, _b, _c, _d, _e, _f;
+        var _a, _b, _c, _d, _e, _f, _g, _h;
         let pendingTransaction;
         const defaultName = `${factory.assetTransactionType.Pay} Transaction ${params.transactionNumber}`;
         const agent = Object.assign(Object.assign({}, params.agent), { name: (typeof params.agent.name === 'string') ? params.agent.name : defaultName });
@@ -165,7 +165,11 @@ function processAccountTransaction(params) {
             expires: params.expires,
             recipient: recipient,
             object: {
-                amount: { value: (_f = params.paymentMethod) === null || _f === void 0 ? void 0 : _f.amount },
+                amount: {
+                    value: (typeof ((_f = params.paymentMethod) === null || _f === void 0 ? void 0 : _f.amount) === 'number')
+                        ? (_g = params.paymentMethod) === null || _g === void 0 ? void 0 : _g.amount
+                        : (_h = params.paymentMethod) === null || _h === void 0 ? void 0 : _h.amount.value
+                },
                 description: description,
                 fromLocation: {
                     accountNumber: accountNumber

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

@@ -13,6 +13,7 @@ exports.call = void 0;
 const accountingReport_1 = require("../../repo/accountingReport");
 const action_1 = require("../../repo/action");
 const assetTransaction_1 = require("../../repo/assetTransaction");
+const event_1 = require("../../repo/event");
 const order_1 = require("../../repo/order");
 const ownershipInfo_1 = require("../../repo/ownershipInfo");
 const reservation_1 = require("../../repo/reservation");
@@ -28,6 +29,7 @@ function call(data) {
             accountingReport: new accountingReport_1.MongoRepository(settings.connection),
             action: new action_1.MongoRepository(settings.connection),
             assetTransaction: new assetTransaction_1.MongoRepository(settings.connection),
+            event: new event_1.MongoRepository(settings.connection),
             order: new order_1.MongoRepository(settings.connection),
             ownershipInfo: new ownershipInfo_1.MongoRepository(settings.connection),
             reservation: new reservation_1.MongoRepository(settings.connection),

package/lib/chevre/service/transaction/deleteTransaction.d.ts

@@ -2,6 +2,7 @@ import * as factory from '../../factory';
 import { MongoRepository as AccountingReportRepo } from '../../repo/accountingReport';
 import { MongoRepository as ActionRepo } from '../../repo/action';
 import { MongoRepository as AssetTransactionRepo } from '../../repo/assetTransaction';
+import { MongoRepository as EventRepo } from '../../repo/event';
 import { MongoRepository as OrderRepo } from '../../repo/order';
 import { MongoRepository as OwnershipInfoRepo } from '../../repo/ownershipInfo';
 import { MongoRepository as ReservationRepo } from '../../repo/reservation';
@@ -15,6 +16,7 @@ export declare function deleteTransaction(params: factory.task.IData<factory.tas
     accountingReport: AccountingReportRepo;
     action: ActionRepo;
     assetTransaction: AssetTransactionRepo;
+    event: EventRepo;
     order: OrderRepo;
     ownershipInfo: OwnershipInfoRepo;
     reservation: ReservationRepo;

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

@@ -14,12 +14,8 @@ function createStartParams(params, passport, seller, amount, fromLocation, toLoc
             id: String(seller.id),
             name: seller.name,
             typeOf: seller.typeOf
-            // ↓最適化(2022-05-24~)
-            // ...{ project: seller.project }
         },
-        object: Object.assign(Object.assign({ amount: amount, fromLocation: fromLocation, toLocation: toLocation, 
-            // authorizeActions: [],
-            pendingTransaction: Object.assign({ transactionNumber }, (typeof ((_a = params.object.pendingTransaction) === null || _a === void 0 ? void 0 : _a.identifier) === 'string')
+        object: Object.assign(Object.assign({ amount: amount, fromLocation: fromLocation, toLocation: toLocation, pendingTransaction: Object.assign({ transactionNumber }, (typeof ((_a = params.object.pendingTransaction) === null || _a === void 0 ? void 0 : _a.identifier) === 'string')
                 ? { identifier: params.object.pendingTransaction.identifier }
                 : undefined) }, (passport !== undefined) ? { passport } : undefined), (typeof params.object.description === 'string') ? { description: params.object.description } : undefined),
         expires: params.expires

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

@@ -537,7 +537,6 @@ function confirm(params) {
         yield repos.transaction.confirm({
             typeOf: factory.transactionType.MoneyTransfer,
             id: transaction.id,
-            authorizeActions: [],
             result: {},
             potentialActions: potentialActions
         });

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

@@ -117,10 +117,6 @@ function createProductItems(params) {
 exports.createProductItems = createProductItems;
 function createMoneyTransferAcceptedOffers(params) {
     // 通貨転送承認アクション
-    // 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)

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

@@ -70,16 +70,18 @@ function createPaymentMethods(params) {
     });
     // 決済方法をセット
     authorizePaymentActions.forEach((a) => {
+        var _a, _b, _c;
         const result = a.result;
-        paymentMethods.push({
-            accountId: result.accountId,
-            additionalProperty: (Array.isArray(result.additionalProperty)) ? result.additionalProperty : [],
-            issuedThrough: result.issuedThrough,
-            name: result.name,
-            paymentMethodId: result.paymentMethodId,
-            totalPaymentDue: result.totalPaymentDue,
-            typeOf: result.paymentMethod
-        });
+        const paymentMethodAmountCurrencyByAuthorizeAction = (_b = (_a = result.paymentMethodAsObject) === null || _a === void 0 ? void 0 : _a.amount) === null || _b === void 0 ? void 0 : _b.currency;
+        const paymentMethodOfInvoice = (typeof paymentMethodAmountCurrencyByAuthorizeAction === 'string') ?
+            { amount: { currency: paymentMethodAmountCurrencyByAuthorizeAction } }
+            : undefined;
+        // 決済方法区分は必ず存在するはず(2023-08-15~)
+        const paymentMethodType = (_c = result.paymentMethodAsObject) === null || _c === void 0 ? void 0 : _c.typeOf;
+        if (typeof paymentMethodType !== 'string') {
+            throw new factory.errors.NotFound('authorizePaymentAction.result.paymentMethodAsObject.typeOf');
+        }
+        paymentMethods.push(Object.assign({ accountId: result.accountId, additionalProperty: (Array.isArray(result.additionalProperty)) ? result.additionalProperty : [], issuedThrough: result.issuedThrough, name: result.name, paymentMethodId: result.paymentMethodId, totalPaymentDue: result.totalPaymentDue, typeOf: paymentMethodType }, (paymentMethodOfInvoice !== undefined) ? { paymentMethod: paymentMethodOfInvoice } : undefined));
     });
     // 決済方法から注文金額の計算
     // price += authorizePaymentActions

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

@@ -11,14 +11,16 @@ const debug = createDebug('cinerino-domain:service:validateMovieTicket');
  * 座席予約オファー承認に対してムビチケ承認条件が整っているかどうか検証する
  */
 function validateMovieTicket(paymentMethodType, transaction, authorizeActions) {
-    // const authorizeActions = transaction.object.authorizeActions;
     const authorizeMovieTicketActions = authorizeActions.filter((a) => {
-        var _a, _b, _c;
+        var _a, _b, _c, _d;
         return a.actionStatus === factory.actionStatusType.CompletedActionStatus
             && ((_a = a.result) === null || _a === void 0 ? void 0 : _a.typeOf) === factory.action.authorize.paymentMethod.any.ResultType.Payment
             && ((_b = a.result) === null || _b === void 0 ? void 0 : _b.issuedThrough.typeOf) === factory.service.paymentService.PaymentServiceType.MovieTicket
-            && ((_c = a.result) === null || _c === void 0 ? void 0 : _c.paymentMethod) === paymentMethodType;
-    });
+            // 決済方法区分は必ず存在するはず(2023-08-15~)
+            && ((_d = (_c = a.result) === null || _c === void 0 ? void 0 : _c.paymentMethodAsObject) === null || _d === void 0 ? void 0 : _d.typeOf) === paymentMethodType;
+    }
+    // && a.result?.paymentMethod === paymentMethodType
+    );
     const seatReservationAuthorizeActions = authorizeActions.filter((a) => a.actionStatus === factory.actionStatusType.CompletedActionStatus
         && a.object.typeOf === factory.action.authorize.offer.seatReservation.ObjectType.SeatReservation);
     // 予約によって必要とされるMovieTicket

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

@@ -38,10 +38,7 @@ function validateTransaction(transaction, authorizeActions) {
     validatePaymentUrl(transaction, authorizeActions);
 }
 exports.validateTransaction = validateTransaction;
-function findMovieTicketPaymentMethodTypesFromTransaction(
-// transaction: factory.transaction.placeOrder.ITransaction,
-authorizeActions) {
-    // const authorizeActions = transaction.object.authorizeActions;
+function findMovieTicketPaymentMethodTypesFromTransaction(authorizeActions) {
     const authorizeMovieTicketPaymentActions = authorizeActions.filter((a) => {
         var _a, _b;
         return a.actionStatus === factory.actionStatusType.CompletedActionStatus
@@ -55,9 +52,6 @@ authorizeActions) {
     seatReservationAuthorizeActions.forEach((action) => {
         var _a;
         // a.objectではなくa.resultを使用する(2022-06-04~)
-        // const acceptedOffer =
-        // tslint:disable-next-line:max-line-length
-        //     (<factory.action.authorize.offer.seatReservation.IObject<factory.service.webAPI.Identifier.Chevre>>action.object).acceptedOffer;
         const acceptedOffers = (_a = action.result) === null || _a === void 0 ? void 0 : _a.acceptedOffers;
         acceptedOffers === null || acceptedOffers === void 0 ? void 0 : acceptedOffers.forEach((offer) => {
             var _a;
@@ -72,14 +66,15 @@ authorizeActions) {
         });
     });
     const paymentMethodTypes = [
-        ...authorizeMovieTicketPaymentActions.map((a) => { var _a; return String((_a = a.result) === null || _a === void 0 ? void 0 : _a.paymentMethod); }),
+        // 決済方法区分は必ず存在するはず(2023-08-15~)
+        ...authorizeMovieTicketPaymentActions.map((a) => { var _a, _b; return String((_b = (_a = a.result) === null || _a === void 0 ? void 0 : _a.paymentMethodAsObject) === null || _b === void 0 ? void 0 : _b.typeOf); }),
+        // ...authorizeMovieTicketPaymentActions.map((a) => String(a.result?.paymentMethod)),
         ...requiredMovieTicketPaymentMethodTypes
     ];
     return [...new Set(paymentMethodTypes)];
 }
 function validateProfile(transaction) {
     // object.customerで検証(2022-05-26~)
-    // const profile = transaction.agent;
     const profile = transaction.object.customer;
     if (typeof (profile === null || profile === void 0 ? void 0 : profile.email) !== 'string' || (profile === null || profile === void 0 ? void 0 : profile.email.length) === 0
         || typeof (profile === null || profile === void 0 ? void 0 : profile.familyName) !== 'string' || (profile === null || profile === void 0 ? void 0 : profile.familyName.length) === 0
@@ -89,7 +84,6 @@ function validateProfile(transaction) {
     }
 }
 function validatePrice(transaction, authorizeActions) {
-    // const authorizeActions = transaction.object.authorizeActions;
     let priceByAgent = 0;
     let priceBySeller = 0;
     // 決済承認を確認
@@ -121,7 +115,6 @@ function validatePrice(transaction, authorizeActions) {
     }
 }
 function validatePaymentUrl(transaction, authorizeActions) {
-    // const authorizeActions = transaction.object.authorizeActions;
     var _a, _b;
     // 決済URLが発行されている場合、検証
     const paymentMethodId = (_a = transaction.object.paymentMethods) === null || _a === void 0 ? void 0 : _a.paymentMethodId;
@@ -145,10 +138,7 @@ function validatePaymentUrl(transaction, authorizeActions) {
 /**
  * JPY以外の通貨について取引を検証する
  */
-function validateMonetaryAmount(
-// transaction: factory.transaction.placeOrder.ITransaction,
-authorizeActions) {
-    // const authorizeActions = transaction.object.authorizeActions;
+function validateMonetaryAmount(authorizeActions) {
     const authorizeMonetaryAmountActions = authorizeActions
         .filter((a) => {
         var _a, _b;
@@ -216,7 +206,7 @@ function validatePaymentMethods(params) {
         const creditCardPaymentMethodCount = params.order.paymentMethods.filter((p) => {
             var _a, _b;
             // カード通貨区分の存在する決済サービスを考慮(2023-08-09~)
-            const serviceOutputAmountCurrency = (_b = (_a = p.issuedThrough.serviceOutput) === null || _a === void 0 ? void 0 : _a.amount) === null || _b === void 0 ? void 0 : _b.currency;
+            const serviceOutputAmountCurrency = (_b = (_a = p.paymentMethod) === null || _a === void 0 ? void 0 : _a.amount) === null || _b === void 0 ? void 0 : _b.currency;
             return p.issuedThrough.typeOf === factory.service.paymentService.PaymentServiceType.CreditCard
                 && typeof serviceOutputAmountCurrency !== 'string';
         }).length;
@@ -230,10 +220,6 @@ exports.validatePaymentMethods = validatePaymentMethods;
  * イベントオファー適用条件確認
  */
 function validateEventOffers(params) {
-    // const seatReservationAuthorizeActions = <IAuthorizeSeatReservationOffer[]>
-    //     params.transaction.object.authorizeActions
-    //         .filter((a) => a.actionStatus === factory.actionStatusType.CompletedActionStatus)
-    //         .filter((a) => a.object.typeOf === factory.action.authorize.offer.seatReservation.ObjectType.SeatReservation);
     const seatReservationAuthorizeActions = params.authorizeActions
         .filter((a) => a.actionStatus === factory.actionStatusType.CompletedActionStatus)
         .filter((a) => a.object.typeOf === factory.action.authorize.offer.seatReservation.ObjectType.SeatReservation);