@chevre/domain 25.2.0-alpha.9 → 26.0.0-alpha.1

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

@@ -1,15 +1,15 @@
 import type { AcceptedOfferRepo } from '../../../repo/acceptedOffer';
+import type { MessageRepo } from '../../../repo/message';
 import type { OrderRepo } from '../../../repo/order';
 import type { SettingRepo } from '../../../repo/setting';
 import type { TaskRepo } from '../../../repo/task';
-import type { PlaceOrderRepo } from '../../../repo/transaction/placeOrder';
 import type { IntegrationSettingRepo as Settings } from '../../../repo/setting/integration';
 interface IPaymentDue2ProcessingRepos {
     acceptedOffer: AcceptedOfferRepo;
+    message: MessageRepo;
     order: OrderRepo;
     setting: SettingRepo;
     task: TaskRepo;
-    placeOrder: PlaceOrderRepo;
 }
 /**
  * 全決済取引確定を完了した注文に関して、アイテムを処理する

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

@@ -5,7 +5,6 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.paymentDue2Processing = paymentDue2Processing;
 const debug_1 = __importDefault(require("debug"));
-const findConfirmedPlaceOrder_1 = require("../findConfirmedPlaceOrder");
 const onOrderStatusChanged_1 = require("../onOrderStatusChanged");
 const factory_1 = require("../../../factory");
 const debug = (0, debug_1.default)('chevre-domain:service:order');
@@ -14,11 +13,6 @@ const debug = (0, debug_1.default)('chevre-domain:service:order');
  */
 function paymentDue2Processing(params) {
     return async (repos, settings) => {
-        const placeOrderTransaction = await (0, findConfirmedPlaceOrder_1.findConfirmedPlaceOrder)({
-            project: { id: params.project.id },
-            confirmationNumber: params.confirmationNumber,
-            orderNumber: params.orderNumber
-        })(repos);
         let order;
         try {
             order = await repos.order.changeStatus({
@@ -74,7 +68,7 @@ function paymentDue2Processing(params) {
                     offeredThroughIdentifier,
                     orderStatus: factory_1.factory.orderStatus.OrderProcessing // 強制的にOrderProcessingとして処理する
                 },
-                placeOrderTransaction
+                // placeOrderTransaction
             })(repos, settings);
         }
     };

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

@@ -1,5 +1,6 @@
 import type { AcceptedOfferRepo } from '../../repo/acceptedOffer';
 import type { AssetTransactionRepo } from '../../repo/assetTransaction';
+import type { MessageRepo } from '../../repo/message';
 import type { OrderRepo } from '../../repo/order';
 import type { SettingRepo } from '../../repo/setting';
 import type { TaskRepo } from '../../repo/task';
@@ -11,6 +12,7 @@ import type { IntegrationSettingRepo as Settings } from '../../repo/setting/inte
 interface IOnAssetTransactionStatusChangedRepos {
     acceptedOffer: AcceptedOfferRepo;
     assetTransaction: AssetTransactionRepo;
+    message: MessageRepo;
     order: OrderRepo;
     setting: SettingRepo;
     task: TaskRepo;

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

@@ -12,7 +12,9 @@ Object.defineProperty(exports, "processing2inTransit", { enumerable: true, get:
 const factory_1 = require("../../factory");
 function onAssetTransactionStatusChanged(params) {
     return async (repos, settings) => {
+        /* istanbul ignore else -- @preserve */
         if (typeof params.useOnOrderStatusChanged !== 'boolean') {
+            /* istanbul ignore next -- @preserve */
             throw new factory_1.factory.errors.Argument('useOnOrderStatusChanged', 'must be boolean');
         }
         switch (params.object.status) {

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

@@ -7,5 +7,5 @@ import { factory } from '../../../../factory';
  */
 declare function createOnOrderCancelledTasksByTransaction(params: {
     transaction: Pick<factory.transaction.placeOrder.ITransaction, 'id' | 'project' | 'typeOf'>;
-}): (import("@chevre/factory/lib/chevre/task").ITaskAttributes | import("@chevre/factory/lib/chevre/task/confirmPayTransaction").IAttributes | import("@chevre/factory/lib/chevre/task/confirmReserveTransaction").IAttributes | import("@chevre/factory/lib/chevre/task/createAccountingReport").IAttributes | import("@chevre/factory/lib/chevre/task/deleteTransaction").IAttributes | import("@chevre/factory/lib/chevre/task/onAssetTransactionStatusChanged").IAttributes | import("@chevre/factory/lib/chevre/task/onAuthorizationCreated").IAttributes | import("@chevre/factory/lib/chevre/task/onEventChanged").IAttributes | import("@chevre/factory/lib/chevre/task/onResourceDeleted").IAttributes | import("@chevre/factory/lib/chevre/task/onResourceUpdated").IAttributes | import("@chevre/factory/lib/chevre/task/onOrderPaymentCompleted").IAttributes | import("@chevre/factory/lib/chevre/task/placeOrder").IAttributes | import("@chevre/factory/lib/chevre/task/returnOrder").IAttributes | import("@chevre/factory/lib/chevre/task/returnPayTransaction").IAttributes | import("@chevre/factory/lib/chevre/task/returnReserveTransaction").IAttributes | import("@chevre/factory/lib/chevre/task/sendEmailMessage").IAttributes | import("@chevre/factory/lib/chevre/task/sendOrder").IAttributes | import("@chevre/factory/lib/chevre/task/triggerWebhook").IAttributes | import("@chevre/factory/lib/chevre/task/useReservation").IAttributes | import("@chevre/factory/lib/chevre/task/voidPayTransaction").IAttributes | import("@chevre/factory/lib/chevre/task/voidReserveTransaction").IAttributes)[];
+}): (import("@chevre/factory/lib/chevre/task").ITaskAttributes | import("@chevre/factory/lib/chevre/task/confirmPayTransaction").IAttributes | import("@chevre/factory/lib/chevre/task/confirmReserveTransaction").IAttributes | import("@chevre/factory/lib/chevre/task/createAccountingReport").IAttributes | import("@chevre/factory/lib/chevre/task/onAssetTransactionStatusChanged").IAttributes | import("@chevre/factory/lib/chevre/task/onAuthorizationCreated").IAttributes | import("@chevre/factory/lib/chevre/task/onEventChanged").IAttributes | import("@chevre/factory/lib/chevre/task/onResourceDeleted").IAttributes | import("@chevre/factory/lib/chevre/task/onResourceUpdated").IAttributes | import("@chevre/factory/lib/chevre/task/onOrderPaymentCompleted").IAttributes | import("@chevre/factory/lib/chevre/task/placeOrder").IAttributes | import("@chevre/factory/lib/chevre/task/returnOrder").IAttributes | import("@chevre/factory/lib/chevre/task/returnPayTransaction").IAttributes | import("@chevre/factory/lib/chevre/task/returnReserveTransaction").IAttributes | import("@chevre/factory/lib/chevre/task/sendEmailMessage").IAttributes | import("@chevre/factory/lib/chevre/task/sendOrder").IAttributes | import("@chevre/factory/lib/chevre/task/triggerWebhook").IAttributes | import("@chevre/factory/lib/chevre/task/useReservation").IAttributes | import("@chevre/factory/lib/chevre/task/voidPayTransaction").IAttributes)[];
 export { createOnOrderCancelledTasksByTransaction };

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

@@ -26,6 +26,6 @@ function onOrderCancelled(params) {
             default:
                 throw new factory_1.factory.errors.NotImplemented(`${params.order.orderStatus} not implemented`);
         }
-        await repos.task.saveMany(tasks, { emitImmediately: true });
+        await repos.task.saveMany(tasks);
     };
 }

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

@@ -32,7 +32,7 @@ function onOrderDelivered(params) {
             default:
                 throw new factory_1.factory.errors.NotImplemented(`${params.order.orderStatus} not implemented`);
         }
-        await repos.task.saveMany(tasks, { emitImmediately: true });
+        await repos.task.saveMany(tasks);
         switch (params.order.orderStatus) {
             case factory_1.factory.orderStatus.OrderDelivered:
                 // discontinue(2024-06-20~)

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

@@ -18,5 +18,5 @@ declare function createInformTasks(params: {
 }, setting: Pick<ISetting, 'onOrderStatusChanged'> | null): factory.task.IAttributes<factory.taskName.TriggerWebhook>[];
 declare function createNextSendOrderTasks(params: {
     order: IInTransitOrder;
-}): (import("@chevre/factory/lib/chevre/task").ITaskAttributes | import("@chevre/factory/lib/chevre/task/confirmPayTransaction").IAttributes | import("@chevre/factory/lib/chevre/task/confirmReserveTransaction").IAttributes | import("@chevre/factory/lib/chevre/task/createAccountingReport").IAttributes | import("@chevre/factory/lib/chevre/task/deleteTransaction").IAttributes | import("@chevre/factory/lib/chevre/task/onAssetTransactionStatusChanged").IAttributes | import("@chevre/factory/lib/chevre/task/onAuthorizationCreated").IAttributes | import("@chevre/factory/lib/chevre/task/onEventChanged").IAttributes | import("@chevre/factory/lib/chevre/task/onResourceDeleted").IAttributes | import("@chevre/factory/lib/chevre/task/onResourceUpdated").IAttributes | import("@chevre/factory/lib/chevre/task/onOrderPaymentCompleted").IAttributes | import("@chevre/factory/lib/chevre/task/placeOrder").IAttributes | import("@chevre/factory/lib/chevre/task/returnOrder").IAttributes | import("@chevre/factory/lib/chevre/task/returnPayTransaction").IAttributes | import("@chevre/factory/lib/chevre/task/returnReserveTransaction").IAttributes | import("@chevre/factory/lib/chevre/task/sendEmailMessage").IAttributes | import("@chevre/factory/lib/chevre/task/sendOrder").IAttributes | import("@chevre/factory/lib/chevre/task/triggerWebhook").IAttributes | import("@chevre/factory/lib/chevre/task/useReservation").IAttributes | import("@chevre/factory/lib/chevre/task/voidPayTransaction").IAttributes | import("@chevre/factory/lib/chevre/task/voidReserveTransaction").IAttributes)[];
+}): (import("@chevre/factory/lib/chevre/task").ITaskAttributes | import("@chevre/factory/lib/chevre/task/confirmPayTransaction").IAttributes | import("@chevre/factory/lib/chevre/task/confirmReserveTransaction").IAttributes | import("@chevre/factory/lib/chevre/task/createAccountingReport").IAttributes | import("@chevre/factory/lib/chevre/task/onAssetTransactionStatusChanged").IAttributes | import("@chevre/factory/lib/chevre/task/onAuthorizationCreated").IAttributes | import("@chevre/factory/lib/chevre/task/onEventChanged").IAttributes | import("@chevre/factory/lib/chevre/task/onResourceDeleted").IAttributes | import("@chevre/factory/lib/chevre/task/onResourceUpdated").IAttributes | import("@chevre/factory/lib/chevre/task/onOrderPaymentCompleted").IAttributes | import("@chevre/factory/lib/chevre/task/placeOrder").IAttributes | import("@chevre/factory/lib/chevre/task/returnOrder").IAttributes | import("@chevre/factory/lib/chevre/task/returnPayTransaction").IAttributes | import("@chevre/factory/lib/chevre/task/returnReserveTransaction").IAttributes | import("@chevre/factory/lib/chevre/task/sendEmailMessage").IAttributes | import("@chevre/factory/lib/chevre/task/sendOrder").IAttributes | import("@chevre/factory/lib/chevre/task/triggerWebhook").IAttributes | import("@chevre/factory/lib/chevre/task/useReservation").IAttributes | import("@chevre/factory/lib/chevre/task/voidPayTransaction").IAttributes)[];
 export { createInformTasks, createNextSendOrderTasks, IInTransitOrder };

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

@@ -28,6 +28,6 @@ function onOrderDeliveredPartially(params) {
             default:
                 throw new factory_1.factory.errors.NotImplemented(`${params.order.orderStatus} not implemented`);
         }
-        await repos.task.saveMany(tasks, { emitImmediately: true });
+        await repos.task.saveMany(tasks);
     };
 }

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

