@chevre/domain 21.20.0-alpha.8 → 21.20.0

package/lib/chevre/service/offer/product.js

@@ -16,6 +16,7 @@ const accountTransactionIdentifier_1 = require("../../factory/accountTransaction
 const availableProductTypes_1 = require("../../factory/availableProductTypes");
 const RegisterServiceTransaction = require("../assetTransaction/registerService");
 const placeOrderInProgress_1 = require("../transaction/placeOrderInProgress");
+const any_1 = require("./any");
 const factory_1 = require("./product/factory");
 const searchProductOffers_1 = require("./product/searchProductOffers");
 exports.ERROR_MESSAGE_ALREADY_REGISTERED = 'Already registered';
@@ -121,6 +122,7 @@ function authorize(params) {
         acceptedOffer = yield createServiceOutputIdentifier({ acceptedOffer, product })(repos);
         let requestBody;
         let responseBody;
+        let result;
         // まず取引番号発行
         const { transactionNumber } = yield repos.transactionNumber.publishByTimestamp({
             startDate: new Date()
@@ -134,14 +136,8 @@ function authorize(params) {
         const action = yield repos.action.start(actionAttributes);
         try {
             // 会員の場合のみ排他ロック
-            if (params.agent.typeOf === factory.personType.Person) {
-                // 廃止(2023-12-07~)
-                // await processLockRegisterMembershipService({
-                //     agent: params.agent,
-                //     product: product,
-                //     purpose: { typeOf: transaction.typeOf, id: transaction.id }
-                // })(repos);
-            }
+            // if (params.agent.typeOf === factory.personType.Person) {
+            // }
             // サービス登録開始
             const startParams = (0, factory_1.createRegisterServiceStartParams)({
                 project: { typeOf: factory.organizationType.Project, id: params.project.id },
@@ -151,7 +147,12 @@ function authorize(params) {
             });
             requestBody = startParams;
             responseBody = yield RegisterServiceTransaction.start(startParams)(repos);
-            // responseBody = await repos.registerServiceTransaction.start(startParams);
+            result = (0, factory_1.createResult)({ project: action.project, requestBody, responseBody, acceptedOffer });
+            yield (0, any_1.acceptOffer)({
+                project: transaction.project,
+                purpose: { id: transaction.id },
+                acceptedOffers: result.acceptedOffers
+            })(repos);
         }
         catch (error) {
             try {
@@ -160,21 +161,8 @@ function authorize(params) {
             catch (__) {
                 // no op
             }
-            try {
-                // 廃止(2023-12-07~)
-                // await processUnlockRegisterMembershipService({
-                //     agent: params.agent,
-                //     product: { id: String(product.id) },
-                //     purpose: { typeOf: transaction.typeOf, id: transaction.id }
-                // })(repos);
-            }
-            catch (error) {
-                // 失敗したら仕方ない
-            }
             throw error;
         }
-        // アクションを完了
-        const result = (0, factory_1.createResult)({ project: action.project, requestBody, responseBody, acceptedOffer });
         return yield repos.action.complete({ typeOf: action.typeOf, id: action.id, result: result });
     });
 }
@@ -247,7 +235,7 @@ function voidTransaction(params) {
                 //     purpose: params.purpose
                 // })(repos);
             }
-            yield repos.action.cancel({ typeOf: action.typeOf, id: action.id });
+            yield repos.action.cancelWithVoid({ typeOf: action.typeOf, id: action.id });
             yield processVoidRegisterServiceTransaction({
                 action,
                 project: params.project

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

@@ -8,7 +8,9 @@ import type { MongoRepository as OrderRepo } from '../../repo/order';
 import type { MongoRepository as ProjectRepo } from '../../repo/project';
 import type { MongoRepository as TaskRepo } from '../../repo/task';
 import type { MongoRepository as TransactionRepo } from '../../repo/transaction';
-declare function confirmPayTransaction(data: factory.task.IData<factory.taskName.ConfirmPayTransaction>): (repos: {
+declare function confirmPayTransaction(data: factory.task.IData<factory.taskName.ConfirmPayTransaction>, options: {
+    minimizePotentialActions: boolean;
+}): (repos: {
     acceptedOffer: AcceptedOfferRepo;
     action: ActionRepo;
     assetTransaction: AssetTransactionRepo;

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

@@ -12,7 +12,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.confirmPayTransaction = void 0;
 const factory = require("../../factory");
 const PayTransactionService = require("../assetTransaction/pay");
-function confirmPayTransaction(data) {
+function confirmPayTransaction(data, options) {
     return (repos) => __awaiter(this, void 0, void 0, function* () {
         var _a, _b;
         // アクション開始
@@ -27,7 +27,7 @@ function confirmPayTransaction(data) {
                                 orderNumber: data.purpose.orderNumber
                             }
                         }
-                    } }, (typeof ((_b = (_a = confirmingTransaction.object) === null || _a === void 0 ? void 0 : _a.paymentMethod) === null || _b === void 0 ? void 0 : _b.identifier) === 'string')
+                    }, options }, (typeof ((_b = (_a = confirmingTransaction.object) === null || _a === void 0 ? void 0 : _a.paymentMethod) === null || _b === void 0 ? void 0 : _b.identifier) === 'string')
                     ? { object: { paymentMethod: { identifier: confirmingTransaction.object.paymentMethod.identifier } } }
                     : undefined))({
                     acceptedOffer: repos.acceptedOffer,
@@ -36,7 +36,7 @@ function confirmPayTransaction(data) {
                     assetTransaction: repos.assetTransaction,
                     event: repos.event,
                     order: repos.order,
-                    project: repos.project,
+                    // project: repos.project,
                     task: repos.task
                 });
             }
@@ -52,7 +52,7 @@ function confirmPayTransaction(data) {
         }
         // アクション完了
         const actionResult = {};
-        yield repos.action.complete({ typeOf: action.typeOf, id: action.id, result: actionResult });
+        yield repos.action.completeWithVoid({ typeOf: action.typeOf, id: action.id, result: actionResult });
         // processOrder連携(2023-08-23~)
         yield onConfirmed(data)({
             task: repos.task
@@ -74,7 +74,7 @@ function onConfirmed(params) {
                     purpose: {
                         confirmationNumber: params.purpose.confirmationNumber,
                         orderNumber: params.purpose.orderNumber,
-                        typeOf: 'Order'
+                        typeOf: factory.order.OrderType.Order
                     },
                     useOnOrderStatusChanged: params.useOnOrderStatusChanged === true
                 };

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

@@ -21,7 +21,7 @@ function createAccountingReportIfNotExist(params) {
             project: { id: params.project.id }
         });
         // 経理レポートを保管
-        yield repos.accountingReport.createIfNotExist(accountingReport);
+        yield repos.accountingReport.syncMainEntity(accountingReport);
     });
 }
 exports.createAccountingReportIfNotExist = createAccountingReportIfNotExist;

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

@@ -24,4 +24,15 @@ declare function paymentDue2Processing(params: {
     task: TaskRepo;
     transaction: TransactionRepo;
 }) => Promise<void>;
-export { onAssetTransactionStatusChanged, paymentDue2Processing };
+declare function processing2inTransit(params: {
+    project: {
+        id: string;
+    };
+    orderNumber: string;
+    useOnOrderStatusChanged: boolean;
+}): (repos: {
+    order: OrderRepo;
+    task: TaskRepo;
+    transaction: TransactionRepo;
+}) => Promise<void>;
+export { onAssetTransactionStatusChanged, paymentDue2Processing, processing2inTransit };

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

@@ -9,11 +9,14 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     });
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.paymentDue2Processing = exports.onAssetTransactionStatusChanged = void 0;
+exports.processing2inTransit = exports.paymentDue2Processing = exports.onAssetTransactionStatusChanged = void 0;
+const createDebug = require("debug");
 const findPlaceOrderTransaction_1 = require("./findPlaceOrderTransaction");
 const onOrderStatusChanged_1 = require("./onOrderStatusChanged");
 const factory = require("../../factory");
+const debug = createDebug('chevre-domain:service:order');
 function onAssetTransactionStatusChanged(params) {
+    // tslint:disable-next-line:cyclomatic-complexity max-func-body-length
     return (repos) => __awaiter(this, void 0, void 0, function* () {
         var _a, _b, _c, _d, _e;
         if (typeof params.useOnOrderStatusChanged !== 'boolean') {
@@ -21,10 +24,10 @@ function onAssetTransactionStatusChanged(params) {
         }
         switch (params.object.status) {
             case factory.transactionStatusType.Confirmed:
+                const orderNumber = (_a = params.purpose) === null || _a === void 0 ? void 0 : _a.orderNumber;
+                const confirmationNumber = (_b = params.purpose) === null || _b === void 0 ? void 0 : _b.confirmationNumber;
                 switch (params.object.typeOf) {
                     case factory.assetTransactionType.Pay:
-                        const orderNumber = (_a = params.purpose) === null || _a === void 0 ? void 0 : _a.orderNumber;
-                        const confirmationNumber = (_b = params.purpose) === null || _b === void 0 ? void 0 : _b.confirmationNumber;
                         // 確定時の決済方法区分指定(2023-08-29~)
                         const specifiedPaymentMethodIdentifire = (_e = (_d = (_c = params.object) === null || _c === void 0 ? void 0 : _c.object) === null || _d === void 0 ? void 0 : _d.paymentMethod) === null || _e === void 0 ? void 0 : _e.identifier;
                         if (typeof specifiedPaymentMethodIdentifire === 'string' && specifiedPaymentMethodIdentifire.length > 0) {
@@ -48,6 +51,72 @@ function onAssetTransactionStatusChanged(params) {
                             }
                         }
                         break;
+                    case 'COAReserveTransaction':
+                        if (typeof orderNumber === 'string' && typeof confirmationNumber === 'string') {
+                            // 基本的に1注文に1予約番号なのでdeliverable = true
+                            const deliverable = true;
+                            if (deliverable) {
+                                yield processing2inTransit({
+                                    project: { id: params.project.id },
+                                    // confirmationNumber,
+                                    orderNumber,
+                                    useOnOrderStatusChanged: params.useOnOrderStatusChanged
+                                })(repos);
+                            }
+                        }
+                        break;
+                    case factory.assetTransactionType.Reserve:
+                        if (typeof orderNumber === 'string' && typeof confirmationNumber === 'string') {
+                            // ReserveTransactionのステータス検証
+                            const deliverable = yield isDeliverable({
+                                project: { id: params.project.id },
+                                orderNumber,
+                                assetTransactionType: params.object.typeOf
+                            })(repos);
+                            if (deliverable) {
+                                yield processing2inTransit({
+                                    project: { id: params.project.id },
+                                    // confirmationNumber,
+                                    orderNumber,
+                                    useOnOrderStatusChanged: params.useOnOrderStatusChanged
+                                })(repos);
+                            }
+                        }
+                        break;
+                    case factory.assetTransactionType.MoneyTransfer:
+                        if (typeof orderNumber === 'string' && typeof confirmationNumber === 'string') {
+                            const deliverable = yield isDeliverable({
+                                project: { id: params.project.id },
+                                orderNumber,
+                                assetTransactionType: params.object.typeOf
+                            })(repos);
+                            if (deliverable) {
+                                yield processing2inTransit({
+                                    project: { id: params.project.id },
+                                    // confirmationNumber,
+                                    orderNumber,
+                                    useOnOrderStatusChanged: params.useOnOrderStatusChanged
+                                })(repos);
+                            }
+                        }
+                        break;
+                    case factory.assetTransactionType.RegisterService:
+                        if (typeof orderNumber === 'string' && typeof confirmationNumber === 'string') {
+                            const deliverable = yield isDeliverable({
+                                project: { id: params.project.id },
+                                orderNumber,
+                                assetTransactionType: params.object.typeOf
+                            })(repos);
+                            if (deliverable) {
+                                yield processing2inTransit({
+                                    project: { id: params.project.id },
+                                    // confirmationNumber,
+                                    orderNumber,
+                                    useOnOrderStatusChanged: params.useOnOrderStatusChanged
+                                })(repos);
+                            }
+                        }
+                        break;
                     default:
                     // no op
                 }
@@ -150,14 +219,15 @@ function paymentDue2Processing(params) {
         }
         catch (error) {
             let throwsError = true;
-            // すでにステータスが煤でいた場合、OrderPaymentDue->OrderProcessingの処理自体は成功しているので、後処理を続行する
+            // すでにステータスが進行していた場合、OrderPaymentDue->OrderProcessingの処理自体は成功しているので、後処理を続行する
             order = yield repos.order.findByOrderNumber({
                 orderNumber: params.orderNumber,
                 project: { id: params.project.id },
                 inclusion: [],
                 exclusion: ['acceptedOffers']
             });
-            if (order.orderStatus === factory.orderStatus.OrderDelivered
+            if (order.orderStatus === factory.orderStatus.OrderInTransit
+                || order.orderStatus === factory.orderStatus.OrderDelivered
                 || order.orderStatus === factory.orderStatus.OrderReturned) {
                 throwsError = false;
             }
@@ -167,12 +237,27 @@ function paymentDue2Processing(params) {
         }
         if (params.useOnOrderStatusChanged) {
             // 全acceptedOffersを検索(2023-12-08~)
-            const acceptedOffers = yield repos.acceptedOffer.searchAcceptedOffersByOrderNumber({
+            // const acceptedOffers = await repos.acceptedOffer.searchAcceptedOffersByOrderNumber(
+            //     {
+            //         orderNumber: { $eq: order.orderNumber },
+            //         project: { id: { $eq: params.project.id } }
+            //     },
+            //     ['itemOffered', 'offeredThrough']
+            // );
+            const { numAcceptedOffers } = yield repos.acceptedOffer.countByOrderNumber({
                 orderNumber: { $eq: order.orderNumber },
                 project: { id: { $eq: params.project.id } }
             });
+            const itemOfferedTypeOfs = yield repos.acceptedOffer.distinctValues({ orderNumber: { $in: [params.orderNumber] } }, 'acceptedOffers.itemOffered.typeOf');
+            const serialNumbers = yield repos.acceptedOffer.distinctValues({ orderNumber: { $in: [params.orderNumber] } }, 'acceptedOffers.serialNumber');
+            const offeredThroughIdentifier = (yield repos.acceptedOffer.distinctValues({ orderNumber: { $in: [params.orderNumber] } }, 'acceptedOffers.offeredThrough.identifier')).shift();
+            debug('onAssetTransactionStatusChanged paymentDue2Processing: calling onOrderProcessing...', 'numAcceptedOffers:', numAcceptedOffers, 'itemOfferedTypeOfs:', itemOfferedTypeOfs, 'serialNumbers:', serialNumbers, 'offeredThroughIdentifier:', offeredThroughIdentifier);
             yield (0, onOrderStatusChanged_1.onOrderProcessing)({
-                order: Object.assign(Object.assign({}, order), { acceptedOffers, orderStatus: factory.orderStatus.OrderProcessing // 強制的にOrderProcessingとして処理する
+                order: Object.assign(Object.assign({}, order), { 
+                    // acceptedOffers,
+                    numAcceptedOffers, itemOfferedTypeOf: itemOfferedTypeOfs[0], // 1つしかない前提
+                    serialNumbers,
+                    offeredThroughIdentifier, orderStatus: factory.orderStatus.OrderProcessing // 強制的にOrderProcessingとして処理する
                  }),
                 placeOrderTransaction
             })({
@@ -230,3 +315,117 @@ function cancelOrderIfExist(params) {
         }
     });
 }
+function isDeliverable(params) {
+    return (repos) => __awaiter(this, void 0, void 0, function* () {
+        let allReserveTransactionConfirmed = false;
+        let allMoneyTransferTransactionConfirmed = false;
+        let allRegisterServiceTransactionConfirmed = false;
+        if (params.assetTransactionType === factory.assetTransactionType.Reserve) {
+            allMoneyTransferTransactionConfirmed = true;
+            allRegisterServiceTransactionConfirmed = true;
+            // 注文のreservationNumberを取得
+            const reservationNumbers = yield repos.acceptedOffer.distinctValues({ orderNumber: { $in: [params.orderNumber] } }, 'acceptedOffers.itemOffered.reservationNumber');
+            if (reservationNumbers.length > 0) {
+                const referencedReserveTransactions = yield repos.assetTransaction.search({
+                    project: { id: { $eq: params.project.id } },
+                    typeOf: factory.assetTransactionType.Reserve,
+                    transactionNumber: { $in: reservationNumbers }
+                }, ['status']);
+                allReserveTransactionConfirmed =
+                    referencedReserveTransactions.length === reservationNumbers.length
+                        && referencedReserveTransactions.every(({ status }) => status === factory.transactionStatusType.Confirmed);
+            }
+            else {
+                allReserveTransactionConfirmed = true;
+            }
+        }
+        else if (params.assetTransactionType === factory.assetTransactionType.MoneyTransfer) {
+            allReserveTransactionConfirmed = true;
+            allRegisterServiceTransactionConfirmed = true;
+            // 注文のMoneyTransferTransaction.transactionNumberを取得
+            const moneyTransferTransactionNumbers = yield repos.acceptedOffer.distinctValues({ orderNumber: { $in: [params.orderNumber] } }, 'acceptedOffers.serialNumber');
+            if (moneyTransferTransactionNumbers.length > 0) {
+                debug('is deliverable?...', params.orderNumber, 'moneyTransferTransactionNumbers:', moneyTransferTransactionNumbers);
+                const referencedMoneyTransferTransactions = yield repos.assetTransaction.search({
+                    project: { id: { $eq: params.project.id } },
+                    typeOf: factory.assetTransactionType.MoneyTransfer,
+                    transactionNumber: { $in: moneyTransferTransactionNumbers }
+                }, ['status']);
+                allMoneyTransferTransactionConfirmed =
+                    referencedMoneyTransferTransactions.length === moneyTransferTransactionNumbers.length
+                        && referencedMoneyTransferTransactions.every(({ status }) => status === factory.transactionStatusType.Confirmed);
+            }
+            else {
+                allMoneyTransferTransactionConfirmed = true;
+            }
+        }
+        else if (params.assetTransactionType === factory.assetTransactionType.RegisterService) {
+            allReserveTransactionConfirmed = true;
+            allMoneyTransferTransactionConfirmed = true;
+            const registerServiceTransactionNumbers = yield repos.acceptedOffer.distinctValues({ orderNumber: { $in: [params.orderNumber] } }, 'acceptedOffers.serialNumber');
+            if (registerServiceTransactionNumbers.length > 0) {
+                const referencedRegisterServiceTransactions = yield repos.assetTransaction.search({
+                    project: { id: { $eq: params.project.id } },
+                    typeOf: factory.assetTransactionType.RegisterService,
+                    transactionNumber: { $in: registerServiceTransactionNumbers }
+                }, ['status']);
+                allRegisterServiceTransactionConfirmed =
+                    referencedRegisterServiceTransactions.length === registerServiceTransactionNumbers.length
+                        && referencedRegisterServiceTransactions.every(({ status }) => status === factory.transactionStatusType.Confirmed);
+            }
+            else {
+                allRegisterServiceTransactionConfirmed = true;
+            }
+        }
+        return allReserveTransactionConfirmed && allMoneyTransferTransactionConfirmed && allRegisterServiceTransactionConfirmed;
+    });
+}
+function processing2inTransit(params) {
+    return (repos) => __awaiter(this, void 0, void 0, function* () {
+        // const placeOrderTransaction = await findPlaceOrderTransaction({
+        //     project: { id: params.project.id },
+        //     confirmationNumber: params.confirmationNumber,
+        //     orderNumber: params.orderNumber
+        // })({ transaction: repos.transaction });
+        let order = yield repos.order.findByOrderNumber({
+            orderNumber: params.orderNumber,
+            project: { id: params.project.id },
+            inclusion: [],
+            exclusion: ['acceptedOffers']
+        });
+        try {
+            order = yield repos.order.changeStatus({
+                project: { id: order.project.id },
+                orderNumber: params.orderNumber,
+                orderStatus: factory.orderStatus.OrderInTransit,
+                previousOrderStatus: factory.orderStatus.OrderProcessing
+            });
+        }
+        catch (error) {
+            let throwsError = true;
+            // すでにステータスが進行していた場合、OrderProcessing->OrderInTransitの処理自体は成功しているので、後処理を続行する
+            order = yield repos.order.findByOrderNumber({
+                orderNumber: params.orderNumber,
+                project: { id: params.project.id },
+                inclusion: [],
+                exclusion: ['acceptedOffers']
+            });
+            if (order.orderStatus === factory.orderStatus.OrderDelivered
+                || order.orderStatus === factory.orderStatus.OrderReturned) {
+                throwsError = false;
+            }
+            if (throwsError) {
+                throw error;
+            }
+        }
+        if (params.useOnOrderStatusChanged) {
+            yield (0, onOrderStatusChanged_1.onOrderInTransit)({
+                order: Object.assign(Object.assign({}, order), { orderStatus: factory.orderStatus.OrderInTransit })
+            })({
+                task: repos.task,
+                transaction: repos.transaction
+            });
+        }
+    });
+}
+exports.processing2inTransit = processing2inTransit;

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

@@ -7,5 +7,5 @@ import * as factory from '../../../../factory';
  */
 declare function createOnOrderCancelledTasksByTransaction(params: {
     transaction?: Pick<factory.transaction.placeOrder.ITransaction, 'id' | 'project' | 'typeOf'>;
-}): (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 { createOnOrderCancelledTasksByTransaction };

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

@@ -8,5 +8,5 @@ declare function createInformTasks(order: IDeliveredOrder): factory.task.IAttrib
  */
 declare function createOnOrderSentTasksByTransaction(params: {
     potentialActions?: factory.action.transfer.send.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, createOnOrderSentTasksByTransaction };

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

@@ -50,61 +50,59 @@ function creteOrder4inform(order) {
  */
 function createOnOrderSentTasksByTransaction(params) {
     const potentialActions = params.potentialActions;
-    const now = new Date();
+    // const now = new Date();
     const taskAttributes = [];
-    // tslint:disable-next-line:no-single-line-block-comment
-    /* istanbul ignore else */
     if (potentialActions !== undefined) {
-        if (Array.isArray(potentialActions.registerService)) {
-            taskAttributes.push(...potentialActions.registerService.map((a) => {
-                return {
-                    project: a.project,
-                    name: factory.taskName.ConfirmRegisterService,
-                    status: factory.taskStatus.Ready,
-                    runsAt: now,
-                    remainingNumberOfTries: 10,
-                    numberOfTried: 0,
-                    executionResults: [],
-                    data: a
-                };
-            }));
-        }
-        // 通貨転送
-        // tslint:disable-next-line:no-single-line-block-comment
-        /* istanbul ignore else */
-        if (Array.isArray(potentialActions.moneyTransfer)) {
-            taskAttributes.push(...potentialActions.moneyTransfer.map((a) => {
-                return {
-                    project: a.project,
-                    name: factory.taskName.ConfirmMoneyTransfer,
-                    status: factory.taskStatus.Ready,
-                    runsAt: now,
-                    remainingNumberOfTries: 10,
-                    numberOfTried: 0,
-                    executionResults: [],
-                    data: a
-                };
-            }));
-        }
-        // tslint:disable-next-line:no-single-line-block-comment
-        /* istanbul ignore else */
-        if (Array.isArray(potentialActions.sendEmailMessage)) {
-            potentialActions.sendEmailMessage.forEach((s) => {
-                const sendEmailMessageTask = {
-                    project: s.project,
-                    name: factory.taskName.SendEmailMessage,
-                    status: factory.taskStatus.Ready,
-                    runsAt: now,
-                    remainingNumberOfTries: 3,
-                    numberOfTried: 0,
-                    executionResults: [],
-                    data: {
-                        actionAttributes: s
-                    }
-                };
-                taskAttributes.push(sendEmailMessageTask);
-            });
-        }
+        // サービス登録廃止(2024-01-30~)
+        // if (Array.isArray(potentialActions.registerService)) {
+        //     taskAttributes.push(...potentialActions.registerService.map(
+        //         (a): factory.task.IAttributes<factory.taskName.ConfirmRegisterService> => {
+        //             return {
+        //                 project: a.project,
+        //                 name: factory.taskName.ConfirmRegisterService,
+        //                 status: factory.taskStatus.Ready,
+        //                 runsAt: now, // なるはやで実行
+        //                 remainingNumberOfTries: 10,
+        //                 numberOfTried: 0,
+        //                 executionResults: [],
+        //                 data: a
+        //             };
+        //         }));
+        // }
+        // 通貨転送廃止(2024-01-29~)
+        // if (Array.isArray(potentialActions.moneyTransfer)) {
+        //     taskAttributes.push(...potentialActions.moneyTransfer.map(
+        //         (a): factory.task.IAttributes<factory.taskName.ConfirmMoneyTransfer> => {
+        //             return {
+        //                 project: a.project,
+        //                 name: <factory.taskName.ConfirmMoneyTransfer>factory.taskName.ConfirmMoneyTransfer,
+        //                 status: factory.taskStatus.Ready,
+        //                 runsAt: now, // なるはやで実行
+        //                 remainingNumberOfTries: 10,
+        //                 numberOfTried: 0,
+        //                 executionResults: [],
+        //                 data: a
+        //             };
+        //         }));
+        // }
+        // createSendEmailMessageTaskIfNotExistへ移行(2024-01-12~)
+        // if (Array.isArray(potentialActions.sendEmailMessage)) {
+        //     potentialActions.sendEmailMessage.forEach((s) => {
+        //         const sendEmailMessageTask: factory.task.IAttributes<factory.taskName.SendEmailMessage> = {
+        //             project: s.project,
+        //             name: factory.taskName.SendEmailMessage,
+        //             status: factory.taskStatus.Ready,
+        //             runsAt: now, // なるはやで実行
+        //             remainingNumberOfTries: 3,
+        //             numberOfTried: 0,
+        //             executionResults: [],
+        //             data: {
+        //                 actionAttributes: s
+        //             }
+        //         };
+        //         taskAttributes.push(sendEmailMessageTask);
+        //     });
+        // }
     }
     return taskAttributes;
 }

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

@@ -1,5 +1,5 @@
-import type { MongoRepository as TaskRepo } from '../../../repo/task';
 import * as factory from '../../../factory';
+import type { MongoRepository as TaskRepo } from '../../../repo/task';
 type IPlaceOrderTransaction = Pick<factory.transaction.placeOrder.ITransaction, 'id' | 'project' | 'typeOf' | 'potentialActions'>;
 declare function onOrderDelivered(params: {
     order: Pick<factory.order.IOrder, 'id' | 'customer' | 'orderDate' | 'orderNumber' | 'project' | 'typeOf'> & {