@chevre/domain 21.8.0-alpha.4 → 21.8.0-alpha.41

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

@@ -70,6 +70,21 @@ export declare class MongoRepository {
     }): Promise<{
         updatedAt: Date;
     }>;
+    /**
+     * 注文後に決済方法区分を確定する
+     */
+    fixPaymentMethodIdentifier(params: {
+        project: {
+            id: string;
+        };
+        orderNumber: string;
+        invoice: {
+            paymentMethodId: string;
+            paymentMethod: {
+                identifier: string;
+            };
+        };
+    }): Promise<void>;
     findById(params: {
         id: string;
         inclusion: string[];

package/lib/chevre/repo/order.js

@@ -681,7 +681,10 @@ class MongoRepository {
                 orderNumber: { $eq: params.orderNumber },
                 orderStatus: { $eq: params.previousOrderStatus },
                 'project.id': { $eq: params.project.id }
-            }, { orderStatus: params.orderStatus }, {
+            }, {
+                previousOrderStatus: params.previousOrderStatus,
+                orderStatus: params.orderStatus
+            }, {
                 new: true,
                 projection: {
                     __v: 0,
@@ -723,6 +726,7 @@ class MongoRepository {
                 orderStatus: { $eq: factory.orderStatus.OrderDelivered },
                 'project.id': { $eq: params.project.id }
             }, {
+                previousOrderStatus: factory.orderStatus.OrderDelivered,
                 orderStatus: factory.orderStatus.OrderReturned,
                 dateReturned: params.dateReturned,
                 returner: params.returner
@@ -782,6 +786,35 @@ class MongoRepository {
             return { updatedAt: doc.updatedAt };
         });
     }
+    /**
+     * 注文後に決済方法区分を確定する
+     */
+    fixPaymentMethodIdentifier(params) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const doc = yield this.orderModel.findOneAndUpdate({
+                orderNumber: { $eq: params.orderNumber },
+                'project.id': { $eq: params.project.id },
+                'paymentMethods.paymentMethodId': { $exists: true, $eq: params.invoice.paymentMethodId }
+            }, {
+                $set: {
+                    'paymentMethods.$[invoice].paymentMethod.identifier': params.invoice.paymentMethod.identifier,
+                    // tslint:disable-next-line:no-suspicious-comment
+                    // TODO 互換性維持対応としてtypeOfも変更しているが、そのうち廃止(2023-08-30)
+                    'paymentMethods.$[invoice].typeOf': params.invoice.paymentMethod.identifier
+                }
+            }, {
+                arrayFilters: [{ 'invoice.paymentMethodId': { $eq: params.invoice.paymentMethodId } }],
+                new: true,
+                projection: {
+                    _id: 1
+                }
+            })
+                .exec();
+            if (doc === null) {
+                throw new factory.errors.NotFound(this.orderModel.modelName);
+            }
+        });
+    }
     findById(params) {
         return __awaiter(this, void 0, void 0, function* () {
             let projection = {};

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

@@ -30,11 +30,17 @@ export declare class MongoRepository {
     saveMany(taskAttributes: factory.task.IAttributes<factory.taskName>[], options: IOptionOnCreate): Promise<{
         id: string;
     }[]>;
+    /**
+     * タスク識別子から冪等作成する
+     */
+    createIfNotExistByIdentifier(params: factory.task.IAttributes<factory.taskName>, options: IOptionOnCreate): Promise<void>;
     createInformTaskIfNotExist(params: factory.task.IAttributes<factory.taskName.TriggerWebhook>, options: IOptionOnCreate): Promise<void>;
     /**
      * 取引削除タスク冪等作成
      */
     createDeleteTransactionTaskIfNotExist(params: factory.task.IAttributes<factory.taskName.DeleteTransaction>, options: IOptionOnCreate): Promise<void>;
+    createConfirmReserveTransactionTaskIfNotExist(params: factory.task.IAttributes<factory.taskName.ConfirmReserveTransaction>, options: IOptionOnCreate): Promise<void>;
+    createOnAssetTransactionStatusChangedTaskIfNotExist(params: factory.task.IAttributes<factory.taskName.OnAssetTransactionStatusChanged>, options: IOptionOnCreate): Promise<void>;
     createSendOrderTaskIfNotExist(params: factory.task.IAttributes<factory.taskName.SendOrder>, options: IOptionOnCreate): Promise<void>;
     executeById(params: {
         id: string;
@@ -68,7 +74,7 @@ export declare class MongoRepository {
              */
             $nin?: factory.taskName[];
         };
-    }): Promise<Pick<import("@chevre/factory/lib/task").ITask | import("@chevre/factory/lib/task/confirmMoneyTransfer").ITask | import("@chevre/factory/lib/task/confirmRegisterService").ITask | import("@chevre/factory/lib/task/confirmPayTransaction").ITask | import("@chevre/factory/lib/task/confirmRegisterServiceTransaction").ITask | import("@chevre/factory/lib/task/confirmReserveTransaction").ITask | import("@chevre/factory/lib/task/createEvent").ITask | import("@chevre/factory/lib/task/deleteTransaction").ITask | import("@chevre/factory/lib/task/givePointAward").ITask | import("@chevre/factory/lib/task/onAuthorizationCreated").ITask | import("@chevre/factory/lib/task/onEventChanged").ITask | import("@chevre/factory/lib/task/onResourceUpdated").ITask | import("@chevre/factory/lib/task/placeOrder").ITask | import("@chevre/factory/lib/task/returnOrder").ITask | import("@chevre/factory/lib/task/returnMoneyTransfer").ITask | import("@chevre/factory/lib/task/returnPayTransaction").ITask | import("@chevre/factory/lib/task/returnPointAward").ITask | import("@chevre/factory/lib/task/returnReserveTransaction").ITask | import("@chevre/factory/lib/task/sendEmailMessage").ITask | import("@chevre/factory/lib/task/sendOrder").ITask | import("@chevre/factory/lib/task/syncScreeningRooms").ITask | import("@chevre/factory/lib/task/triggerWebhook").ITask | import("@chevre/factory/lib/task/useReservation").ITask | import("@chevre/factory/lib/task/voidMoneyTransferTransaction").ITask | import("@chevre/factory/lib/task/voidPayTransaction").ITask | import("@chevre/factory/lib/task/voidRegisterServiceTransaction").ITask | import("@chevre/factory/lib/task/voidReserveTransaction").ITask, "id" | "name" | "status">[]>;
+    }): Promise<Pick<import("@chevre/factory/lib/task").ITask | import("@chevre/factory/lib/task/confirmMoneyTransfer").ITask | import("@chevre/factory/lib/task/confirmRegisterService").ITask | import("@chevre/factory/lib/task/confirmPayTransaction").ITask | import("@chevre/factory/lib/task/confirmRegisterServiceTransaction").ITask | import("@chevre/factory/lib/task/confirmReserveTransaction").ITask | import("@chevre/factory/lib/task/createEvent").ITask | import("@chevre/factory/lib/task/deleteTransaction").ITask | import("@chevre/factory/lib/task/givePointAward").ITask | import("@chevre/factory/lib/task/onAssetTransactionStatusChanged").ITask | import("@chevre/factory/lib/task/onAuthorizationCreated").ITask | import("@chevre/factory/lib/task/onEventChanged").ITask | import("@chevre/factory/lib/task/onResourceUpdated").ITask | import("@chevre/factory/lib/task/onOrderPaymentCompleted").ITask | import("@chevre/factory/lib/task/placeOrder").ITask | import("@chevre/factory/lib/task/returnOrder").ITask | import("@chevre/factory/lib/task/returnMoneyTransfer").ITask | import("@chevre/factory/lib/task/returnPayTransaction").ITask | import("@chevre/factory/lib/task/returnPointAward").ITask | import("@chevre/factory/lib/task/returnReserveTransaction").ITask | import("@chevre/factory/lib/task/sendEmailMessage").ITask | import("@chevre/factory/lib/task/sendOrder").ITask | import("@chevre/factory/lib/task/syncAggregateOffer").ITask | import("@chevre/factory/lib/task/syncScreeningRooms").ITask | import("@chevre/factory/lib/task/triggerWebhook").ITask | import("@chevre/factory/lib/task/useReservation").ITask | import("@chevre/factory/lib/task/voidMoneyTransferTransaction").ITask | import("@chevre/factory/lib/task/voidPayTransaction").ITask | import("@chevre/factory/lib/task/voidRegisterServiceTransaction").ITask | import("@chevre/factory/lib/task/voidReserveTransaction").ITask, "id" | "name" | "status">[]>;
     retry(params: {
         intervalInMinutes: number;
     }): Promise<void>;

package/lib/chevre/repo/task.js

@@ -174,6 +174,30 @@ class MongoRepository {
             }
         });
     }
