@chevre/domain 21.20.0-alpha.8 → 21.20.0

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

@@ -1,9 +1,10 @@
 "use strict";
+// import * as COA from '@motionpicture/coa-service';
+// import { PhoneNumberFormat, PhoneNumberUtil } from 'google-libphonenumber';
+// import { format } from 'util';
 var _a;
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.createConfirmRegisterServiceActionObjectByOrder = exports.createConfirmReservationActionObject4COAByOrder = exports.createConfirmReservationActionObject4ChevreByOrder = exports.createInformTasks = void 0;
-const google_libphonenumber_1 = require("google-libphonenumber");
-const util_1 = require("util");
+exports.createConfirmReservationActionObject4COAByOrder = exports.createConfirmReservationActionObject4ChevreByOrder = exports.createInformTasks = void 0;
 const factory = require("../../../../factory");
 const order_1 = require("../../../../factory/order");
 const reservedAgentIdentifireNames_1 = require("../../../../factory/reservedAgentIdentifireNames");
@@ -47,14 +48,15 @@ function createInformTasks(order) {
 }
 exports.createInformTasks = createInformTasks;
 function creteOrder4inform(order) {
-    // 冗長な個人情報をmask
     return Object.assign({ 
         // whitelistで作成する(2022-07-19~)
-        project: order.project, typeOf: order.typeOf, seller: order.seller, price: order.price, priceCurrency: order.priceCurrency, confirmationNumber: order.confirmationNumber, orderNumber: order.orderNumber, acceptedOffers: order.acceptedOffers, orderStatus: order.orderStatus, orderDate: order.orderDate, 
+        project: order.project, typeOf: order.typeOf, seller: order.seller, price: order.price, priceCurrency: order.priceCurrency, confirmationNumber: order.confirmationNumber, orderNumber: order.orderNumber, acceptedOffers: [], 
+        // numAcceptedOffers: order.acceptedOffers.length,
+        numAcceptedOffers: order.numAcceptedOffers, orderStatus: order.orderStatus, orderDate: order.orderDate, 
         // mask
         customer: Object.assign(Object.assign({}, (0, order_1.createMaskedCustomer)(order, { noProfile: false })), { additionalProperty: (Array.isArray(order.customer.additionalProperty)) ? order.customer.additionalProperty : [], 
             // identifierは必要
-            // 予約後を隠蔽(2022-12-24~)
+            // 予約語を隠蔽(2022-12-24~)
             identifier: (Array.isArray(order.customer.identifier))
                 ? order.customer.identifier.filter((p) => {
                     return !reservedAgentIdentifireNames_1.RESERVED_AGENT_IDENTIFIER_NAMES.includes(p.name);
@@ -68,16 +70,8 @@ function creteOrder4inform(order) {
         }) }, (typeof order.id === 'string') ? { id: order.id } : undefined);
 }
 function createConfirmReservationActionObject4ChevreByOrder(params) {
-    const chevreReservationNumbers = params.order.acceptedOffers.filter((o) => {
-        var _a;
-        return (o.itemOffered.typeOf === factory.reservationType.EventReservation
-            || o.itemOffered.typeOf === factory.reservationType.BusReservation)
-            && ((_a = o.offeredThrough) === null || _a === void 0 ? void 0 : _a.identifier) === factory.service.webAPI.Identifier.Chevre;
-    })
-        .map((o) => {
-        return o.itemOffered.reservationNumber;
-    });
-    return [...new Set(chevreReservationNumbers)].map((reservationNumber) => {
+    // serialNumberから生成(2024-02-01~)
+    return params.order.serialNumbers.map((reservationNumber) => {
         return {
             potentialActions: {
                 reserve: {
@@ -92,89 +86,119 @@ function createConfirmReservationActionObject4ChevreByOrder(params) {
             typeOf: factory.assetTransactionType.Reserve
         };
     });
+    // const chevreReservationNumbers: string[] = params.order.acceptedOffers.filter((o) => {
+    //     return (
+    //         o.itemOffered.typeOf === factory.reservationType.EventReservation
+    //         || o.itemOffered.typeOf === factory.reservationType.BusReservation
+    //     )
+    //         && o.offeredThrough?.identifier === factory.service.webAPI.Identifier.Chevre;
+    // })
+    //     .map((o) => {
+    //         return (<factory.order.IReservation>o.itemOffered).reservationNumber;
+    //     });
+    // return [...new Set(chevreReservationNumbers)].map((reservationNumber) => {
+    //     return {
+    //         potentialActions: {
+    //             reserve: {
+    //                 purpose: {
+    //                     confirmationNumber: params.order.confirmationNumber,
+    //                     orderNumber: params.order.orderNumber,
+    //                     typeOf: factory.order.OrderType.Order
+    //                 }
+    //             }
+    //         },
+    //         transactionNumber: reservationNumber,
+    //         typeOf: factory.assetTransactionType.Reserve
+    //     };
+    // });
 }
 exports.createConfirmReservationActionObject4ChevreByOrder = createConfirmReservationActionObject4ChevreByOrder;
 function createConfirmReservationActionObject4COAByOrder(params) {
-    // COA予約のみ
-    const coaReservationOffers = params.order.acceptedOffers.filter((o) => {
-        var _a;
-        return o.itemOffered.typeOf === factory.reservationType.EventReservation
-            && ((_a = o.offeredThrough) === null || _a === void 0 ? void 0 : _a.identifier) === factory.service.webAPI.Identifier.COA;
-    });
-    const coaReservationNumbers = [...new Set(coaReservationOffers
-            .map((o) => {
-            return o.itemOffered.reservationNumber;
-        }))];
-    const customer = params.order.customer;
-    // 電話番号のフォーマットを日本人にリーダブルに調整(COAではこのフォーマットで扱うので)
-    const phoneUtil = google_libphonenumber_1.PhoneNumberUtil.getInstance();
-    const phoneNumber = phoneUtil.parse(customer.telephone, 'JP');
-    let telNum = phoneUtil.format(phoneNumber, google_libphonenumber_1.PhoneNumberFormat.NATIONAL);
-    // COAでは数字のみ受け付けるので数字以外を除去
-    telNum = telNum.replace(/[^\d]/g, '');
-    const mailAddr = customer.email;
-    if (mailAddr === undefined) {
-        throw new factory.errors.Argument('order', 'order.customer.email undefined');
-    }
-    return coaReservationNumbers.map((reservationNumber) => {
-        const coaReservations = coaReservationOffers
-            .filter((o) => o.itemOffered.reservationNumber === reservationNumber)
-            .map((o) => {
-            return o.itemOffered;
-        });
-        const coaReservation = coaReservations[0];
-        const reservationForCOAInfo = coaReservation.reservationFor.coaInfo;
-        if (reservationForCOAInfo === undefined) {
-            throw new factory.errors.NotFound('reservationFor.coaInfo');
-        }
-        const totalPrice = coaReservation.reservedTicket.coaReserveAmount;
-        if (totalPrice === undefined) {
-            throw new factory.errors.NotFound('reservedTicket.coaReserveAmount');
-        }
-        const listTicket = coaReservations.map((r) => {
-            var _a;
-            if (typeof ((_a = r.reservedTicket.coaTicketInfo) === null || _a === void 0 ? void 0 : _a.ticketCode) !== 'string') {
-                throw new factory.errors.NotFound('reservedTicket.coaTicketInfo');
-            }
-            // 冗長な属性を排除(2023-03-20~)
-            const { ticketCode, stdPrice, addPrice, spseatAdd1, spseatAdd2, disPrice, salePrice, mvtkAppPrice, ticketCount, spseatKbn, seatNum, addGlasses, kbnEisyahousiki, mvtkNum, mvtkKbnDenshiken, mvtkKbnMaeuriken, mvtkKbnKensyu, mvtkSalesPrice, kbnMgtk } = r.reservedTicket.coaTicketInfo;
-            return {
-                ticketCode, stdPrice, addPrice, spseatAdd1, spseatAdd2,
-                disPrice, salePrice, mvtkAppPrice, ticketCount, spseatKbn,
-                seatNum, addGlasses, kbnEisyahousiki, mvtkNum, mvtkKbnDenshiken,
-                mvtkKbnMaeuriken, mvtkKbnKensyu, mvtkSalesPrice, kbnMgtk
-            };
-        });
+    // serialNumberから生成(2024-02-01~)
+    return params.order.serialNumbers.map((reservationNumber) => {
+        // 完全に最適化(2024-01-31~)
         return {
-            theaterCode: reservationForCOAInfo.theaterCode,
-            dateJouei: reservationForCOAInfo.dateJouei,
-            titleCode: reservationForCOAInfo.titleCode,
-            titleBranchNum: reservationForCOAInfo.titleBranchNum,
-            timeBegin: reservationForCOAInfo.timeBegin,
-            tmpReserveNum: reservationNumber,
-            // tslint:disable-next-line:no-irregular-whitespace
-            reserveName: (0, util_1.format)('%s　%s', customer.familyName, customer.givenName),
-            // tslint:disable-next-line:no-irregular-whitespace
-            reserveNameJkana: (0, util_1.format)('%s　%s', customer.familyName, customer.givenName),
-            telNum: telNum,
-            mailAddr: mailAddr,
-            reserveAmount: totalPrice,
-            listTicket,
+            optimized: true,
             transactionNumber: reservationNumber,
             typeOf: 'COAReserveTransaction'
         };
     });
+    // const coaReservationOffers = params.order.acceptedOffers.filter((o) => {
+    //     return o.itemOffered.typeOf === factory.reservationType.EventReservation
+    //         && o.offeredThrough?.identifier === factory.service.webAPI.Identifier.COA;
+    // });
+    // const coaReservationNumbers: string[] = [...new Set(coaReservationOffers
+    //     .map((o) => {
+    //         return (<factory.order.IReservation>o.itemOffered).reservationNumber;
+    //     }))];
+    // // const customer = params.order.customer;
+    // // // 電話番号のフォーマットを日本人にリーダブルに調整(COAではこのフォーマットで扱うので)
+    // // const phoneUtil = PhoneNumberUtil.getInstance();
+    // // const phoneNumber = phoneUtil.parse(customer.telephone, 'JP');
+    // // let telNum = phoneUtil.format(phoneNumber, PhoneNumberFormat.NATIONAL);
+    // // // COAでは数字のみ受け付けるので数字以外を除去
+    // // telNum = telNum.replace(/[^\d]/g, '');
+    // // const mailAddr = customer.email;
+    // // if (mailAddr === undefined) {
+    // //     throw new factory.errors.Argument('order', 'order.customer.email undefined');
+    // // }
+    // return coaReservationNumbers.map((reservationNumber) => {
+    //     // 完全に最適化(2024-01-31~)
+    //     return {
+    //         optimized: true,
+    //         transactionNumber: reservationNumber,
+    //         typeOf: 'COAReserveTransaction'
+    //     };
+    //     // const coaReservations = coaReservationOffers
+    //     //     .filter((o) => (<factory.order.IEventReservation>o.itemOffered).reservationNumber === reservationNumber)
+    //     //     .map((o) => {
+    //     //         return <factory.order.IEventReservation>o.itemOffered;
+    //     //     });
+    //     // const coaReservation = coaReservations[0];
+    //     // const reservationForCOAInfo = coaReservation.reservationFor.coaInfo;
+    //     // if (reservationForCOAInfo === undefined) {
+    //     //     throw new factory.errors.NotFound('reservationFor.coaInfo');
+    //     // }
+    //     // const totalPrice = coaReservation.reservedTicket.coaReserveAmount;
+    //     // if (totalPrice === undefined) {
+    //     //     throw new factory.errors.NotFound('reservedTicket.coaReserveAmount');
+    //     // }
+    //     // const listTicket: COA.factory.reserve.IUpdReserveTicket[] = coaReservations.map((r) => {
+    //     //     if (typeof r.reservedTicket.coaTicketInfo?.ticketCode !== 'string') {
+    //     //         throw new factory.errors.NotFound('reservedTicket.coaTicketInfo');
+    //     //     }
+    //     //     // 冗長な属性を排除(2023-03-20~)
+    //     //     const {
+    //     //         ticketCode, stdPrice, addPrice, spseatAdd1, spseatAdd2,
+    //     //         disPrice, salePrice, mvtkAppPrice, ticketCount, spseatKbn,
+    //     //         seatNum, addGlasses, kbnEisyahousiki, mvtkNum, mvtkKbnDenshiken,
+    //     //         mvtkKbnMaeuriken, mvtkKbnKensyu, mvtkSalesPrice, kbnMgtk
+    //     //     } = r.reservedTicket.coaTicketInfo;
+    //     //     return {
+    //     //         ticketCode, stdPrice, addPrice, spseatAdd1, spseatAdd2,
+    //     //         disPrice, salePrice, mvtkAppPrice, ticketCount, spseatKbn,
+    //     //         seatNum, addGlasses, kbnEisyahousiki, mvtkNum, mvtkKbnDenshiken,
+    //     //         mvtkKbnMaeuriken, mvtkKbnKensyu, mvtkSalesPrice, kbnMgtk
+    //     //     };
+    //     // });
+    //     // return {
+    //     //     theaterCode: reservationForCOAInfo.theaterCode,
+    //     //     dateJouei: reservationForCOAInfo.dateJouei,
+    //     //     titleCode: reservationForCOAInfo.titleCode,
+    //     //     titleBranchNum: reservationForCOAInfo.titleBranchNum,
+    //     //     timeBegin: reservationForCOAInfo.timeBegin,
+    //     //     tmpReserveNum: reservationNumber,
+    // tslint:disable-next-line:no-irregular-whitespace
+    //     //     reserveName: format('%s　%s', customer.familyName, customer.givenName),
+    // tslint:disable-next-line:no-irregular-whitespace
+    //     //     reserveNameJkana: format('%s　%s', customer.familyName, customer.givenName),
+    //     //     telNum: telNum,
+    //     //     mailAddr: mailAddr,
+    //     //     reserveAmount: totalPrice, // デフォルトのpriceCurrencyがJPYなのでこれでよし
+    //     //     listTicket,
+    //     //     transactionNumber: reservationNumber,
+    //     //     typeOf: 'COAReserveTransaction'
+    //     // };
+    // });
 }
 exports.createConfirmReservationActionObject4COAByOrder = createConfirmReservationActionObject4COAByOrder;
-function createConfirmRegisterServiceActionObjectByOrder(params) {
-    // いったん保留
-    const chevreTransactionNumbers = [];
-    return [...new Set(chevreTransactionNumbers)].map((transactionNumber) => {
-        return {
-            endDate: params.order.orderDate,
-            transactionNumber,
-            typeOf: factory.assetTransactionType.RegisterService
-        };
-    });
-}
-exports.createConfirmRegisterServiceActionObjectByOrder = createConfirmRegisterServiceActionObjectByOrder;

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

@@ -5,7 +5,10 @@ type IPlaceOrderTransaction = Pick<factory.transaction.placeOrder.ITransaction,
 declare function onOrderProcessing(params: {
     order: Omit<factory.order.IOrder, 'orderStatus'> & {
         orderStatus: factory.orderStatus.OrderProcessing;
-        acceptedOffers: factory.order.IAcceptedOffer<factory.order.IItemOffered>[];
+        numAcceptedOffers: number;
+        itemOfferedTypeOf: factory.order.IItemOffered['typeOf'];
+        serialNumbers: string[];
+        offeredThroughIdentifier?: factory.service.webAPI.Identifier;
     };
     placeOrderTransaction?: IPlaceOrderTransaction;
 }): (repos: {

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

@@ -14,16 +14,19 @@ exports.onOrderProcessing = void 0;
  * 注文処理時処理
  */
 const createDebug = require("debug");
+const util = require("util");
 const factory = require("../../../factory");
 const order_1 = require("../../../factory/order");
+const settings_1 = require("../../../settings");
+const createSendEmailMessageTaskIfNotExist_1 = require("./onOrderProcessing/createSendEmailMessageTaskIfNotExist");
 const factory_1 = require("./onOrderProcessing/factory");
 const debug = createDebug('chevre-domain:service:order');
-const USE_CONFIRM_REGISTER_SERVICE_TRANSACTION = process.env.USE_CONFIRM_REGISTER_SERVICE_TRANSACTION === '1';
 function onOrderProcessing(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;
         debug('onOrderStatusChanged called.', params.order.orderNumber, params.order.orderStatus, params.order.orderDate);
         let tasks = [];
+        const sendOrderPotentialActions = (_e = (_d = (_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) === null || _d === void 0 ? void 0 : _d.sendOrder) === null || _e === void 0 ? void 0 : _e.potentialActions;
         const maskedCustomer = (0, order_1.createMaskedCustomer)(params.order, { noProfile: true });
         const simpleOrder = {
             typeOf: params.order.typeOf,
@@ -41,8 +44,7 @@ function onOrderProcessing(params) {
         switch (params.order.orderStatus) {
             case factory.orderStatus.OrderProcessing:
                 tasks = [
-                    ...(0, factory_1.createInformTasks)(params.order),
-                    ...yield createConfirmRegisterServiceTransactionTasks(params.order, simpleOrder)(repos)
+                    ...(0, factory_1.createInformTasks)(params.order)
                 ];
                 break;
             default:
@@ -51,34 +53,41 @@ function onOrderProcessing(params) {
         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: (_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
-                })(repos);
+                if (params.order.itemOfferedTypeOf === factory.actionType.MoneyTransfer) {
+                    yield createConfirmMoneyTransferTasksIfNotExist(params.order, simpleOrder)(repos);
+                }
+                else if (params.order.itemOfferedTypeOf === factory.reservationType.BusReservation
+                    || params.order.itemOfferedTypeOf === factory.reservationType.EventReservation) {
+                    // 冗長なconfirmReserveTransactionタスク作成を回避(2023-08-25~)
+                    yield createConfirmReserveTransactionTasksIfNotExist(params.order, simpleOrder)(repos);
+                }
+                else if (params.order.itemOfferedTypeOf === factory.permit.PermitType.Permit) {
+                    yield createConfirmRegisterServiceTasksIfNotExist(params.order, simpleOrder)(repos);
+                }
                 yield createGivePointAwardTaskIfNotExist({
-                    potentialActions: (_f = (_e = (_d = params.placeOrderTransaction) === null || _d === void 0 ? void 0 : _d.potentialActions) === null || _e === void 0 ? void 0 : _e.order) === null || _f === void 0 ? void 0 : _f.potentialActions
+                    potentialActions: (_h = (_g = (_f = params.placeOrderTransaction) === null || _f === void 0 ? void 0 : _f.potentialActions) === null || _g === void 0 ? void 0 : _g.order) === null || _h === void 0 ? void 0 : _h.potentialActions
                 })(repos);
+                // OrderProcessingにおけるEメール送信に対応(2024-01-17~)
+                if (settings_1.USE_SEND_EMAIL_MESSAGE_ON_ORDER_PROCESSING) {
+                    yield (0, createSendEmailMessageTaskIfNotExist_1.createSendEmailMessageTaskIfNotExist)({ potentialActions: sendOrderPotentialActions })(repos);
+                }
                 break;
             default:
         }
     });
 }
 exports.onOrderProcessing = onOrderProcessing;
-// const COA_TASK_DELAY_IN_SECONDS = 0;
 function createConfirmReserveTransactionTasksIfNotExist(order, simpleOrder) {
     return (repos) => __awaiter(this, void 0, void 0, function* () {
         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 })
-        ];
+        let confirmObjects;
+        if (order.offeredThroughIdentifier === factory.service.webAPI.Identifier.COA) {
+            confirmObjects = (0, factory_1.createConfirmReservationActionObject4COAByOrder)({ order });
+        }
+        else {
+            confirmObjects = (0, factory_1.createConfirmReservationActionObject4ChevreByOrder)({ order });
+        }
         yield Promise.all(confirmObjects.map((confirmObject) => __awaiter(this, void 0, void 0, function* () {
             const data = {
                 project: order.project,
@@ -93,7 +102,9 @@ function createConfirmReserveTransactionTasksIfNotExist(order, simpleOrder) {
                         : factory.service.webAPI.Identifier.Chevre
                 }
             };
+            const taskIdentifier = util.format('%s:%s:%s:%s:%s:%s', data.project.id, factory.taskName.ConfirmReserveTransaction, data.purpose.typeOf, data.purpose.orderNumber, data.object.typeOf, data.object.transactionNumber);
             const confirmReserveTransactionTask = {
+                identifier: taskIdentifier,
                 project: order.project,
                 name: factory.taskName.ConfirmReserveTransaction,
                 status: factory.taskStatus.Ready,
@@ -103,84 +114,70 @@ function createConfirmReserveTransactionTasksIfNotExist(order, simpleOrder) {
                 executionResults: [],
                 data
             };
-            yield repos.task.createConfirmReserveTransactionTaskIfNotExist(confirmReserveTransactionTask, { emitImmediately: true });
+            yield repos.task.createIfNotExistByIdentifier(confirmReserveTransactionTask, { emitImmediately: true });
         })));
     });
 }
-function createConfirmRegisterServiceTransactionTasks(order, simpleOrder) {
+function createConfirmMoneyTransferTasksIfNotExist(order, simpleOrder) {
     return (repos) => __awaiter(this, void 0, void 0, function* () {
         const taskRunsAt = new Date();
-        if (USE_CONFIRM_REGISTER_SERVICE_TRANSACTION) {
-            const confirmObjects = (0, factory_1.createConfirmRegisterServiceActionObjectByOrder)({ 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 } }
-                    }
-                }, {
-                    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: factory.service.webAPI.Identifier.Chevre
-                        }
-                    };
-                    tasks.push({
-                        project: order.project,
-                        name: factory.taskName.ConfirmRegisterServiceTransaction,
-                        status: factory.taskStatus.Ready,
-                        runsAt: taskRunsAt,
-                        remainingNumberOfTries: 10,
-                        numberOfTried: 0,
-                        executionResults: [],
-                        data
-                    });
-                }
-            })));
-            return tasks;
-        }
-        else {
-            return [];
-        }
+        yield Promise.all(order.serialNumbers.map((moneyTransferTransactionNumber) => __awaiter(this, void 0, void 0, function* () {
+            const data = {
+                project: order.project,
+                typeOf: factory.actionType.ConfirmAction,
+                object: {
+                    // pendingTransaction: { id: '' }, // 空文字であれば、transactionNumberで処理される
+                    transactionNumber: moneyTransferTransactionNumber,
+                    typeOf: factory.assetTransactionType.MoneyTransfer
+                },
+                agent: order.project,
+                purpose: simpleOrder
+            };
+            const taskIdentifier = util.format('%s:%s:%s:%s:%s:%s', data.project.id, factory.taskName.ConfirmMoneyTransfer, data.purpose.typeOf, simpleOrder.orderNumber, data.object.typeOf, data.object.transactionNumber);
+            const confirmMoneyTransferTransactionTask = {
+                identifier: taskIdentifier,
+                project: order.project,
+                name: factory.taskName.ConfirmMoneyTransfer,
+                status: factory.taskStatus.Ready,
+                runsAt: taskRunsAt,
+                remainingNumberOfTries: 10,
+                numberOfTried: 0,
+                executionResults: [],
+                data
+            };
+            yield repos.task.createIfNotExistByIdentifier(confirmMoneyTransferTransactionTask, { emitImmediately: true });
+        })));
     });
 }
-function createSendOrderTransactionTaskIfNotExist(params) {
+function createConfirmRegisterServiceTasksIfNotExist(order, simpleOrder) {
     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 taskRunsAt = new Date();
+        yield Promise.all(order.serialNumbers.map((registerServiceTransactionNumber) => __awaiter(this, void 0, void 0, function* () {
+            const data = {
+                project: order.project,
+                typeOf: factory.actionType.ConfirmAction,
+                object: {
+                    endDate: order.orderDate,
+                    transactionNumber: registerServiceTransactionNumber,
+                    typeOf: factory.assetTransactionType.RegisterService
+                },
+                agent: order.project,
+                purpose: simpleOrder
             };
-            const sendOrderTask = {
-                project: sendOrderByTransaction.project,
-                name: factory.taskName.SendOrder,
+            const taskIdentifier = util.format('%s:%s:%s:%s:%s:%s', data.project.id, factory.taskName.ConfirmRegisterService, data.purpose.typeOf, simpleOrder.orderNumber, data.object.typeOf, data.object.transactionNumber);
+            const confirmRegisterServiceTask = {
+                identifier: taskIdentifier,
+                project: order.project,
+                name: factory.taskName.ConfirmRegisterService,
                 status: factory.taskStatus.Ready,
-                runsAt: now,
+                runsAt: taskRunsAt,
                 remainingNumberOfTries: 10,
                 numberOfTried: 0,
                 executionResults: [],
-                data: sendOrderTaskData
+                data
             };
-            yield repos.task.createSendOrderTaskIfNotExist(sendOrderTask, { emitImmediately: true });
-        }
+            yield repos.task.createIfNotExistByIdentifier(confirmRegisterServiceTask, { emitImmediately: true });
+        })));
     });
 }
 function createGivePointAwardTaskIfNotExist(params) {

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

@@ -6,5 +6,5 @@ declare function createInformTasks(order: IReturnedOrder): factory.task.IAttribu
  */
 declare function createOnOrderReturnedTasksByTransaction(params: {
     potentialActions?: factory.action.transfer.returnAction.order.IPotentialActions;
-}): (import("@chevre/factory/lib/task").IAttributes | import("@chevre/factory/lib/task/confirmMoneyTransfer").IAttributes | import("@chevre/factory/lib/task/confirmRegisterService").IAttributes | import("@chevre/factory/lib/task/confirmPayTransaction").IAttributes | import("@chevre/factory/lib/task/confirmRegisterServiceTransaction").IAttributes | import("@chevre/factory/lib/task/confirmReserveTransaction").IAttributes | import("@chevre/factory/lib/task/createEvent").IAttributes | import("@chevre/factory/lib/task/deleteTransaction").IAttributes | import("@chevre/factory/lib/task/givePointAward").IAttributes | import("@chevre/factory/lib/task/onAssetTransactionStatusChanged").IAttributes | import("@chevre/factory/lib/task/onAuthorizationCreated").IAttributes | import("@chevre/factory/lib/task/onEventChanged").IAttributes | import("@chevre/factory/lib/task/onResourceUpdated").IAttributes | import("@chevre/factory/lib/task/onOrderPaymentCompleted").IAttributes | import("@chevre/factory/lib/task/placeOrder").IAttributes | import("@chevre/factory/lib/task/returnOrder").IAttributes | import("@chevre/factory/lib/task/returnMoneyTransfer").IAttributes | import("@chevre/factory/lib/task/returnPayTransaction").IAttributes | import("@chevre/factory/lib/task/returnPointAward").IAttributes | import("@chevre/factory/lib/task/returnReserveTransaction").IAttributes | import("@chevre/factory/lib/task/sendEmailMessage").IAttributes | import("@chevre/factory/lib/task/sendOrder").IAttributes | import("@chevre/factory/lib/task/syncScreeningRooms").IAttributes | import("@chevre/factory/lib/task/triggerWebhook").IAttributes | import("@chevre/factory/lib/task/useReservation").IAttributes | import("@chevre/factory/lib/task/voidMoneyTransferTransaction").IAttributes | import("@chevre/factory/lib/task/voidPayTransaction").IAttributes | import("@chevre/factory/lib/task/voidRegisterServiceTransaction").IAttributes | import("@chevre/factory/lib/task/voidReserveTransaction").IAttributes)[];
+}): (import("@chevre/factory/lib/task").IAttributes | import("@chevre/factory/lib/task/confirmMoneyTransfer").IAttributes | import("@chevre/factory/lib/task/confirmRegisterService").IAttributes | import("@chevre/factory/lib/task/confirmPayTransaction").IAttributes | import("@chevre/factory/lib/task/confirmRegisterServiceTransaction").IAttributes | import("@chevre/factory/lib/task/confirmReserveTransaction").IAttributes | import("@chevre/factory/lib/task/createAccountingReport").IAttributes | import("@chevre/factory/lib/task/createEvent").IAttributes | import("@chevre/factory/lib/task/deleteTransaction").IAttributes | import("@chevre/factory/lib/task/givePointAward").IAttributes | import("@chevre/factory/lib/task/onAssetTransactionStatusChanged").IAttributes | import("@chevre/factory/lib/task/onAuthorizationCreated").IAttributes | import("@chevre/factory/lib/task/onEventChanged").IAttributes | import("@chevre/factory/lib/task/onResourceUpdated").IAttributes | import("@chevre/factory/lib/task/onOrderPaymentCompleted").IAttributes | import("@chevre/factory/lib/task/placeOrder").IAttributes | import("@chevre/factory/lib/task/returnOrder").IAttributes | import("@chevre/factory/lib/task/returnMoneyTransfer").IAttributes | import("@chevre/factory/lib/task/returnPayTransaction").IAttributes | import("@chevre/factory/lib/task/returnPointAward").IAttributes | import("@chevre/factory/lib/task/returnReserveTransaction").IAttributes | import("@chevre/factory/lib/task/sendEmailMessage").IAttributes | import("@chevre/factory/lib/task/sendOrder").IAttributes | import("@chevre/factory/lib/task/triggerWebhook").IAttributes | import("@chevre/factory/lib/task/useReservation").IAttributes | import("@chevre/factory/lib/task/voidMoneyTransferTransaction").IAttributes | import("@chevre/factory/lib/task/voidPayTransaction").IAttributes | import("@chevre/factory/lib/task/voidRegisterServiceTransaction").IAttributes | import("@chevre/factory/lib/task/voidReserveTransaction").IAttributes)[];
 export { createInformTasks, createOnOrderReturnedTasksByTransaction };

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

@@ -55,22 +55,25 @@ function createOnOrderReturnedTasksByTransaction(params) {
     const now = new Date();
     const taskAttributes = [];
     const potentialActions = params.potentialActions;
+    // onOrderReturnedで生成へ移行(2024-02-04~)
     // 入金返却タスク
-    const returnMoneyTransferAttributes = potentialActions === null || potentialActions === void 0 ? void 0 : potentialActions.returnMoneyTransfer;
-    if (Array.isArray(returnMoneyTransferAttributes)) {
-        taskAttributes.push(...returnMoneyTransferAttributes.map((a) => {
-            return {
-                project: a.project,
-                name: factory.taskName.ReturnMoneyTransfer,
-                status: factory.taskStatus.Ready,
-                runsAt: now,
-                remainingNumberOfTries: 10,
-                numberOfTried: 0,
-                executionResults: [],
-                data: a
-            };
-        }));
-    }
+    // const returnMoneyTransferAttributes = potentialActions?.returnMoneyTransfer;
+    // if (Array.isArray(returnMoneyTransferAttributes)) {
+    //     taskAttributes.push(...returnMoneyTransferAttributes.map(
+    //         (a): factory.task.IAttributes<factory.taskName.ReturnMoneyTransfer> => {
+    //             return {
+    //                 project: a.project,
+    //                 name: factory.taskName.ReturnMoneyTransfer,
+    //                 status: factory.taskStatus.Ready,
+    //                 runsAt: now, // なるはやで実行
+    //                 remainingNumberOfTries: 10,
+    //                 numberOfTried: 0,
+    //                 executionResults: [],
+    //                 data: a
+    //             };
+    //         }
+    //     ));
+    // }
     // ポイント特典返却タスク
     const returnPointAwardAttributes = potentialActions === null || potentialActions === void 0 ? void 0 : potentialActions.returnPointAward;
     if (Array.isArray(returnPointAwardAttributes)) {

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

@@ -43,6 +43,8 @@ function onOrderReturned(params) {
                 const potentialActionsByTransaction = (_d = (_c = (_b = (_a = params.returnOrderTransaction) === null || _a === void 0 ? void 0 : _a.potentialActions) === null || _b === void 0 ? void 0 : _b.returnOrder) === null || _c === void 0 ? void 0 : _c.find((returnOrderActionByTransaction) => {
                     return returnOrderActionByTransaction.object.orderNumber === params.order.orderNumber;
                 })) === null || _d === void 0 ? void 0 : _d.potentialActions;
+                const itemOfferedTypeOfs = yield repos.acceptedOffer.distinctValues({ orderNumber: { $in: [params.order.orderNumber] } }, 'acceptedOffers.itemOffered.typeOf');
+                const serialNumbers = yield repos.acceptedOffer.distinctValues({ orderNumber: { $in: [params.order.orderNumber] } }, 'acceptedOffers.serialNumber');
                 const reservationNumbers = yield repos.acceptedOffer.distinctValues({ orderNumber: { $in: [params.order.orderNumber] } }, 'acceptedOffers.itemOffered.reservationNumber');
                 const offeredThroughIdentifier = (yield repos.acceptedOffer.distinctValues({ orderNumber: { $in: [params.order.orderNumber] } }, 'acceptedOffers.offeredThrough.identifier'))[0];
                 const reservationForSuperEventLocationBranchCodes = yield repos.acceptedOffer.distinctValues({ orderNumber: { $in: [params.order.orderNumber] } }, 'acceptedOffers.itemOffered.reservationFor.superEvent.location.branchCode');
@@ -54,7 +56,10 @@ function onOrderReturned(params) {
                     // 決済取引返却タスクを作成(2022-06-09~)
                     ...createReturnPayTransactionTasks({ orderNumber: params.order.orderNumber }, params.returnOrderTransaction),
                     // 取引のpotentialActionsを適用(2023-08-19~)
-                    ...(0, factory_1.createOnOrderReturnedTasksByTransaction)({ potentialActions: potentialActionsByTransaction })
+                    ...(0, factory_1.createOnOrderReturnedTasksByTransaction)({ potentialActions: potentialActionsByTransaction }),
+                    ...(itemOfferedTypeOfs[0] === factory.actionType.MoneyTransfer)
+                        ? createReturnMoneyTransferTasks(Object.assign(Object.assign({}, params.order), { serialNumbers }), simpleOrder)
+                        : []
                 ];
                 break;
             default:
@@ -137,6 +142,62 @@ function createReturnReserveTransactionTasks(order, simpleOrder) {
     }
     return tasks;
 }
+function createReturnMoneyTransferTasks(order, simpleOrder) {
+    const taskRunsAt = new Date();
+    const tasks = [];
+    for (const transactionNumber of order.serialNumbers) {
+        const returnMoneyTransferActionObject = {
+            // project: order.project,
+            typeOf: factory.actionType.MoneyTransfer,
+            // actionStatus: factory.actionStatusType.CompletedActionStatus,
+            // startDate: order.orderDate,
+            // id: '',
+            // amount: {
+            //     typeOf: 'MonetaryAmount',
+            //     currency: '' // この時点で不明でも動作する
+            // },
+            object: {
+                typeOf: factory.account.transactionType.Deposit,
+                // いったんtransactionNumberさえあれば返却可能
+                transactionNumber
+            }
+            // agent: order.project,
+            // recipient: {
+            //     typeOf: order.customer.typeOf,
+            //     id: order.customer.id,
+            //     name: String(order.customer.name)
+            // },
+            // fromLocation: <any>{},
+            // toLocation: <any>{},
+            // purpose: <any>{}
+        };
+        const returnMoneyTransferAction = {
+            project: order.project,
+            typeOf: factory.actionType.ReturnAction,
+            object: returnMoneyTransferActionObject,
+            agent: order.project,
+            recipient: {
+                typeOf: order.seller.typeOf,
+                id: order.seller.id,
+                name: order.seller.name
+            },
+            potentialActions: {},
+            purpose: simpleOrder,
+            instrument: { typeOf: 'WebAPI', identifier: factory.service.webAPI.Identifier.Chevre }
+        };
+        tasks.push({
+            project: order.project,
+            name: factory.taskName.ReturnMoneyTransfer,
+            status: factory.taskStatus.Ready,
+            runsAt: taskRunsAt,
+            remainingNumberOfTries: 10,
+            numberOfTried: 0,
+            executionResults: [],
+            data: returnMoneyTransferAction
+        });
+    }
+    return tasks;
+}
 function createReturnPayTransactionTasks(order, returnOrderTransaction) {
     var _a, _b;
     const taskRunsAt = new Date();