@chevre/domain 21.8.0-alpha.2 → 21.8.0-alpha.20

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

@@ -13,18 +13,20 @@ exports.onOrderStatusChanged = void 0;
 /**
  * 注文ステータス変更時処理
  */
+const createDebug = require("debug");
 const google_libphonenumber_1 = require("google-libphonenumber");
-const moment = require("moment");
 const factory = require("../../factory");
 const order_1 = require("../../factory/order");
 const product_1 = require("../offer/product");
 const factory_1 = require("./onOrderStatusChanged/factory");
+const debug = createDebug('chevre-domain:service:order');
 const USE_CONFIRM_REGISTER_SERVICE_TRANSACTION = process.env.USE_CONFIRM_REGISTER_SERVICE_TRANSACTION === '1';
 const TOKEN_EXPIRES_IN = 604800;
 function onOrderStatusChanged(params) {
     // tslint:disable-next-line:max-func-body-length
     return (repos) => __awaiter(this, void 0, void 0, function* () {
-        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m;
+        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q;
+        debug('onOrderStatusChanged called.', params.order.orderNumber, params.order.orderStatus, params.order.orderDate);
         let tasks = [];
         const maskedCustomer = (0, order_1.createMaskedCustomer)(params.order, { noProfile: true });
         const simpleOrder = {
@@ -88,8 +90,10 @@ function onOrderStatusChanged(params) {
                 tasks = [
                     // 注文作成時のみトークン付加
                     ...(0, factory_1.createInformTasks)(orderWithToken),
-                    ...yield createConfirmPayTransactionTasks(params.order, simpleOrder)(repos),
-                    ...yield createConfirmReserveTransactionTasks(params.order, simpleOrder)(repos),
+                    // 決済取引確定タスク作成はOrderPaymentDueへ完全移行(2023-08-26~)
+                    // ...await createConfirmPayTransactionTasks(params.order, simpleOrder)(repos),
+                    // createConfirmReserveTransactionTasksIfNotExistへ移行(2023-08-25~)
+                    // ...await createConfirmReserveTransactionTasks(params.order, simpleOrder)(repos),
                     ...yield createConfirmRegisterServiceTransactionTasks(params.order, simpleOrder)(repos),
                     // 取引のpotentialActionsを適用(2023-08-17~)
                     ...(0, factory_1.createOnPlaceOrderTasksByTransaction)({
@@ -112,24 +116,40 @@ function onOrderStatusChanged(params) {
                     ...(0, factory_1.createOnOrderReturnedTasksByTransaction)({ potentialActions: potentialActionsByTransaction })
                 ];
                 break;
+            // OrderCancelled追加(2023-08-30~)
+            case factory.orderStatus.OrderCancelled:
+                // 注文取引中止時と同様の処理か
+                tasks = [
+                    ...(0, factory_1.createOnOrderCancelledTasksByTransaction)({ transaction: params.placeOrderTransaction })
+                ];
+                break;
             default:
         }
         yield repos.task.saveMany(tasks, { emitImmediately: true });
+        switch (params.order.orderStatus) {
+            case factory.orderStatus.OrderProcessing:
+                // 冗長なconfirmReserveTransactionタスク作成を回避(2023-08-25~)
+                yield createConfirmReserveTransactionTasksIfNotExist(params.order, simpleOrder)(repos);
+                // 冗長なsendOrderタスク作成を回避(2023-08-25~)
+                yield createSendOrderTransactionTaskIfNotExist({
+                    object: params.order,
+                    potentialActions: (_q = (_p = (_o = params.placeOrderTransaction) === null || _o === void 0 ? void 0 : _o.potentialActions) === null || _p === void 0 ? void 0 : _p.order) === null || _q === void 0 ? void 0 : _q.potentialActions
+                })(repos);
+                break;
+            default:
+        }
     });
 }
 exports.onOrderStatusChanged = onOrderStatusChanged;
 function createConfirmPayTransactionTasks(order, simpleOrder) {
     return (repos) => __awaiter(this, void 0, void 0, function* () {
-        const taskRunsAt = moment(order.orderDate)
-            .toDate();
+        const taskRunsAt = new Date();
         const tasks = [];
         yield Promise.all(order.paymentMethods.map((invoice) => __awaiter(this, void 0, void 0, function* () {
-            // tslint:disable-next-line:no-suspicious-comment
-            // TODO 注文にpaymentStatusを保証した後に実装する
-            // PaymentAutomaticallyAppliedであれば、自動決済処理を実行
-            // if (invoice.paymentStatus !== factory.paymentStatusType.PaymentAutomaticallyApplied) {
-            //     return;
-            // }
+            // PaymentAutomaticallyAppliedであれば、自動決済処理を実行(2023-08-24~)
+            if (invoice.paymentStatus !== factory.paymentStatusType.PaymentAutomaticallyApplied) {
+                return;
+            }
             // 冗長なタスク作成を回避
             const existingTasks = yield repos.task.search({
                 limit: 1,
@@ -173,69 +193,49 @@ function createConfirmPayTransactionTasks(order, simpleOrder) {
         return tasks;
     });
 }
-const COA_TASK_DELAY_IN_SECONDS = 0;
-function createConfirmReserveTransactionTasks(order, simpleOrder) {
+// const COA_TASK_DELAY_IN_SECONDS = 0;
+function createConfirmReserveTransactionTasksIfNotExist(order, simpleOrder) {
     return (repos) => __awaiter(this, void 0, void 0, function* () {
-        const taskRunsAt = moment(order.orderDate)
-            .toDate();
-        const taskRunsAt4coa = moment(order.orderDate)
-            .add(COA_TASK_DELAY_IN_SECONDS, 'seconds')
-            .toDate();
+        const taskRunsAt = new Date();
+        const taskRunsAt4coa = new Date();
+        // const taskRunsAt4coa = moment(order.orderDate)
+        //     .add(COA_TASK_DELAY_IN_SECONDS, 'seconds')
+        //     .toDate();
         const confirmObjects = [
             ...(0, factory_1.createConfirmReservationActionObject4ChevreByOrder)({ order }),
             ...(0, factory_1.createConfirmReservationActionObject4COAByOrder)({ order })
         ];
-        const tasks = [];
         yield Promise.all(confirmObjects.map((confirmObject) => __awaiter(this, void 0, void 0, function* () {
-            // 冗長なタスク作成を回避
-            const existingTasks = yield repos.task.search({
-                limit: 1,
-                page: 1,
-                project: { id: { $eq: order.project.id } },
-                name: factory.taskName.ConfirmReserveTransaction,
-                data: {
-                    object: { transactionNumber: { $eq: confirmObject.transactionNumber } },
-                    purpose: { orderNumber: { $eq: order.orderNumber } }
+            const data = {
+                project: order.project,
+                typeOf: factory.actionType.ConfirmAction,
+                object: confirmObject,
+                agent: order.project,
+                purpose: simpleOrder,
+                instrument: {
+                    typeOf: 'WebAPI',
+                    identifier: (confirmObject.typeOf === 'COAReserveTransaction')
+                        ? factory.service.webAPI.Identifier.COA
+                        : factory.service.webAPI.Identifier.Chevre
                 }
-            }, {
-                data: 0, executionResults: 0, name: 0, numberOfTried: 0,
-                remainingNumberOfTries: 0, runsAt: 0, status: 0
-            });
-            if (existingTasks.length === 0) {
-                const data = {
-                    project: order.project,
-                    typeOf: factory.actionType.ConfirmAction,
-                    object: confirmObject,
-                    agent: order.project,
-                    purpose: simpleOrder,
-                    instrument: {
-                        typeOf: 'WebAPI',
-                        identifier: (confirmObject.typeOf === 'COAReserveTransaction')
-                            ? factory.service.webAPI.Identifier.COA
-                            : factory.service.webAPI.Identifier.Chevre
-                    }
-                };
-                tasks.push({
-                    project: order.project,
-                    name: factory.taskName.ConfirmReserveTransaction,
-                    status: factory.taskStatus.Ready,
-                    runsAt: (confirmObject.typeOf === 'COAReserveTransaction')
-                        ? taskRunsAt4coa
-                        : taskRunsAt,
-                    remainingNumberOfTries: 10,
-                    numberOfTried: 0,
-                    executionResults: [],
-                    data
-                });
-            }
+            };
+            const confirmReserveTransactionTask = {
+                project: order.project,
+                name: factory.taskName.ConfirmReserveTransaction,
+                status: factory.taskStatus.Ready,
+                runsAt: (confirmObject.typeOf === 'COAReserveTransaction') ? taskRunsAt4coa : taskRunsAt,
+                remainingNumberOfTries: 10,
+                numberOfTried: 0,
+                executionResults: [],
+                data
+            };
+            yield repos.task.createConfirmReserveTransactionTaskIfNotExist(confirmReserveTransactionTask, { emitImmediately: true });
         })));
-        return tasks;
     });
 }
 function createConfirmRegisterServiceTransactionTasks(order, simpleOrder) {
     return (repos) => __awaiter(this, void 0, void 0, function* () {
-        const taskRunsAt = moment(order.orderDate)
-            .toDate();
+        const taskRunsAt = new Date();
         if (USE_CONFIRM_REGISTER_SERVICE_TRANSACTION) {
             const confirmObjects = (0, factory_1.createConfirmRegisterServiceActionObjectByOrder)({ order });
             const tasks = [];
@@ -285,14 +285,38 @@ function createConfirmRegisterServiceTransactionTasks(order, simpleOrder) {
         }
     });
 }
-const RETURN_COA_TASK_DELAY_IN_SECONDS = 0;
+function createSendOrderTransactionTaskIfNotExist(params) {
+    return (repos) => __awaiter(this, void 0, void 0, function* () {
+        var _a;
+        const now = new Date();
+        const sendOrderByTransaction = (_a = params.potentialActions) === null || _a === void 0 ? void 0 : _a.sendOrder;
+        if (sendOrderByTransaction !== undefined) {
+            const sendOrderTaskData = {
+                project: sendOrderByTransaction.project,
+                object: Object.assign(Object.assign({}, sendOrderByTransaction.object), { confirmationNumber: params.object.confirmationNumber })
+            };
+            const sendOrderTask = {
+                project: sendOrderByTransaction.project,
+                name: factory.taskName.SendOrder,
+                status: factory.taskStatus.Ready,
+                runsAt: now,
+                remainingNumberOfTries: 10,
+                numberOfTried: 0,
+                executionResults: [],
+                data: sendOrderTaskData
+            };
+            yield repos.task.createSendOrderTaskIfNotExist(sendOrderTask, { emitImmediately: true });
+        }
+    });
+}
+// const RETURN_COA_TASK_DELAY_IN_SECONDS = 0;
 function createReturnReserveTransactionTasks(order, simpleOrder) {
     var _a, _b;
-    const taskRunsAt = moment(order.dateReturned)
-        .toDate();
-    const taskRunsAt4coa = moment(order.dateReturned)
-        .add(RETURN_COA_TASK_DELAY_IN_SECONDS, 'seconds')
-        .toDate();
+    const taskRunsAt = new Date();
+    const taskRunsAt4coa = new Date();
+    // const taskRunsAt4coa = moment(order.dateReturned)
+    //     .add(RETURN_COA_TASK_DELAY_IN_SECONDS, 'seconds')
+    //     .toDate();
     const tasks = [];
     const returnActionRecipient = {
         typeOf: order.seller.typeOf,
@@ -367,12 +391,13 @@ function createReturnReserveTransactionTasks(order, simpleOrder) {
     }
     return tasks;
 }
-const RETURN_PAY_TASK_DELAY_IN_SECONDS = 0;
+// const RETURN_PAY_TASK_DELAY_IN_SECONDS = 0;
 function createReturnPayTransactionTasks(order, __, returnOrderTransaction) {
     var _a, _b;
-    const taskRunsAt = moment(order.dateReturned)
-        .add(RETURN_PAY_TASK_DELAY_IN_SECONDS, 'seconds')
-        .toDate();
+    const taskRunsAt = new Date();
+    // const taskRunsAt = moment(order.dateReturned)
+    //     .add(RETURN_PAY_TASK_DELAY_IN_SECONDS, 'seconds')
+    //     .toDate();
     const tasks = [];
     const returnOrderPotentialActions = (_b = (_a = returnOrderTransaction === null || returnOrderTransaction === void 0 ? void 0 : returnOrderTransaction.potentialActions) === null || _a === void 0 ? void 0 : _a.returnOrder.find((action) => action.object.orderNumber === order.orderNumber)) === null || _b === void 0 ? void 0 : _b.potentialActions;
     const returnPayActionsByReturnOrderTransaction = returnOrderPotentialActions === null || returnOrderPotentialActions === void 0 ? void 0 : returnOrderPotentialActions.returnPaymentMethod;

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

@@ -2,19 +2,11 @@ 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 * as factory from '../../factory';
 /**
  * 注文を決済する
  */
-declare function payOrder(params: {
-    project: {
-        id: string;
-    };
-    object: {
-        confirmationNumber: string;
-        orderNumber: string;
-    };
-    useOnOrderStatusChanged: boolean;
-}): (repos: {
+declare function payOrder(params: factory.task.IData<factory.taskName.OnOrderPaymentCompleted>): (repos: {
     order: OrderRepo;
     registerActionInProgress: RegisterServiceInProgressRepo;
     task: TaskRepo;

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

@@ -10,8 +10,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.payOrder = void 0;
-const findPlaceOrderTransaction_1 = require("./findPlaceOrderTransaction");
-const onOrderStatusChanged_1 = require("./onOrderStatusChanged");
+const onAssetTransactionStatusChanged_1 = require("./onAssetTransactionStatusChanged");
 const factory = require("../../factory");
 /**
  * 注文を決済する
@@ -23,52 +22,12 @@ function payOrder(params) {
         }
         const orderNumber = params.object.orderNumber;
         const confirmationNumber = params.object.confirmationNumber;
-        const placeOrderTransaction = yield (0, findPlaceOrderTransaction_1.findPlaceOrderTransaction)({
+        yield (0, onAssetTransactionStatusChanged_1.paymentDue2Processing)({
             project: { id: params.project.id },
             confirmationNumber,
-            orderNumber
-        })({ transaction: repos.transaction });
-        let order = yield repos.order.findByOrderNumber({
             orderNumber,
-            project: { id: params.project.id },
-            inclusion: [],
-            exclusion: []
-        });
-        try {
-            order = yield repos.order.changeStatus({
-                project: { id: order.project.id },
-                orderNumber,
-                orderStatus: factory.orderStatus.OrderProcessing,
-                previousOrderStatus: factory.orderStatus.OrderPaymentDue
-            });
-        }
-        catch (error) {
-            let throwsError = true;
-            // すでにステータスが煤でいた場合、OrderPaymentDue->OrderProcessingの処理自体は成功しているので、後処理を続行する
-            order = yield repos.order.findByOrderNumber({
-                orderNumber: params.object.orderNumber,
-                project: { id: params.project.id },
-                inclusion: [],
-                exclusion: []
-            });
-            if (order.orderStatus === factory.orderStatus.OrderDelivered
-                || order.orderStatus === factory.orderStatus.OrderReturned) {
-                throwsError = false;
-            }
-            if (throwsError) {
-                throw error;
-            }
-        }
-        if (params.useOnOrderStatusChanged) {
-            yield (0, onOrderStatusChanged_1.onOrderStatusChanged)({
-                order: Object.assign(Object.assign({}, order), { orderStatus: factory.orderStatus.OrderProcessing // 強制的にOrderProcessingとして処理する
-                 }),
-                placeOrderTransaction
-            })({
-                registerActionInProgress: repos.registerActionInProgress,
-                task: repos.task
-            });
-        }
+            useOnOrderStatusChanged: params.useOnOrderStatusChanged
+        })(repos);
     });
 }
 exports.payOrder = payOrder;

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

@@ -14,8 +14,8 @@ const moment = require("moment");
 const order_1 = require("../../factory/order");
 const createAccountingReportIfNotExist_1 = require("./createAccountingReportIfNotExist");
 const findPlaceOrderTransaction_1 = require("./findPlaceOrderTransaction");
+const onAssetTransactionStatusChanged_1 = require("./onAssetTransactionStatusChanged");
 const onOrderStatusChanged_1 = require("./onOrderStatusChanged");
-const payOrder_1 = require("./payOrder");
 const factory = require("../../factory");
 function createOrder(params) {
     // 必要な属性についてDate型に変換(でないと検索クエリを効率的に使えない)
@@ -232,6 +232,7 @@ function placeOrder(params) {
                 });
             }
             else if (order.orderStatus === factory.orderStatus.OrderProcessing) {
+                // OrderPaymentDueをスキップしてOrderProcessingから開始する場合(2023-08-23~)
                 // OrderPaymentDueに対する処理をまず強制的に実行する(2023-08-24~)
                 yield (0, onOrderStatusChanged_1.onOrderStatusChanged)({
                     order: Object.assign(Object.assign({}, order), { orderStatus: factory.orderStatus.OrderPaymentDue }),
@@ -240,20 +241,20 @@ function placeOrder(params) {
                     registerActionInProgress: repos.registerActionInProgress,
                     task: repos.task
                 });
-                // OrderPaymentDueをスキップしてOrderProcessingから開始する場合(2023-08-23~)
-                // paymentMethods.length: 0の場合に、confirmPayTransactionは実行されないので、ここで強制的にpayOrderを実行する必要がある
-                yield (0, payOrder_1.payOrder)({
-                    project: { id: order.project.id },
-                    object: {
-                        confirmationNumber: order.confirmationNumber,
-                        orderNumber: order.orderNumber
-                    },
-                    useOnOrderStatusChanged: params.useOnOrderStatusChanged
-                })(repos);
             }
             else {
                 throw new factory.errors.NotImplemented(`placing an order on the status '${order.orderStatus}' not implemented`);
             }
+            // paymentMethods.length: 0の場合を考慮(2023-08-24~)
+            if (order.paymentMethods.length === 0) {
+                // paymentMethods.length: 0の場合に、confirmPayTransactionは実行されないので、ここで強制的にpaymentDue2Processingを実行する必要がある
+                yield (0, onAssetTransactionStatusChanged_1.paymentDue2Processing)({
+                    project: { id: order.project.id },
+                    confirmationNumber: order.confirmationNumber,
+                    orderNumber: order.orderNumber,
+                    useOnOrderStatusChanged: params.useOnOrderStatusChanged === true
+                })(repos);
+            }
         }
         // onOrderStatusChangedへ移行(2023-08-17~)
         // await onPlaceOrder({

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

@@ -3,8 +3,10 @@
  */
 import { confirmPayTransaction } from './order/confirmPayTransaction';
 import { deleteOrder } from './order/deleteOrder';
+import { onAssetTransactionStatusChanged, paymentDue2Processing } from './order/onAssetTransactionStatusChanged';
 import { onOrderStatusChanged } from './order/onOrderStatusChanged';
 import { onOrderUpdated } from './order/onOrderUpdated';
+import { payOrder } from './order/payOrder';
 import { placeOrder, placeOrderWithoutTransaction } from './order/placeOrder';
 import { sendOrder } from './order/sendOrder';
-export { confirmPayTransaction, deleteOrder, onOrderStatusChanged, onOrderUpdated, placeOrder, placeOrderWithoutTransaction, sendOrder };
+export { confirmPayTransaction, deleteOrder, onAssetTransactionStatusChanged, onOrderStatusChanged, onOrderUpdated, paymentDue2Processing, payOrder, placeOrder, placeOrderWithoutTransaction, sendOrder };

package/lib/chevre/service/order.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.sendOrder = exports.placeOrderWithoutTransaction = exports.placeOrder = exports.onOrderUpdated = exports.onOrderStatusChanged = exports.deleteOrder = exports.confirmPayTransaction = void 0;
+exports.sendOrder = exports.placeOrderWithoutTransaction = exports.placeOrder = exports.payOrder = exports.paymentDue2Processing = exports.onOrderUpdated = exports.onOrderStatusChanged = exports.onAssetTransactionStatusChanged = exports.deleteOrder = exports.confirmPayTransaction = void 0;
 /**
  * 注文サービス
  */
@@ -8,13 +8,17 @@ const confirmPayTransaction_1 = require("./order/confirmPayTransaction");
 Object.defineProperty(exports, "confirmPayTransaction", { enumerable: true, get: function () { return confirmPayTransaction_1.confirmPayTransaction; } });
 const deleteOrder_1 = require("./order/deleteOrder");
 Object.defineProperty(exports, "deleteOrder", { enumerable: true, get: function () { return deleteOrder_1.deleteOrder; } });
+const onAssetTransactionStatusChanged_1 = require("./order/onAssetTransactionStatusChanged");
+Object.defineProperty(exports, "onAssetTransactionStatusChanged", { enumerable: true, get: function () { return onAssetTransactionStatusChanged_1.onAssetTransactionStatusChanged; } });
+Object.defineProperty(exports, "paymentDue2Processing", { enumerable: true, get: function () { return onAssetTransactionStatusChanged_1.paymentDue2Processing; } });
 const onOrderStatusChanged_1 = require("./order/onOrderStatusChanged");
 Object.defineProperty(exports, "onOrderStatusChanged", { enumerable: true, get: function () { return onOrderStatusChanged_1.onOrderStatusChanged; } });
 const onOrderUpdated_1 = require("./order/onOrderUpdated");
 Object.defineProperty(exports, "onOrderUpdated", { enumerable: true, get: function () { return onOrderUpdated_1.onOrderUpdated; } });
+const payOrder_1 = require("./order/payOrder");
+Object.defineProperty(exports, "payOrder", { enumerable: true, get: function () { return payOrder_1.payOrder; } });
 const placeOrder_1 = require("./order/placeOrder");
 Object.defineProperty(exports, "placeOrder", { enumerable: true, get: function () { return placeOrder_1.placeOrder; } });
 Object.defineProperty(exports, "placeOrderWithoutTransaction", { enumerable: true, get: function () { return placeOrder_1.placeOrderWithoutTransaction; } });
-// import { returnOrder } from './order/returnOrder';
 const sendOrder_1 = require("./order/sendOrder");
 Object.defineProperty(exports, "sendOrder", { enumerable: true, get: function () { return sendOrder_1.sendOrder; } });

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

@@ -5,9 +5,17 @@ const moment = require("moment");
 const factory = require("../../../factory");
 function creatPayTransactionStartParams(params) {
     var _a, _b, _c, _d;
-    const expires = moment(params.transaction.expires)
+    let expires = moment(params.transaction.expires)
         .add(1, 'month')
         .toDate(); // 余裕を持って
+    // 実験的にPaymentDueに対応(2023-08-30~)
+    if (params.paymentServiceType === factory.service.paymentService.PaymentServiceType.FaceToFace) {
+        if (params.object.paymentMethod.length === 0) {
+            expires = moment(params.transaction.expires)
+                .add(1, 'hour')
+                .toDate();
+        }
+    }
     const confirmationNumber = params.transaction.object.confirmationNumber;
     const issuedThroughId = (_a = params.object.issuedThrough) === null || _a === void 0 ? void 0 : _a.id;
     const accountId = (typeof params.accountId === 'string')
@@ -39,7 +47,9 @@ function creatPayTransactionStartParams(params) {
             typeOf: params.paymentServiceType,
             // 決済サービスIDを連携(2022-04-12~)
             id: issuedThroughId,
-            paymentMethod: Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign({ typeOf: params.object.paymentMethod, amount: params.object.amount, additionalProperty: (Array.isArray(params.object.additionalProperty)) ? params.object.additionalProperty : [] }, (typeof params.object.method === 'string') ? { method: params.object.method } : undefined), (typeof params.object.name === 'string') ? { name: params.object.name } : undefined), (typeof accountId === 'string') ? { accountId } : undefined), (typeof params.object.description === 'string') ? { description: params.object.description } : undefined), (typeof params.object.fromLocation === 'string') ? { fromLocation: params.object.fromLocation } : undefined), (params.object.creditCard !== undefined) ? { creditCard: params.object.creditCard } : undefined), (Array.isArray(movieTickets)) ? { movieTickets } : undefined)
+            paymentMethod: Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign({ identifier: params.object.paymentMethod, 
+                // typeOf: params.object.paymentMethod, // identifierへ移行(2023-08-30~)
+                amount: params.object.amount, additionalProperty: (Array.isArray(params.object.additionalProperty)) ? params.object.additionalProperty : [] }, (typeof params.object.method === 'string') ? { method: params.object.method } : undefined), (typeof params.object.name === 'string') ? { name: params.object.name } : undefined), (typeof accountId === 'string') ? { accountId } : undefined), (typeof params.object.description === 'string') ? { description: params.object.description } : undefined), (typeof params.object.fromLocation === 'string') ? { fromLocation: params.object.fromLocation } : undefined), (params.object.creditCard !== undefined) ? { creditCard: params.object.creditCard } : undefined), (Array.isArray(movieTickets)) ? { movieTickets } : undefined)
         }, expires: expires }, (typeof confirmationNumber === 'string')
         ? {
             purpose: {
@@ -80,7 +90,7 @@ function createMovieTicket(params) {
     };
 }
 function createAuthorizeResult(params) {
-    var _a, _b, _c, _d, _e, _f, _g;
+    var _a, _b, _c, _d, _e, _f;
     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') {
@@ -98,6 +108,13 @@ function createAuthorizeResult(params) {
         && typeof paymentMethodAmountCurrencyByPayTransaction === 'string')
         ? { amount: { currency: paymentMethodAmountCurrencyByPayTransaction } }
         : undefined);
+    // FaceToFaceの場合、決済方法区分未指定に対応(2023-08-29~)
+    let paymentStatus = factory.paymentStatusType.PaymentAutomaticallyApplied;
+    if (issuedThrough.typeOf === factory.service.paymentService.PaymentServiceType.FaceToFace) {
+        if (paymentMethodAsObject.typeOf.length === 0) {
+            paymentStatus = factory.paymentStatusType.PaymentDue;
+        }
+    }
     return {
         accountId: (typeof ((_e = payTransactionObject.paymentMethod) === null || _e === void 0 ? void 0 : _e.accountId) === 'string')
             ? payTransactionObject.paymentMethod.accountId
@@ -108,11 +125,11 @@ function createAuthorizeResult(params) {
         // 完全廃止(paymentMethodAsObjectへ完全移行)(2023-08-16~)
         // paymentMethod: params.object.paymentMethod,
         paymentMethodAsObject,
-        paymentStatus: factory.paymentStatusType.PaymentAutomaticallyApplied,
-        paymentMethodId: (typeof ((_f = payTransactionObject.paymentMethod) === null || _f === void 0 ? void 0 : _f.paymentMethodId) === 'string')
-            ? payTransactionObject.paymentMethod.paymentMethodId
+        paymentStatus,
+        paymentMethodId: (typeof payTransactionObject.paymentMethodId === 'string')
+            ? payTransactionObject.paymentMethodId
             : '',
-        name: (typeof ((_g = payTransactionObject.paymentMethod) === null || _g === void 0 ? void 0 : _g.name) === 'string')
+        name: (typeof ((_f = payTransactionObject.paymentMethod) === null || _f === void 0 ? void 0 : _f.name) === 'string')
             ? payTransactionObject.paymentMethod.name
             : params.object.paymentMethod,
         totalPaymentDue: totalPaymentDue,

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

@@ -104,7 +104,7 @@ exports.invalidatePaymentUrl = invalidatePaymentUrl;
 function processVoidPayTransaction(params) {
     // tslint:disable-next-line:max-func-body-length
     return (repos) => __awaiter(this, void 0, void 0, function* () {
-        var _a, _b;
+        var _a, _b, _c, _d;
         let transaction;
         // アクションID指定の場合、進行中取引検証(2023-02-24~)
         if (typeof params.id === 'string') {
@@ -145,23 +145,27 @@ function processVoidPayTransaction(params) {
                     throw new factory.errors.NotImplemented(`${transaction.status} not implemented`);
                 // 確定取引に対応(2023-05-03~)
                 case factory.transactionStatusType.Confirmed:
-                    // アクションステータスを検証する
-                    authorizeActions = authorizeActions.filter((a) => a.actionStatus !== factory.actionStatusType.CompletedActionStatus);
-                    if (transaction.typeOf === factory.transactionType.PlaceOrder) {
-                        const paymentMethodIds = (_b = (_a = transaction.result) === null || _a === void 0 ? void 0 : _a.order) === null || _b === void 0 ? void 0 : _b.paymentMethods.map((p) => {
-                            return p.paymentMethodId;
-                        });
-                        if (!Array.isArray(paymentMethodIds)) {
-                            throw new factory.errors.Argument('Transaction', `${transaction.id} must have result.order.paymentMethods`);
-                        }
-                        if (paymentMethodIds.length > 0) {
-                            authorizeActions = authorizeActions.filter((a) => {
-                                // paymentMethodIdが存在しない、あるいは、注文のpaymentMethodIdsに含まれなければ、アクション取消対象
-                                const paymentMethodIdByAction = a.object.paymentMethodId;
-                                const includedInOrder = typeof paymentMethodIdByAction === 'string'
-                                    && paymentMethodIds.includes(paymentMethodIdByAction);
-                                return !includedInOrder;
+                    // OrderCancelledを考慮(2023-08-30~)
+                    const orderCancelled = ((_b = (_a = params.purpose.result) === null || _a === void 0 ? void 0 : _a.order) === null || _b === void 0 ? void 0 : _b.orderStatus) === factory.orderStatus.OrderCancelled;
+                    if (!orderCancelled) {
+                        // 取り消すべきアクションに絞る
+                        authorizeActions = authorizeActions.filter((a) => a.actionStatus !== factory.actionStatusType.CompletedActionStatus);
+                        if (transaction.typeOf === factory.transactionType.PlaceOrder) {
+                            const paymentMethodIds = (_d = (_c = transaction.result) === null || _c === void 0 ? void 0 : _c.order) === null || _d === void 0 ? void 0 : _d.paymentMethods.map((p) => {
+                                return p.paymentMethodId;
                             });
+                            if (!Array.isArray(paymentMethodIds)) {
+                                throw new factory.errors.Argument('Transaction', `${transaction.id} must have result.order.paymentMethods`);
+                            }
+                            if (paymentMethodIds.length > 0) {
+                                authorizeActions = authorizeActions.filter((a) => {
+                                    // paymentMethodIdが存在しない、あるいは、注文のpaymentMethodIdsに含まれなければ、アクション取消対象
+                                    const paymentMethodIdByAction = a.object.paymentMethodId;
+                                    const includedInOrder = typeof paymentMethodIdByAction === 'string'
+                                        && paymentMethodIds.includes(paymentMethodIdByAction);
+                                    return !includedInOrder;
+                                });
+                            }
                         }
                     }
                     break;
@@ -339,7 +343,7 @@ function authorize(params) {
                 if (error.name !== 'AbortError') {
                     yield processVoidPayTransaction({
                         project: action.project,
-                        agent: { id: action.project.id },
+                        // agent: { id: action.project.id },
                         id: action.id,
                         purpose: action.purpose
                     })(repos);

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

@@ -34,9 +34,9 @@ function authorize(params, paymentServiceId, searchTrade4accountId) {
             exclusion: []
         });
         // CreditCard系統の決済方法タイプは動的
-        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 availableChannel = yield repos.product.findAvailableChannel({
             project: params.project,
@@ -205,16 +205,16 @@ function handleAuthorizeError(error) {
  */
 function voidTransaction(params) {
     return (repos) => __awaiter(this, void 0, void 0, function* () {
-        var _a, _b, _c, _d, _e, _f, _g;
+        var _a, _b, _c, _d, _e, _f;
         const transaction = params.object;
         // CreditCard系統の決済方法タイプは動的
-        const paymentMethodType = (_a = transaction.object.paymentMethod) === null || _a === void 0 ? void 0 : _a.typeOf;
+        const paymentMethodType = (_a = transaction.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 paymentMethodId = (_b = transaction.object.paymentMethod) === null || _b === void 0 ? void 0 : _b.paymentMethodId;
+        const paymentMethodId = transaction.object.paymentMethodId;
         if (typeof paymentMethodId !== 'string') {
-            throw new factory.errors.ArgumentNull('object.paymentMethod.paymentMethodId');
+            throw new factory.errors.ArgumentNull('object.paymentMethodId');
         }
         const paymentServiceId = String(transaction.object.id);
         const availableChannel = yield repos.product.findAvailableChannel({
@@ -222,7 +222,7 @@ function voidTransaction(params) {
             typeOf: factory.service.paymentService.PaymentServiceType.CreditCard,
             id: paymentServiceId
         });
-        const sellerId = (_c = transaction.recipient) === null || _c === void 0 ? void 0 : _c.id;
+        const sellerId = (_b = transaction.recipient) === null || _b === void 0 ? void 0 : _b.id;
         if (typeof sellerId !== 'string') {
             throw new factory.errors.ArgumentNull('object.recipient.id');
         }
@@ -236,8 +236,8 @@ function voidTransaction(params) {
                 shopId: shopId,
                 shopPass: shopPass,
                 orderId: paymentMethodId,
-                siteId: (_d = availableChannel.credentials) === null || _d === void 0 ? void 0 : _d.siteId,
-                sitePass: (_e = availableChannel.credentials) === null || _e === void 0 ? void 0 : _e.sitePass
+                siteId: (_c = availableChannel.credentials) === null || _c === void 0 ? void 0 : _c.siteId,
+                sitePass: (_d = availableChannel.credentials) === null || _d === void 0 ? void 0 : _d.sitePass
             });
             debug('searchTradeResult:', searchTradeResult);
             // 仮売上であれば取消
@@ -248,8 +248,8 @@ function voidTransaction(params) {
                     accessId: searchTradeResult.accessId,
                     accessPass: searchTradeResult.accessPass,
                     jobCd: GMO.utils.util.JobCd.Void,
-                    siteId: (_f = availableChannel.credentials) === null || _f === void 0 ? void 0 : _f.siteId,
-                    sitePass: (_g = availableChannel.credentials) === null || _g === void 0 ? void 0 : _g.sitePass
+                    siteId: (_e = availableChannel.credentials) === null || _e === void 0 ? void 0 : _e.siteId,
+                    sitePass: (_f = availableChannel.credentials) === null || _f === void 0 ? void 0 : _f.sitePass
                 });
                 debug('alterTran processed', alterTranResult);
             }

package/lib/chevre/service/payment/movieTicket/validation.js

@@ -39,9 +39,9 @@ function validateMovieTicket(params, paymentServiceId, useCheckMovieTicketBefore
             throw new factory.errors.Argument('movieTickets', 'Number of movie ticket accessCodes must be 1');
         }
         // ムビチケ系統の決済方法タイプは動的
-        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');
         }
         // イベント取得属性最適化(2023-01-23~)
         const screeningEvent = yield repos.event.findMinimizedIndividualEventById({