+    /**
+     * タスク識別子から冪等作成する
+     */
+    createIfNotExistByIdentifier(params, options) {
+        return __awaiter(this, void 0, void 0, function* () {
+            if (typeof params.identifier !== 'string' || params.identifier.length === 0) {
+                throw new factory.errors.ArgumentNull('identifier');
+            }
+            const createdTask = yield this.taskModel.findOneAndUpdate({
+                'project.id': { $eq: params.project.id },
+                name: { $eq: params.name },
+                identifier: { $exists: true, $eq: params.identifier }
+            }, { $setOnInsert: params }, { new: true, upsert: true })
+                .select({ _id: 1 })
+                .exec();
+            if (options.emitImmediately) {
+                task_2.taskEventEmitter.emitTaskStatusChanged({
+                    id: createdTask.id,
+                    name: params.name,
+                    status: factory.taskStatus.Ready
+                });
+            }
+        });
+    }
     createInformTaskIfNotExist(params, options) {
         return __awaiter(this, void 0, void 0, function* () {
             const createdTask = yield this.taskModel.findOneAndUpdate({
@@ -219,6 +243,56 @@ class MongoRepository {
             }
         });
     }
+    createConfirmReserveTransactionTaskIfNotExist(params, options) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const createdTask = yield this.taskModel.findOneAndUpdate({
+                'project.id': { $eq: params.project.id },
+                name: { $eq: params.name },
+                'data.object.transactionNumber': {
+                    $exists: true,
+                    $eq: String(params.data.object.transactionNumber)
+                },
+                'data.purpose.orderNumber': {
+                    $exists: true,
+                    $eq: String(params.data.purpose.orderNumber)
+                }
+            }, { $setOnInsert: params }, { new: true, upsert: true })
+                .select({ _id: 1 })
+                .exec();
+            if (options.emitImmediately) {
+                task_2.taskEventEmitter.emitTaskStatusChanged({
+                    id: createdTask.id,
+                    name: params.name,
+                    status: factory.taskStatus.Ready
+                });
+            }
+        });
+    }
+    createOnAssetTransactionStatusChangedTaskIfNotExist(params, options) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const createdTask = yield this.taskModel.findOneAndUpdate({
+                'project.id': { $eq: params.project.id },
+                name: { $eq: params.name },
+                'data.object.transactionNumber': {
+                    $exists: true,
+                    $eq: String(params.data.object.transactionNumber)
+                },
+                'data.purpose.orderNumber': {
+                    $exists: true,
+                    $eq: String(params.data.purpose.orderNumber)
+                }
+            }, { $setOnInsert: params }, { new: true, upsert: true })
+                .select({ _id: 1 })
+                .exec();
+            if (options.emitImmediately) {
+                task_2.taskEventEmitter.emitTaskStatusChanged({
+                    id: createdTask.id,
+                    name: params.name,
+                    status: factory.taskStatus.Ready
+                });
+            }
+        });
+    }
     createSendOrderTaskIfNotExist(params, options) {
         return __awaiter(this, void 0, void 0, function* () {
             const createdTask = yield this.taskModel.findOneAndUpdate({
@@ -240,6 +314,32 @@ class MongoRepository {
             }
         });
     }
+    // public async createOnOrderPaymentCompletedTaskIfNotExist(
+    //     params: factory.task.IAttributes<factory.taskName.OnOrderPaymentCompleted>,
+    //     options: IOptionOnCreate
+    // ): Promise<void> {
+    //     const createdTask = await this.taskModel.findOneAndUpdate(
+    //         {
+    //             'project.id': { $eq: params.project.id },
+    //             name: { $eq: params.name },
+    //             'data.object.orderNumber': {
+    //                 $exists: true,
+    //                 $eq: String(params.data.object.orderNumber)
+    //             }
+    //         },
+    //         { $setOnInsert: params },
+    //         { new: true, upsert: true }
+    //     )
+    //         .select({ _id: 1 })
+    //         .exec();
+    //     if (options.emitImmediately) {
+    //         taskEventEmitter.emitTaskStatusChanged({
+    //             id: createdTask.id,
+    //             name: params.name,
+    //             status: factory.taskStatus.Ready
+    //         });
+    //     }
+    // }
     executeById(params) {
         return __awaiter(this, void 0, void 0, function* () {
             const doc = yield this.taskModel.findOneAndUpdate({

package/lib/chevre/service/aggregation/event/aggregateScreeningEvent.js

@@ -179,8 +179,8 @@ function findOffers(params) {
                 if (typeof ((_b = eventService.hasOfferCatalog) === null || _b === void 0 ? void 0 : _b.id) === 'string') {
                     const findOffersByOfferCatalogIdResult = yield repos.offer.findOffersByOfferCatalogId({
                         offerCatalog: { id: eventService.hasOfferCatalog.id },
-                        excludeAppliesToMovieTicket: false,
-                        sort: false // ソート不要(2023-01-27~)
+                        excludeAppliesToMovieTicket: false
+                        // sort: false // ソート不要(2023-01-27~) // 完全廃止(2023-09-04~)
                     });
                     availableOffers = findOffersByOfferCatalogIdResult.offers;
                 }

package/lib/chevre/service/aggregation/event/aggregateUseActionsOnEvent.js

@@ -104,8 +104,8 @@ function findOffers(params) {
                 if (typeof ((_b = eventService.hasOfferCatalog) === null || _b === void 0 ? void 0 : _b.id) === 'string') {
                     const findOffersByOfferCatalogIdResult = yield repos.offer.findOffersByOfferCatalogId({
                         offerCatalog: { id: eventService.hasOfferCatalog.id },
-                        excludeAppliesToMovieTicket: false,
-                        sort: false // ソート不要(2023-01-27~)
+                        excludeAppliesToMovieTicket: false
+                        // sort: false // ソート不要(2023-01-27~) // 完全廃止(2023-09-04~)
                     });
                     availableOffers = findOffersByOfferCatalogIdResult.offers;
                 }

package/lib/chevre/service/assetTransaction/pay/account/validation.js

@@ -15,9 +15,9 @@ function validateAccount(params) {
     return (repos) => __awaiter(this, void 0, void 0, function* () {
         var _a, _b, _c, _d;
         // 引き出し口座の存在を確認する
-        const paymentMethodType = (_a = params.object.paymentMethod) === null || _a === void 0 ? void 0 : _a.typeOf;
+        const paymentMethodType = (_a = params.object.paymentMethod) === null || _a === void 0 ? void 0 : _a.identifier;
         if (typeof paymentMethodType !== 'string') {
-            throw new factory.errors.ArgumentNull('object.paymentMethod.typeOf');
+            throw new factory.errors.ArgumentNull('object.paymentMethod.identifier');
         }
         const accountNumber = (_b = params.object.paymentMethod) === null || _b === void 0 ? void 0 : _b.accountId;
         if (typeof accountNumber !== 'string') {

package/lib/chevre/service/assetTransaction/pay/factory.js

@@ -8,16 +8,16 @@ const factory = require("../../../factory");
 const settings_1 = require("../../../settings");
 // tslint:disable-next-line:cyclomatic-complexity max-func-body-length
 function createStartParams(params) {
-    var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s, _t, _u, _v, _w, _x, _y, _z, _0, _1;
+    var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s, _t, _u, _v, _w, _x, _y, _z, _0;
     const paymentServiceId = (params.paymentService !== undefined)
         ? String(params.paymentService.id)
         : '';
     const paymentMethodType = (params.paymentService !== undefined)
         // FaceToFace以外は、プロダクトから決済方法タイプを自動取得
         ? (_a = params.paymentService.serviceType) === null || _a === void 0 ? void 0 : _a.codeValue
-        : (_b = params.object.paymentMethod) === null || _b === void 0 ? void 0 : _b.typeOf;
+        : (_b = params.object.paymentMethod) === null || _b === void 0 ? void 0 : _b.identifier;
     if (typeof paymentMethodType !== 'string') {
-        throw new factory.errors.ArgumentNull('object.paymentMethod.typeOf');
+        throw new factory.errors.ArgumentNull('object.paymentMethod.identifier');
     }
     let totalPaymentDue;
     switch (params.paymentServiceType) {
@@ -68,10 +68,16 @@ function createStartParams(params) {
         }
     }
     else if (params.paymentServiceType === factory.service.paymentService.PaymentServiceType.CreditCard) {
+        const creditCardPaymentServiceOutput = (_l = params.paymentService) === null || _l === void 0 ? void 0 : _l.serviceOutput;
+        const invoiceAsServiceOutput = (Array.isArray(creditCardPaymentServiceOutput))
+            ? creditCardPaymentServiceOutput.find((output) => output.typeOf === 'Invoice')
+            : creditCardPaymentServiceOutput;
         // カード通貨区分が存在すれば適用
-        const creditCardAsPaymentServiceOutputCurrency = (_p = (_o = (_m = (_l = params.paymentService) === null || _l === void 0 ? void 0 : _l.serviceOutput) === null || _m === void 0 ? void 0 : _m.paymentMethod) === null || _o === void 0 ? void 0 : _o.amount) === null || _p === void 0 ? void 0 : _p.currency;
-        if (typeof creditCardAsPaymentServiceOutputCurrency === 'string') {
-            paymentMethodCurrency = creditCardAsPaymentServiceOutputCurrency;
+        if ((invoiceAsServiceOutput === null || invoiceAsServiceOutput === void 0 ? void 0 : invoiceAsServiceOutput.typeOf) === 'Invoice') {
+            const creditCardAsPaymentServiceOutputCurrency = (_o = (_m = invoiceAsServiceOutput.paymentMethod) === null || _m === void 0 ? void 0 : _m.amount) === null || _o === void 0 ? void 0 : _o.currency;
+            if (typeof creditCardAsPaymentServiceOutputCurrency === 'string') {
+                paymentMethodCurrency = creditCardAsPaymentServiceOutputCurrency;
+            }
         }
     }
     const paymentMethodAmount = {
@@ -79,22 +85,24 @@ function createStartParams(params) {
         currency: paymentMethodCurrency,
         value: params.amount
     };
-    const paymentMethod = Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign({ additionalProperty: (Array.isArray((_q = params.object.paymentMethod) === null || _q === void 0 ? void 0 : _q.additionalProperty))
-            ? (_r = params.object.paymentMethod) === null || _r === void 0 ? void 0 : _r.additionalProperty
-            : [], name: (typeof ((_s = params.object.paymentMethod) === null || _s === void 0 ? void 0 : _s.name) === 'string')
+    const paymentMethod = Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign({ additionalProperty: (Array.isArray((_p = params.object.paymentMethod) === null || _p === void 0 ? void 0 : _p.additionalProperty))
+            ? (_q = params.object.paymentMethod) === null || _q === void 0 ? void 0 : _q.additionalProperty
+            : [], name: (typeof ((_r = params.object.paymentMethod) === null || _r === void 0 ? void 0 : _r.name) === 'string')
             ? params.object.paymentMethod.name
             : paymentMethodType, 
         // MonetaryAmount対応(2023-08-14~)
-        amount: (settings_1.USE_OBJECT_AS_PAY_TRANSACTION_AMOUNT) ? paymentMethodAmount : params.amount, paymentMethodId: params.transactionNumber, typeOf: paymentMethodType }, (typeof ((_t = params.object.paymentMethod) === null || _t === void 0 ? void 0 : _t.description) === 'string')
-        ? { description: (_u = params.object.paymentMethod) === null || _u === void 0 ? void 0 : _u.description }
+        amount: (settings_1.USE_OBJECT_AS_PAY_TRANSACTION_AMOUNT) ? paymentMethodAmount : params.amount, 
+        // paymentMethodId: params.transactionNumber, // object.paymentMethodIdへ完全移行(2023-08-30~)
+        identifier: paymentMethodType }, (typeof ((_s = params.object.paymentMethod) === null || _s === void 0 ? void 0 : _s.description) === 'string')
+        ? { description: (_t = params.object.paymentMethod) === null || _t === void 0 ? void 0 : _t.description }
         : undefined), (totalPaymentDue !== undefined)
         ? { totalPaymentDue: totalPaymentDue }
-        : undefined), (typeof accountId === 'string') ? { accountId: accountId } : undefined), (typeof ((_v = params.object.paymentMethod) === null || _v === void 0 ? void 0 : _v.method) === 'string')
-        ? { method: (_w = params.object.paymentMethod) === null || _w === void 0 ? void 0 : _w.method }
-        : undefined), (((_x = params.object.paymentMethod) === null || _x === void 0 ? void 0 : _x.creditCard) !== undefined)
-        ? { creditCard: (_y = params.object.paymentMethod) === null || _y === void 0 ? void 0 : _y.creditCard }
-        : undefined), (Array.isArray((_z = params.object.paymentMethod) === null || _z === void 0 ? void 0 : _z.movieTickets))
-        ? { movieTickets: (_0 = params.object.paymentMethod) === null || _0 === void 0 ? void 0 : _0.movieTickets }
+        : undefined), (typeof accountId === 'string') ? { accountId: accountId } : undefined), (typeof ((_u = params.object.paymentMethod) === null || _u === void 0 ? void 0 : _u.method) === 'string')
+        ? { method: (_v = params.object.paymentMethod) === null || _v === void 0 ? void 0 : _v.method }
+        : undefined), (((_w = params.object.paymentMethod) === null || _w === void 0 ? void 0 : _w.creditCard) !== undefined)
+        ? { creditCard: (_x = params.object.paymentMethod) === null || _x === void 0 ? void 0 : _x.creditCard }
+        : undefined), (Array.isArray((_y = params.object.paymentMethod) === null || _y === void 0 ? void 0 : _y.movieTickets))
+        ? { movieTickets: (_z = params.object.paymentMethod) === null || _z === void 0 ? void 0 : _z.movieTickets }
         : undefined);
     const object = {
         // パラメータから必要なもののみ取り込む
@@ -105,7 +113,7 @@ function createStartParams(params) {
         onPaymentStatusChanged: { informPayment: informPaymentParams },
         paymentMethod
     };
-    return Object.assign({ project: { typeOf: factory.organizationType.Project, id: params.project.id }, transactionNumber: params.transactionNumber, typeOf: factory.assetTransactionType.Pay, agent: params.agent, recipient: params.recipient, object, expires: params.expires }, (typeof ((_1 = params.location) === null || _1 === void 0 ? void 0 : _1.typeOf) === 'string')
+    return Object.assign({ project: { typeOf: factory.organizationType.Project, id: params.project.id }, transactionNumber: params.transactionNumber, typeOf: factory.assetTransactionType.Pay, agent: params.agent, recipient: params.recipient, object, expires: params.expires }, (typeof ((_0 = params.location) === null || _0 === void 0 ? void 0 : _0.typeOf) === 'string')
         ? { location: params.location }
         : undefined);
 }

package/lib/chevre/service/assetTransaction/pay/potentialActions.js

@@ -33,9 +33,9 @@ function createPayObject(params) {
     var _a;
     const transaction = params.transaction;
     const paymentMethod = transaction.object.paymentMethod;
-    const paymentMethodType = String(paymentMethod === null || paymentMethod === void 0 ? void 0 : paymentMethod.typeOf);
+    const paymentMethodType = String(paymentMethod === null || paymentMethod === void 0 ? void 0 : paymentMethod.identifier);
     const additionalProperty = paymentMethod === null || paymentMethod === void 0 ? void 0 : paymentMethod.additionalProperty;
-    const paymentMethodId = (typeof (paymentMethod === null || paymentMethod === void 0 ? void 0 : paymentMethod.paymentMethodId) === 'string') ? paymentMethod === null || paymentMethod === void 0 ? void 0 : paymentMethod.paymentMethodId : transaction.id;
+    const paymentMethodId = transaction.object.paymentMethodId;
     const paymentMethodName = (typeof (paymentMethod === null || paymentMethod === void 0 ? void 0 : paymentMethod.name) === 'string') ? paymentMethod === null || paymentMethod === void 0 ? void 0 : paymentMethod.name : paymentMethodType;
     // MonetaryAmount対応(2023-08-13~)
     const paymentMethodAmountValue = (typeof (paymentMethod === null || paymentMethod === void 0 ? void 0 : paymentMethod.amount) === 'number')
@@ -139,7 +139,7 @@ function createPayObjectServiceOutput(params) {
             // }
             break;
         case factory.service.paymentService.PaymentServiceType.MovieTicket:
-            const paymentMethodType = paymentMethod === null || paymentMethod === void 0 ? void 0 : paymentMethod.typeOf;
+            const paymentMethodType = paymentMethod === null || paymentMethod === void 0 ? void 0 : paymentMethod.identifier;
             const movieTickets = paymentMethod === null || paymentMethod === void 0 ? void 0 : paymentMethod.movieTickets;
             if (Array.isArray(movieTickets)) {
                 paymentServiceOutput = movieTickets.map((movieTicket) => {

package/lib/chevre/service/assetTransaction/pay.js

@@ -12,8 +12,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.searchGMOTrade = exports.exportTasksById = exports.cancel = exports.confirm = exports.start = exports.check = exports.invalidatePaymentUrl = exports.publishPaymentUrl = void 0;
 const moment = require("moment");
 const factory = require("../../factory");
-const settings_1 = require("../../settings");
-const payment_1 = require("../payment");
 const CreditCardPayment = require("../payment/creditCard");
 const MovieTicketPayment = require("../payment/movieTicket");
 const PaymentCardPayment = require("../payment/paymentCard");
@@ -205,7 +203,7 @@ function fixPaymentService(params) {
 }
 function validateSeller(params) {
     return (repos) => __awaiter(this, void 0, void 0, function* () {
-        var _a, _b, _c;
+        var _a, _b, _c, _d;
         const sellerId = (_a = params.recipient) === null || _a === void 0 ? void 0 : _a.id;
         if (typeof sellerId !== 'string') {
             throw new factory.errors.ArgumentNull('recipient.id');
@@ -219,14 +217,26 @@ function validateSeller(params) {
         if (seller === undefined) {
             throw new factory.errors.NotFound(factory.organizationType.Corporation);
         }
-        const paymentMethodType = (_b = params.object.paymentMethod) === null || _b === void 0 ? void 0 : _b.typeOf;
+        const paymentMethodType = (_b = params.object.paymentMethod) === null || _b === void 0 ? void 0 : _b.identifier;
         if (typeof paymentMethodType !== 'string') {
-            throw new factory.errors.ArgumentNull('object.paymentMethod.typeOf');
+            throw new factory.errors.ArgumentNull('object.paymentMethod.identifier');
         }
-        // 販売者の対応決済方法かどうか確認
-        const paymentAccepted = (_c = seller.paymentAccepted) === null || _c === void 0 ? void 0 : _c.some((a) => a.paymentMethodType === paymentMethodType);
-        if (paymentAccepted !== true) {
-            throw new factory.errors.Argument('object.paymentMethod.typeOf', `payment not accepted`);
+        // FaceToFaceの場合、決済方法区分未指定に対応(2023-08-29~)
+        if (params.object.typeOf === factory.service.paymentService.PaymentServiceType.FaceToFace) {
+            if (paymentMethodType.length > 0) {
+                // 販売者の対応決済方法かどうか確認
+                const paymentAccepted = (_c = seller.paymentAccepted) === null || _c === void 0 ? void 0 : _c.some((a) => a.paymentMethodType === paymentMethodType);
+                if (paymentAccepted !== true) {
+                    throw new factory.errors.Argument('object.paymentMethod.identifier', `payment not accepted`);
+                }
+            }
+        }
+        else {
+            // 販売者の対応決済方法かどうか確認
+            const paymentAccepted = (_d = seller.paymentAccepted) === null || _d === void 0 ? void 0 : _d.some((a) => a.paymentMethodType === paymentMethodType);
+            if (paymentAccepted !== true) {
+                throw new factory.errors.Argument('object.paymentMethod.identifier', `payment not accepted`);
+            }
         }
     });
 }
@@ -301,6 +311,7 @@ function saveAuthorizeResult(params) {
  */
 function confirm(params) {
     return (repos) => __awaiter(this, void 0, void 0, function* () {
+        var _a, _b;
         let transaction;
         // 取引存在確認
         if (typeof params.id === 'string') {
@@ -318,29 +329,24 @@ function confirm(params) {
         else {
             throw new factory.errors.ArgumentNull('Transaction ID or Transaction Number');
         }
+        let overwritingPaymentMethodIdentifier;
+        if (transaction.object.typeOf === factory.service.paymentService.PaymentServiceType.FaceToFace) {
+            const specifiedPaymentMethodIdentifire = (_b = (_a = params.object) === null || _a === void 0 ? void 0 : _a.paymentMethod) === null || _b === void 0 ? void 0 : _b.identifier;
+            if (typeof specifiedPaymentMethodIdentifire === 'string' && specifiedPaymentMethodIdentifire.length > 0) {
+                overwritingPaymentMethodIdentifier = specifiedPaymentMethodIdentifire;
+                transaction.object.paymentMethod.identifier = overwritingPaymentMethodIdentifier;
+                // transaction.object.paymentMethod.typeOf = overwritingPaymentMethodIdentifier;
+            }
+        }
         const order = yield fixOrderAsPurpose(params, transaction)(repos);
         const potentialActions = (0, potentialActions_1.createPotentialActions)({
             transaction: transaction,
             potentialActions: params.potentialActions,
             order
         });
-        yield repos.assetTransaction.confirm({
-            typeOf: factory.assetTransactionType.Pay,
-            id: transaction.id,
-            result: {},
-            // sync対応(2023-01-14~)
-            potentialActions: (settings_1.USE_PAY_ASSET_TRANSACTION_SYNC_PROCESSING)
-                ? { pay: [] }
-                : potentialActions
-        });
-        // sync対応(2023-01-14~)
-        if (settings_1.USE_PAY_ASSET_TRANSACTION_SYNC_PROCESSING) {
-            if (Array.isArray(potentialActions.pay)) {
-                for (const payAction of potentialActions.pay) {
-                    yield (0, payment_1.pay)(payAction)(repos);
-                }
-            }
-        }
+        yield repos.assetTransaction.confirm(Object.assign({ typeOf: factory.assetTransactionType.Pay, id: transaction.id, result: {}, potentialActions: potentialActions }, (typeof overwritingPaymentMethodIdentifier === 'string')
+            ? { object: { paymentMethod: { identifier: overwritingPaymentMethodIdentifier } } }
+            : undefined));
     });
 }
 exports.confirm = confirm;
@@ -373,23 +379,11 @@ function fixOrderAsPurpose(params, transaction) {
  */
 function cancel(params) {
     return (repos) => __awaiter(this, void 0, void 0, function* () {
-        const transaction = yield repos.assetTransaction.cancel({
+        yield repos.assetTransaction.cancel({
             typeOf: factory.assetTransactionType.Pay,
             id: params.id,
             transactionNumber: params.transactionNumber
         });
-        // sync対応(2023-01-14~)
-        if (settings_1.USE_PAY_ASSET_TRANSACTION_SYNC_PROCESSING) {
-            const payTransactionAsObject = {
-                project: transaction.project,
-                typeOf: transaction.typeOf,
-                id: transaction.id,
-                transactionNumber: transaction.transactionNumber,
-                object: transaction.object,
-                recipient: transaction.recipient
-            };
-            yield (0, payment_1.voidPayment)({ object: payTransactionAsObject })(repos);
-        }
     });
 }
 exports.cancel = cancel;
@@ -404,6 +398,9 @@ function exportTasksById(params) {
             id: params.id
         });
         const potentialActions = transaction.potentialActions;
+        if (transaction.status === factory.transactionStatusType.InProgress) {
+            throw new factory.errors.NotImplemented(`Transaction status "${transaction.status}" not implemented.`);
+        }
         const taskAttributes = [];
         // タスク実行日時バッファの指定があれば調整
         let taskRunsAt = new Date();
@@ -430,6 +427,31 @@ function exportTasksById(params) {
             executionResults: [],
             data: { object: payTransactionAsObject }
         };
+        // OnAssetTransactionStatusChangedを追加(2023-08-30~)
+        const onAssetTransactionStatusChangedTaskData = {
+            project: transaction.project,
+            object: {
+                typeOf: factory.assetTransactionType.Pay,
+                transactionNumber: transaction.transactionNumber,
+                status: transaction.status
+            },
+            purpose: {
+                confirmationNumber: '',
+                orderNumber: '',
+                typeOf: 'Order'
+            },
+            useOnOrderStatusChanged: true
+        };
+        const onAssetTransactionStatusChangedTask = {
+            project: transaction.project,
+            name: factory.taskName.OnAssetTransactionStatusChanged,
+            status: factory.taskStatus.Ready,
+            runsAt: taskRunsAt,
+            remainingNumberOfTries: 10,
+            numberOfTried: 0,
+            executionResults: [],
+            data: onAssetTransactionStatusChangedTaskData
+        };
         switch (transaction.status) {
             case factory.transactionStatusType.Confirmed:
                 const payActions = potentialActions === null || potentialActions === void 0 ? void 0 : potentialActions.pay;
@@ -450,13 +472,10 @@ function exportTasksById(params) {
                 }
                 break;
             case factory.transactionStatusType.Canceled:
-                // sync対応(2023-01-14~)
-                if (!settings_1.USE_PAY_ASSET_TRANSACTION_SYNC_PROCESSING) {
-                    taskAttributes.push(voidPaymentTasks);
-                }
+                taskAttributes.push(voidPaymentTasks, onAssetTransactionStatusChangedTask);
                 break;
             case factory.transactionStatusType.Expired:
-                taskAttributes.push(voidPaymentTasks);
+                taskAttributes.push(voidPaymentTasks, onAssetTransactionStatusChangedTask);
                 break;
             default:
                 throw new factory.errors.NotImplemented(`Transaction status "${transaction.status}" not implemented.`);
@@ -482,9 +501,9 @@ function searchGMOTrade(params) {
         //     throw new factory.errors.Argument('transactionNumber', 'must be confirmed');
         // }
         // CreditCard系統の決済方法タイプは動的
-        const paymentMethodType = (_a = assetTransaction.object.paymentMethod) === null || _a === void 0 ? void 0 : _a.typeOf;
+        const paymentMethodType = (_a = assetTransaction.object.paymentMethod) === null || _a === void 0 ? void 0 : _a.identifier;
         if (typeof paymentMethodType !== 'string') {
-            throw new factory.errors.ArgumentNull('object.paymentMethod.typeOf');
+            throw new factory.errors.ArgumentNull('object.paymentMethod.identifier');
         }
         const paymentServiceId = String(assetTransaction.object.id);
         const availableChannel = yield repos.product.findAvailableChannel({

package/lib/chevre/service/assetTransaction/refund/factory.js

@@ -6,7 +6,7 @@ exports.createStartParams = void 0;
  */
 const factory = require("../../../factory");
 function createStartParams(params) {
-    var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k;
+    var _a, _b, _c, _d, _e, _f, _g, _h, _j;
     const paymentMethodType = (_a = params.object.paymentMethod) === null || _a === void 0 ? void 0 : _a.typeOf;
     if (typeof paymentMethodType !== 'string') {
         throw new factory.errors.ArgumentNull('object.paymentMethod.typeOf');
@@ -23,7 +23,13 @@ function createStartParams(params) {
     let refundFee;
     if (((_g = params.paymentService) === null || _g === void 0 ? void 0 : _g.typeOf) === factory.service.paymentService.PaymentServiceType.CreditCard) {
         // カード通貨区分の存在する決済サービスを考慮(2023-08-09~)
-        const paymentServiceOutputAmountCurrency = (_k = (_j = (_h = params.paymentService.serviceOutput) === null || _h === void 0 ? void 0 : _h.paymentMethod) === null || _j === void 0 ? void 0 : _j.amount) === null || _k === void 0 ? void 0 : _k.currency;
+        const invoiceAsServiceOutput = (Array.isArray(params.paymentService.serviceOutput))
+            ? params.paymentService.serviceOutput.find((output) => output.typeOf === 'Invoice')
+            : params.paymentService.serviceOutput;
+        let paymentServiceOutputAmountCurrency;
+        if ((invoiceAsServiceOutput === null || invoiceAsServiceOutput === void 0 ? void 0 : invoiceAsServiceOutput.typeOf) === 'Invoice') {
+            paymentServiceOutputAmountCurrency = (_j = (_h = invoiceAsServiceOutput === null || invoiceAsServiceOutput === void 0 ? void 0 : invoiceAsServiceOutput.paymentMethod) === null || _h === void 0 ? void 0 : _h.amount) === null || _j === void 0 ? void 0 : _j.currency;
+        }
         if (typeof paymentServiceOutputAmountCurrency !== 'string') {
             if (typeof params.object.refundFee === 'number') {
                 refundFee = params.object.refundFee;