@@ -74,8 +74,8 @@ function createSendOrderTaskIfNotExist(params) {
             data: sendOrderTaskData
         };
         debug('processing createSendOrderTaskIfNotExist...', sendOrderTask);
-        // await repos.task.createSendOrderTaskIfNotExist(sendOrderTask, { emitImmediately: true });
-        await repos.task.createIfNotExistByAlternateName(sendOrderTask, { emitImmediately: true });
+        // await repos.task.createSendOrderTaskIfNotExist(sendOrderTask);
+        await repos.task.createIfNotExistByAlternateName(sendOrderTask);
     };
 }
 function createOnAuthorizationCreatedTask(order) {
@@ -107,7 +107,7 @@ function createOnAuthorizationCreatedTask(order) {
                 },
                 project: { id: order.project.id, typeOf: factory_1.factory.organizationType.Project }
             };
-            await repos.task.createIfNotExistByAlternateName(task, { emitImmediately: true });
+            await repos.task.createIfNotExistByAlternateName(task);
         }
     };
 }

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

@@ -1,6 +1,3 @@
-/**
- * 注文決済時処理
- */
 import type { TaskRepo } from '../../../repo/task';
 import { factory } from '../../../factory';
 declare function onOrderPaymentDue(params: {

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

@@ -1,6 +1,10 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.onOrderPaymentDue = onOrderPaymentDue;
+/**
+ * 注文決済時処理
+ */
+const util_1 = require("util");
 const factory_1 = require("../../../factory");
 function onOrderPaymentDue(params) {
     return async (repos) => {
@@ -13,69 +17,94 @@ function onOrderPaymentDue(params) {
         switch (params.order.orderStatus) {
             // OrderPaymentDueを追加(2023-08-23~)
             case factory_1.factory.orderStatus.OrderPaymentDue:
+                await createConfirmPayTransactionTasks(params.order, simpleOrder)(repos);
                 tasks = [
-                    ...await createConfirmPayTransactionTasks(params.order, simpleOrder)(repos),
+                    // ...await createConfirmPayTransactionTasks(params.order, simpleOrder)(repos),
                     ...createCreateAccountingReportTask(params.order) // 経理レポート作成タスク(2024-02-02~)
                 ];
                 break;
             default:
                 throw new factory_1.factory.errors.NotImplemented(`${params.order.orderStatus} not implemented`);
         }
-        await repos.task.saveMany(tasks, { emitImmediately: true });
+        await repos.task.saveMany(tasks);
     };
 }
 function createConfirmPayTransactionTasks(order, simpleOrder) {
     return async (repos) => {
         const taskRunsAt = new Date();
-        const tasks = [];
+        // const tasks: factory.task.IAttributes<factory.taskName.ConfirmPayTransaction>[] = [];
         await Promise.all(order.paymentMethods.map(async (invoice) => {
             // PaymentAutomaticallyAppliedであれば、自動決済処理を実行(2023-08-24~)
             if (invoice.paymentStatus !== factory_1.factory.paymentStatusType.PaymentAutomaticallyApplied) {
                 return;
             }
-            // 冗長なタスク作成を回避
-            const existingTasks = await repos.task.projectFields({
-                limit: 1,
-                page: 1,
-                project: { id: { $eq: order.project.id } },
+            // 識別子指定でタスク作成(2026-07-30~)
+            const data = {
+                project: order.project,
+                typeOf: factory_1.factory.actionType.ConfirmAction,
+                object: [{ typeOf: factory_1.factory.assetTransactionType.Pay, transactionNumber: invoice.paymentMethodId }],
+                agent: order.project,
+                purpose: {
+                    ...simpleOrder,
+                    confirmationNumber: order.confirmationNumber
+                },
+                processOrder: order.orderStatus === factory_1.factory.orderStatus.OrderPaymentDue, // OrderPaymentDueの場合、processOrderを実行する
+                useOnOrderStatusChanged: true
+            };
+            const taskIdentifier = (0, util_1.format)('%s:%s:%s:%s:%s:%s', order.project.id, factory_1.factory.taskName.ConfirmPayTransaction, data.purpose.typeOf, data.purpose.orderNumber, factory_1.factory.assetTransactionType.Pay, invoice.paymentMethodId);
+            const confirmPayTransactionTask = {
+                alternateName: taskIdentifier,
+                identifier: taskIdentifier,
+                project: order.project,
                 name: factory_1.factory.taskName.ConfirmPayTransaction,
-                data: {
-                    object: { transactionNumber: { $eq: invoice.paymentMethodId } },
-                    purpose: { orderNumber: { $eq: order.orderNumber } }
-                }
-            }, ['id']);
-            if (existingTasks.length === 0) {
-                const data = {
-                    project: order.project,
-                    typeOf: factory_1.factory.actionType.ConfirmAction,
-                    object: [{ typeOf: factory_1.factory.assetTransactionType.Pay, transactionNumber: invoice.paymentMethodId }],
-                    agent: order.project,
-                    purpose: {
-                        ...simpleOrder,
-                        confirmationNumber: order.confirmationNumber
-                    },
-                    // 廃止(2024-03-12~)
-                    // instrument: {
-                    //     typeOf: factory.assetTransactionType.Pay, // 産取引化(2024-03-11~)
-                    //     identifier: factory.action.authorize.paymentMethod.any.ServiceIdentifier.Chevre,
-                    //     transactionNumber: invoice.paymentMethodId
-                    // },
-                    processOrder: order.orderStatus === factory_1.factory.orderStatus.OrderPaymentDue, // OrderPaymentDueの場合、processOrderを実行する
-                    useOnOrderStatusChanged: true
-                };
-                tasks.push({
-                    project: order.project,
-                    name: factory_1.factory.taskName.ConfirmPayTransaction,
-                    status: factory_1.factory.taskStatus.Ready,
-                    runsAt: taskRunsAt,
-                    remainingNumberOfTries: 10,
-                    numberOfTried: 0,
-                    executionResults: [],
-                    data
-                });
-            }
+                status: factory_1.factory.taskStatus.Ready,
+                runsAt: taskRunsAt,
+                remainingNumberOfTries: 10,
+                numberOfTried: 0,
+                executionResults: [],
+                data
+            };
+            await repos.task.createIfNotExistByAlternateName(confirmPayTransactionTask);
+            // 冗長なタスク作成を回避
+            // const existingTasks = await repos.task.projectFields(
+            //     {
+            //         limit: 1,
+            //         page: 1,
+            //         project: { id: { $eq: order.project.id } },
+            //         name: factory.taskName.ConfirmPayTransaction,
+            //         data: {
+            //             object: { transactionNumber: { $eq: invoice.paymentMethodId } },
+            //             purpose: { orderNumber: { $eq: order.orderNumber } }
+            //         }
+            //     },
+            //     ['id']
+            // ) as { id: string }[];
+            // if (existingTasks.length === 0) {
+            //     const data: factory.task.IData<factory.taskName.ConfirmPayTransaction> = {
+            //         project: order.project,
+            //         typeOf: factory.actionType.ConfirmAction,
+            //         object: [{ typeOf: factory.assetTransactionType.Pay, transactionNumber: invoice.paymentMethodId }],
+            //         agent: order.project,
+            //         purpose: {
+            //             ...simpleOrder,
+            //             confirmationNumber: order.confirmationNumber
+            //         },
+            //         processOrder: order.orderStatus === factory.orderStatus.OrderPaymentDue, // OrderPaymentDueの場合、processOrderを実行する
+            //         useOnOrderStatusChanged: true
+            //     };
+            //     tasks.push({
+            //         project: order.project,
+            //         name: factory.taskName.ConfirmPayTransaction,
+            //         status: factory.taskStatus.Ready,
+            //         runsAt: taskRunsAt,
+            //         remainingNumberOfTries: 10,
+            //         numberOfTried: 0,
+            //         executionResults: [],
+            //         data
+            //     });
+            // }
         }));
-        return tasks;
+        // return tasks;
     };
 }
 function createCreateAccountingReportTask(order) {

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

@@ -1,9 +1,13 @@
+import type { MessageRepo } from '../../../../repo/message';
 import type { TaskRepo } from '../../../../repo/task';
 import { factory } from '../../../../factory';
 declare function createSendEmailMessageTaskIfNotExist(params: {
-    sendEmailMessage?: Pick<factory.action.transfer.send.message.email.IAttributes, 'object'>[];
+    sendEmailMessage?: {
+        object: factory.action.transfer.send.message.email.IOptimizedObject;
+    }[];
     order: Pick<factory.order.IOrder, 'customer' | 'orderDate' | 'orderNumber' | 'price' | 'priceCurrency' | 'project' | 'typeOf'>;
 }): (repos: {
+    message: MessageRepo;
     task: TaskRepo;
 }) => Promise<void>;
 export { createSendEmailMessageTaskIfNotExist };

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

@@ -1,45 +1,65 @@
 "use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.createSendEmailMessageTaskIfNotExist = createSendEmailMessageTaskIfNotExist;
+const debug_1 = __importDefault(require("debug"));
 const util_1 = require("util");
 const factory_1 = require("../../../../factory");
+const debug = (0, debug_1.default)('chevre-domain:service:order');
 function createSendEmailMessageTaskIfNotExist(params) {
     return async (repos) => {
         const sendEmailMessageActions = params.sendEmailMessage;
         const now = new Date();
-        if (Array.isArray(sendEmailMessageActions)) {
-            await Promise.all(sendEmailMessageActions.map(async (sendEmailMessageAction, index) => {
-                const taskIdentifier = (0, util_1.format)('%s:%s:%s:%s:%s:%s', params.order.project.id, factory_1.factory.taskName.SendEmailMessage, params.order.typeOf, params.order.orderNumber, factory_1.factory.orderStatus.OrderProcessing, index);
-                const simpleOrder = {
-                    typeOf: params.order.typeOf,
-                    orderNumber: params.order.orderNumber,
-                    // price: params.order.price,
-                    // priceCurrency: params.order.priceCurrency,
-                    orderDate: params.order.orderDate
-                };
-                const actionAttributes = {
-                    project: params.order.project,
-                    typeOf: factory_1.factory.actionType.SendAction,
-                    object: sendEmailMessageAction.object,
-                    agent: params.order.project,
-                    recipient: { typeOf: params.order.customer.typeOf, id: params.order.customer.id },
-                    // potentialActions: {}, // discontinue(2024-06-25~)
-                    purpose: simpleOrder
-                };
-                const sendEmailMessageTask = {
-                    alternateName: taskIdentifier,
-                    identifier: taskIdentifier,
-                    project: params.order.project,
-                    name: factory_1.factory.taskName.SendEmailMessage,
-                    status: factory_1.factory.taskStatus.Ready,
-                    runsAt: now, // なるはやで実行
-                    remainingNumberOfTries: 10,
-                    numberOfTried: 0,
-                    executionResults: [],
-                    data: { actionAttributes }
-                };
-                await repos.task.createIfNotExistByAlternateName(sendEmailMessageTask, { emitImmediately: true });
-            }));
+        // 取引のpotentialActions参照を廃止して、messageリポジトリを参照して存在すればタスクを作成(2026-07-16~)
+        const message4order = (await repos.message.findMessages({
+            limit: 1,
+            page: 1,
+            about: { identifier: { $eq: factory_1.factory.creativeWork.message.email.AboutIdentifier.OnOrderSent } },
+            mainEntity: { orderNumber: { $eq: params.order.orderNumber } }
+        }, ['identifier'])).shift();
+        debug('createSendEmailMessageTaskIfNotExist: message4order:', JSON.stringify(message4order));
+        if (typeof message4order?.identifier === 'string') {
+            // 取引のpotentialActionsが存在する間は、メッセージ識別子が想定通りか確認する
+            const messageIdentifierByTransaction = sendEmailMessageActions?.at(0)?.object.identifier;
+            if (typeof messageIdentifierByTransaction === 'string') {
+                debug('createSendEmailMessageTaskIfNotExist: identifier matched?', message4order.identifier, messageIdentifierByTransaction);
+                if (message4order.identifier !== messageIdentifierByTransaction) {
+                    throw new factory_1.factory.errors.Internal(`message identifier not matched. ${message4order.identifier} ${messageIdentifierByTransaction}`);
+                }
+            }
+            const taskIdentifier = (0, util_1.format)('%s:%s:%s:%s:%s:%s', params.order.project.id, factory_1.factory.taskName.SendEmailMessage, params.order.typeOf, params.order.orderNumber, factory_1.factory.orderStatus.OrderProcessing, 0 // 複数メッセージに対応していた時期の名残(2026-07-16~)
+            );
+            const simpleOrder = {
+                typeOf: params.order.typeOf,
+                orderNumber: params.order.orderNumber,
+                orderDate: params.order.orderDate
+            };
+            const actionAttributes = {
+                project: params.order.project,
+                typeOf: factory_1.factory.actionType.SendAction,
+                object: {
+                    identifier: message4order.identifier,
+                    typeOf: factory_1.factory.creativeWorkType.EmailMessage
+                },
+                agent: params.order.project,
+                recipient: { typeOf: params.order.customer.typeOf, id: params.order.customer.id },
+                purpose: simpleOrder
+            };
+            const sendEmailMessageTask = {
+                alternateName: taskIdentifier,
+                identifier: taskIdentifier,
+                project: params.order.project,
+                name: factory_1.factory.taskName.SendEmailMessage,
+                status: factory_1.factory.taskStatus.Ready,
+                runsAt: now, // なるはやで実行
+                remainingNumberOfTries: 10,
+                numberOfTried: 0,
+                executionResults: [],
+                data: { actionAttributes }
+            };
+            await repos.task.createIfNotExistByAlternateName(sendEmailMessageTask);
         }
     };
 }

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

@@ -61,7 +61,7 @@ function createConfirmReserveTransactionTasksIfNotExist(order, simpleOrder, opti
                 executionResults: [],
                 data
             };
-            await repos.task.createIfNotExistByAlternateName(confirmReserveTransactionTask, { emitImmediately: true });
+            await repos.task.createIfNotExistByAlternateName(confirmReserveTransactionTask);
             if (options.force === true) {
                 const existingTask = await repos.task.findByIdentifier({
                     identifier: taskIdentifier,

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

@@ -1,18 +1,18 @@
+import type { MessageRepo } from '../../../repo/message';
 import type { SettingRepo } from '../../../repo/setting';
 import type { TaskRepo } from '../../../repo/task';
 import { factory } from '../../../factory';
 import type { IntegrationSettingRepo as Settings } from '../../../repo/setting/integration';
 import { IExternalOrder, IProcessingOrder } from './onOrderProcessing/factory';
 import { processOrder } from './onOrderProcessing/processOrder';
-type IPlaceOrderTransaction = Pick<factory.transaction.placeOrder.ITransaction, 'id' | 'typeOf' | 'potentialActions'>;
 declare function onOrderProcessing(params: {
     order: IProcessingOrder & {
         itemOfferedTypeOf: factory.order.IItemOffered['typeOf'];
         serialNumbers: string[];
         offeredThroughIdentifier?: factory.service.webAPI.Identifier;
     };
-    placeOrderTransaction?: IPlaceOrderTransaction;
 }): (repos: {
+    message: MessageRepo;
     setting: SettingRepo;
     task: TaskRepo;
 }, settings: Settings) => Promise<void>;

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

@@ -15,6 +15,7 @@ const factory_2 = require("./onOrderProcessing/factory");
 const processOrder_1 = require("./onOrderProcessing/processOrder");
 Object.defineProperty(exports, "processOrder", { enumerable: true, get: function () { return processOrder_1.processOrder; } });
 const debug = (0, debug_1.default)('chevre-domain:service:order');
+// type IPlaceOrderTransaction = Pick<factory.transaction.placeOrder.ITransaction, 'id' | 'typeOf'>;
 function onOrderProcessing(params) {
     return async (repos, settings) => {
         const setting = await repos.setting.findOne({ project: { id: { $eq: '*' } } }, ['onOrderStatusChanged']);
@@ -23,7 +24,8 @@ function onOrderProcessing(params) {
         debug('onOrderStatusChanged called.', params.order.orderNumber, params.order.orderStatus, params.order.orderDate);
         let tasks;
         let creatingCheckResourceTask;
-        const sendEmailMessageByOnOrderProcessing = params.placeOrderTransaction?.potentialActions?.order?.onOrderProcessing?.sendEmailMessage;
+        // const sendEmailMessageByOnOrderProcessing =
+        //     params.placeOrderTransaction?.potentialActions?.order?.onOrderProcessing?.sendEmailMessage;
         switch (params.order.orderStatus) {
             case factory_1.factory.orderStatus.OrderProcessing:
                 tasks = (0, factory_2.createInformProcessingOrderTasks)(params.order, setting);
@@ -32,10 +34,10 @@ function onOrderProcessing(params) {
             default:
                 throw new factory_1.factory.errors.NotImplemented(`${params.order.orderStatus} not implemented`);
         }
-        await repos.task.saveMany(tasks, { emitImmediately: true });
+        await repos.task.saveMany(tasks);
         // uniqueness of CheckResource task(2025-03-29~)
         if (creatingCheckResourceTask !== undefined) {
-            await repos.task.createIfNotExistByAlternateName(creatingCheckResourceTask, { emitImmediately: true });
+            await repos.task.createIfNotExistByAlternateName(creatingCheckResourceTask);
         }
         switch (params.order.orderStatus) {
             case factory_1.factory.orderStatus.OrderProcessing:
@@ -49,7 +51,7 @@ function onOrderProcessing(params) {
                 // OrderProcessingにおけるEメール送信に対応(2024-01-17~)
                 await (0, createSendEmailMessageTaskIfNotExist_1.createSendEmailMessageTaskIfNotExist)({
                     sendEmailMessage: [
-                        ...(Array.isArray(sendEmailMessageByOnOrderProcessing)) ? sendEmailMessageByOnOrderProcessing : []
+                    // ...(Array.isArray(sendEmailMessageByOnOrderProcessing)) ? sendEmailMessageByOnOrderProcessing : []
                     ],
                     order: params.order
                 })(repos);

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

@@ -11,5 +11,5 @@ declare function createInformTasks(order: IReturnedOrder, returnOrderAction: IRe
 declare function createOnOrderReturnedTasksByTransaction(params: {
     order: Pick<factory.order.IOrder, 'project' | 'typeOf' | 'orderNumber' | 'customer' | 'price' | 'priceCurrency' | 'orderDate'>;
     potentialActions?: factory.action.transfer.returnAction.order.IPotentialActions;
-}): (import("@chevre/factory/lib/chevre/task").ITaskAttributes | import("@chevre/factory/lib/chevre/task/confirmPayTransaction").IAttributes | import("@chevre/factory/lib/chevre/task/confirmReserveTransaction").IAttributes | import("@chevre/factory/lib/chevre/task/createAccountingReport").IAttributes | import("@chevre/factory/lib/chevre/task/deleteTransaction").IAttributes | import("@chevre/factory/lib/chevre/task/onAssetTransactionStatusChanged").IAttributes | import("@chevre/factory/lib/chevre/task/onAuthorizationCreated").IAttributes | import("@chevre/factory/lib/chevre/task/onEventChanged").IAttributes | import("@chevre/factory/lib/chevre/task/onResourceDeleted").IAttributes | import("@chevre/factory/lib/chevre/task/onResourceUpdated").IAttributes | import("@chevre/factory/lib/chevre/task/onOrderPaymentCompleted").IAttributes | import("@chevre/factory/lib/chevre/task/placeOrder").IAttributes | import("@chevre/factory/lib/chevre/task/returnOrder").IAttributes | import("@chevre/factory/lib/chevre/task/returnPayTransaction").IAttributes | import("@chevre/factory/lib/chevre/task/returnReserveTransaction").IAttributes | import("@chevre/factory/lib/chevre/task/sendEmailMessage").IAttributes | import("@chevre/factory/lib/chevre/task/sendOrder").IAttributes | import("@chevre/factory/lib/chevre/task/triggerWebhook").IAttributes | import("@chevre/factory/lib/chevre/task/useReservation").IAttributes | import("@chevre/factory/lib/chevre/task/voidPayTransaction").IAttributes | import("@chevre/factory/lib/chevre/task/voidReserveTransaction").IAttributes)[];
+}): (import("@chevre/factory/lib/chevre/task").ITaskAttributes | import("@chevre/factory/lib/chevre/task/confirmPayTransaction").IAttributes | import("@chevre/factory/lib/chevre/task/confirmReserveTransaction").IAttributes | import("@chevre/factory/lib/chevre/task/createAccountingReport").IAttributes | import("@chevre/factory/lib/chevre/task/onAssetTransactionStatusChanged").IAttributes | import("@chevre/factory/lib/chevre/task/onAuthorizationCreated").IAttributes | import("@chevre/factory/lib/chevre/task/onEventChanged").IAttributes | import("@chevre/factory/lib/chevre/task/onResourceDeleted").IAttributes | import("@chevre/factory/lib/chevre/task/onResourceUpdated").IAttributes | import("@chevre/factory/lib/chevre/task/onOrderPaymentCompleted").IAttributes | import("@chevre/factory/lib/chevre/task/placeOrder").IAttributes | import("@chevre/factory/lib/chevre/task/returnOrder").IAttributes | import("@chevre/factory/lib/chevre/task/returnPayTransaction").IAttributes | import("@chevre/factory/lib/chevre/task/returnReserveTransaction").IAttributes | import("@chevre/factory/lib/chevre/task/sendEmailMessage").IAttributes | import("@chevre/factory/lib/chevre/task/sendOrder").IAttributes | import("@chevre/factory/lib/chevre/task/triggerWebhook").IAttributes | import("@chevre/factory/lib/chevre/task/useReservation").IAttributes | import("@chevre/factory/lib/chevre/task/voidPayTransaction").IAttributes)[];
 export { createInformTasks, createOnOrderReturnedTasksByTransaction, IReturnAction };

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

@@ -8,7 +8,7 @@ exports.onOrderReturned = onOrderReturned;
  * 注文返品時処理
  */
 const debug_1 = __importDefault(require("debug"));
-const google_libphonenumber_1 = require("google-libphonenumber");
+const customerTelephone2COATelNum_1 = require("../../../factory/customerTelephone2COATelNum");
 const factory_1 = require("../../../factory");
 // import { createMaskedCustomer } from '../../../factory/order';
 const factory_2 = require("./onOrderReturned/factory");
@@ -77,7 +77,7 @@ function onOrderReturned(params) {
             default:
                 throw new factory_1.factory.errors.NotImplemented(`${params.order.orderStatus} not implemented`);
         }
-        await repos.task.saveMany(tasks, { emitImmediately: true });
+        await repos.task.saveMany(tasks);
     };
 }
 function createReturnReserveTransactionTasks(order, simpleOrder) {
@@ -104,11 +104,7 @@ function createReturnReserveTransactionTasks(order, simpleOrder) {
                 if (typeof superEventLocationBranchCode !== 'string') {
                     throw new factory_1.factory.errors.ArgumentNull('order.reservationForSuperEventLocationBranchCodes');
                 }
-                const phoneUtil = google_libphonenumber_1.PhoneNumberUtil.getInstance();
-                const phoneNumber = phoneUtil.parse(order.customer.telephone, 'JP');
-                let telNum = phoneUtil.format(phoneNumber, google_libphonenumber_1.PhoneNumberFormat.NATIONAL);
-                // COAでは数字のみ受け付けるので数字以外を除去
-                telNum = telNum.replace(/[^\d]/g, '');
+                const telNum = (0, customerTelephone2COATelNum_1.customerTelephone2COATelNum)({ telephone: String(order.customer.telephone) });
                 returnReserveTransactionAction = {
                     project: order.project,
                     typeOf: factory_1.factory.actionType.ReturnAction,

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

@@ -18,6 +18,6 @@ function onOrderUpdated(params) {
         }, 
         // settings,
         setting);
-        await repos.task.saveMany(tasks, { emitImmediately: true });
+        await repos.task.saveMany(tasks);
     };
 }

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

@@ -1,4 +1,5 @@
 import type { AcceptedOfferRepo } from '../../repo/acceptedOffer';
+import type { MessageRepo } from '../../repo/message';
 import type { OrderRepo } from '../../repo/order';
 import type { SettingRepo } from '../../repo/setting';
 import type { TaskRepo } from '../../repo/task';
@@ -10,6 +11,7 @@ import type { IntegrationSettingRepo as Settings } from '../../repo/setting/inte
  */
 declare function payOrder(params: factory.task.IData<factory.taskName.OnOrderPaymentCompleted>): (repos: {
     acceptedOffer: AcceptedOfferRepo;
+    message: MessageRepo;
     order: OrderRepo;
     setting: SettingRepo;
     task: TaskRepo;

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

@@ -5,7 +5,6 @@ import type { PlaceOrderRepo } from '../../../repo/transaction/placeOrder';
 import { factory } from '../../../factory';
 type IPlaceOrderTransaction = Pick<factory.transaction.placeOrder.ITransaction, 'id' | 'project' | 'typeOf' | 'result' | 'object' | 'seller'>;
 interface ICreatePlacingOrderFromExistingTransactionRepos {
-    action?: never;
     authorizeOfferAction: AuthorizeOfferActionRepo;
     authorizePaymentMethodAction: AuthorizePaymentMethodActionRepo;
     orderInTransaction: OrderInTransactionRepo;
@@ -18,6 +17,8 @@ declare function createPlacingOrderFromExistingTransaction(params: {
     confirmationNumber: string;
     orderNumber: string;
 }): (repos: ICreatePlacingOrderFromExistingTransactionRepos) => Promise<{
+    orderNumber: string;
+    confirmationNumber: string;
     order: IPlacingOrder;
     placeOrderTransaction: IPlaceOrderTransaction;
     serialNumbers: string[];