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

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

@@ -1,45 +1,107 @@
 "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, { emitImmediately: true });
         }
+        // if (Array.isArray(sendEmailMessageActions)) {
+        //     await Promise.all(sendEmailMessageActions.map(async (sendEmailMessageAction, index) => {
+        //         const taskIdentifier: string = format(
+        //             '%s:%s:%s:%s:%s:%s',
+        //             params.order.project.id,
+        //             factory.taskName.SendEmailMessage,
+        //             params.order.typeOf,
+        //             params.order.orderNumber,
+        //             factory.orderStatus.OrderProcessing,
+        //             index
+        //         );
+        //         const simpleOrder: factory.order.ISimpleOrder = {
+        //             typeOf: params.order.typeOf,
+        //             orderNumber: params.order.orderNumber,
+        //             orderDate: params.order.orderDate
+        //         };
+        //         const actionAttributes: factory.task.sendEmailMessage.IData['actionAttributes'] = {
+        //             project: params.order.project,
+        //             typeOf: factory.actionType.SendAction,
+        //             object: sendEmailMessageAction.object,
+        //             agent: params.order.project,
+        //             recipient: { typeOf: params.order.customer.typeOf, id: params.order.customer.id },
+        //             purpose: simpleOrder
+        //         };
+        //         const sendEmailMessageTask: factory.task.IAttributes<factory.taskName.SendEmailMessage> & {
+        //             alternateName: string;
+        //             identifier: string;
+        //         } = {
+        //             alternateName: taskIdentifier,
+        //             identifier: taskIdentifier,
+        //             project: params.order.project,
+        //             name: factory.taskName.SendEmailMessage,
+        //             status: factory.taskStatus.Ready,
+        //             runsAt: now, // なるはやで実行
+        //             remainingNumberOfTries: 10,
+        //             numberOfTried: 0,
+        //             executionResults: [],
+        //             data: { actionAttributes }
+        //         };
+        //         await repos.task.createIfNotExistByAlternateName(sendEmailMessageTask, { emitImmediately: true });
+        //     }));
+        // }
     };
 }

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);
@@ -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.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");
@@ -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/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[];

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

@@ -17,12 +17,6 @@ function createPlacingOrderFromExistingTransaction(params) {
             object: {
                 orderNumber: { $eq: orderNumber },
             },
-            // result: {
-            //     order: {
-            //         confirmationNumber: { $eq: confirmationNumber },
-            //         orderNumbers: [orderNumber]
-            //     }
-            // },
             inclusion: ['project', 'typeOf', 'result', 'object', 'seller']
         });
         const placeOrderTransactionWithResult = placeOrderTransactions.shift();
@@ -39,43 +33,12 @@ function createPlacingOrderFromExistingTransaction(params) {
         const authorizeActionsAsResult = placeOrderTransactionWithResult.result?.authorizeActions;
         if (Array.isArray(authorizeActionsAsResult) && authorizeActionsAsResult.length > 0) {
             const completedAuthorizeActionIds = authorizeActionsAsResult.map(({ id }) => id);
+            /* istanbul ignore else -- @preserve */
             if (completedAuthorizeActionIds.length > 0) {
-                // authorizePaymentActions = <Pick<factory.action.authorize.paymentMethod.any.IAction, 'result'>[]>
-                //     await repos.action.search<factory.actionType.AuthorizeAction>(
-                //         {
-                //             typeOf: factory.actionType.AuthorizeAction,
-                //             purpose: {
-                //                 typeOf: { $in: [factory.transactionType.PlaceOrder] },
-                //                 id: { $in: [placeOrderTransactionWithResult.id] }
-                //             },
-                //             object: { typeOf: { $eq: factory.action.authorize.paymentMethod.any.ResultType.Payment } },
-                //             id: { $in: completedAuthorizeActionIds }
-                //         },
-                //         ['result']
-                //     );
                 authorizePaymentActions = await repos.authorizePaymentMethodAction.findAuthorizePaymentMethodResultsById({
                     purpose: { id: placeOrderTransactionWithResult.id },
                     ids: completedAuthorizeActionIds
                 });
-                // authorizeOfferActionsWithInstrument = <IAuthorizeActionWithInstrument[]>await repos.action.search<factory.actionType.AuthorizeAction>(
-                //     {
-                //         typeOf: factory.actionType.AuthorizeAction,
-                //         purpose: {
-                //             typeOf: { $in: [factory.transactionType.PlaceOrder] },
-                //             id: { $in: [placeOrderTransactionWithResult.id] }
-                //         },
-                //         object: {
-                //             typeOf: {
-                //                 $in: [
-                //                     factory.action.authorize.offer.eventService.ObjectType.SeatReservation,
-                //                     factory.offerType.Offer
-                //                 ]
-                //             }
-                //         },
-                //         id: { $in: completedAuthorizeActionIds }
-                //     },
-                //     ['instrument']
-                // );
                 authorizeOfferActionsWithInstrument = await repos.authorizeOfferAction.findAuthorizeOfferInstrumentsByIds({
                     purpose: { id: placeOrderTransactionWithResult.id },
                     ids: completedAuthorizeActionIds
@@ -87,26 +50,18 @@ function createPlacingOrderFromExistingTransaction(params) {
         const serialNumbers = authorizeOfferActionsWithInstrument
             .filter(({ instrument }) => typeof instrument.transactionNumber === 'string')
             .map(({ instrument }) => String(instrument.transactionNumber));
-        try {
-            // すでにtypeOf: Orderに変更済の場合acceptedOffersは空になるが、そもそもorderedItemはその後上書きされないので、空のまま処理して問題なし
-            acceptedOffers = (await repos.orderInTransaction.findAcceptedOffersWithPriceByIdentifier({
-                // orderNumber,
-                identifier: placeOrderTransactionWithResult.id,
-                project: { id: params.project.id }
-            }))
-                .filter(({ serialNumber }) => typeof serialNumber === 'string' && serialNumbers.includes(serialNumber));
-        }
-        catch (error) {
-            let throwsError = true;
-            // すでにtypeOf: Orderに変更済の場合、NotFoundとなる
-            if (error instanceof factory_1.factory.errors.NotFound) {
-                throwsError = false;
-            }
-            if (throwsError) {
-                throw error;
-            }
-        }
+        // すでにtypeOf: Orderに変更済の場合acceptedOffersは空になるが、そもそもorderedItemはその後上書きされないので、空のまま処理して問題なし
+        acceptedOffers = (await repos.orderInTransaction.findAcceptedOffersWithPriceByIdentifier({
+            identifier: placeOrderTransactionWithResult.id,
+            project: { id: params.project.id }
+        }, { onlyPlaceOrder: false } // typeOf:PlaceOrderフィルターを無効化したのでもうNotFoundになる心配はなし(2026-07-20~)
+        ))
+            .filter(({ serialNumber }) => typeof serialNumber === 'string' && serialNumbers.includes(serialNumber));
         const order = (0, factory_2.createPlacingOrder)({ transaction: placeOrderTransactionWithResult, authorizePaymentActions, acceptedOffers });
-        return { order, placeOrderTransaction: placeOrderTransactionWithResult, serialNumbers };
+        return {
+            orderNumber,
+            confirmationNumber,
+            order, placeOrderTransaction: placeOrderTransactionWithResult, serialNumbers
+        };
     };
 }

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

@@ -68,7 +68,6 @@ function createSeller(params) {
 }
 function createPlacingOrder(params) {
     const { transaction, authorizePaymentActions } = params;
-    let orderDateByTransaction;
     const { confirmationNumber, orderDate, orderNumber } = transaction.object;
     if (typeof confirmationNumber !== 'string') {
         // 事前に発行済なはずなので、ありえないフロー
@@ -79,25 +78,8 @@ function createPlacingOrder(params) {
         throw new factory_1.factory.errors.Internal('object.orderNumber undefined');
     }
     if (orderDate === undefined) {
-        // orderDateByTransaction = transaction.result?.order?.orderDate
-    }
-    else {
-        orderDateByTransaction = orderDate;
-    }
-    if (orderDateByTransaction === undefined) {
         throw new factory_1.factory.errors.NotFound('orderDate in the transaction');
     }
-    // const orderByTransaction = transaction.result?.order;
-    // if (orderByTransaction === undefined) {
-    //     throw new factory.errors.NotFound('transaction.result.order');
-    // }
-    // const seller = createSeller({ transaction });
-    // discontinue(2026-06-11~)
-    // const name: string | undefined =
-    //     (typeof transaction.object.name === 'string') ? transaction.object.name : undefined;
-    // discontinue(2026-06-22~)
-    // const broker: factory.order.IBroker | undefined =
-    //     (typeof transaction.object.broker?.typeOf === 'string') ? transaction.object.broker : undefined;
     const { paymentMethods, price } = createPaymentMethods({ authorizePaymentActions });
     const eventReservationAcceptedOffers = [];
     params.acceptedOffers.forEach((acceptedOffer) => {
@@ -115,15 +97,15 @@ function createPlacingOrder(params) {
     });
     return {
         // ...orderByTransaction, // transaction.result.orderへの依存廃止(2026-06-15~)
-        confirmationNumber,
-        orderNumber,
+        // confirmationNumber, // placeOrder時に上書きする必要なし(2026-07-20~)
+        // orderNumber, // placeOrder時に上書きする必要なし(2026-07-20~)
         typeOf: factory_1.factory.order.OrderType.Order, // 取引保管を廃止するためにここで指定(2026-06-14~)
         orderStatus: factory_1.factory.orderStatus.OrderPaymentDue, // 取引保管を廃止するためにここで指定(2026-06-14~)
         // seller, // 取引開始時の注文ドキュメント作成へ移行(2026-06-25~)
         paymentMethods, // 2024-06-17~
         price, // 2024-06-17~
         priceCurrency: factory_1.factory.priceCurrency.JPY, // 取引保管を廃止するためにここで指定(2026-06-14~)
-        orderDate: (0, moment_1.default)(orderDateByTransaction)
+        orderDate: (0, moment_1.default)(orderDate)
             .toDate(),
         orderedItem, // 2024-06-18~
         // ...(typeof name === 'string') ? { name } : undefined, // discontinue(2026-06-11~)

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

@@ -3,6 +3,7 @@ import type { AccountingReportRepo } from '../../repo/accountingReport';
 import type { ActionRepo } from '../../repo/action';
 import type { AuthorizeOfferActionRepo } from '../../repo/action/authorizeOffer';
 import type { AuthorizePaymentMethodActionRepo } from '../../repo/action/authorizePaymentMethod';
+import type { MessageRepo } from '../../repo/message';
 import type { OrderRepo } from '../../repo/order';
 import type { OrderInTransactionRepo } from '../../repo/orderInTransaction';
 import type { SettingRepo } from '../../repo/setting';
@@ -10,13 +11,13 @@ import type { TaskRepo } from '../../repo/task';
 import type { PlaceOrderRepo } from '../../repo/transaction/placeOrder';
 import { factory } from '../../factory';
 import type { IntegrationSettingRepo as Settings } from '../../repo/setting/integration';
-import { IPlacingOrder } from './placeOrder/createPlacingOrderFromExistingTransaction';
 interface IPlaceOrderRepos {
     acceptedOffer: AcceptedOfferRepo;
     accountingReport: AccountingReportRepo;
     action: ActionRepo;
     authorizeOfferAction: AuthorizeOfferActionRepo;
     authorizePaymentMethodAction: AuthorizePaymentMethodActionRepo;
+    message: MessageRepo;
     order: OrderRepo;
     orderInTransaction: OrderInTransactionRepo;
     setting: SettingRepo;
@@ -27,7 +28,7 @@ interface IPlaceOrderRepos {
  * 注文を作成する
  */
 declare function placeOrder(params: {
-    agent?: factory.action.trade.order.IAgent;
+    agent: factory.action.trade.order.IAgent;
     project: {
         id: string;
     };
@@ -36,7 +37,5 @@ declare function placeOrder(params: {
         orderNumber: string;
     };
     useOnOrderStatusChanged: boolean;
-}): (repos: IPlaceOrderRepos, settings: Settings) => Promise<{
-    order: IPlacingOrder;
-}>;
+}): (repos: IPlaceOrderRepos, settings: Settings) => Promise<void>;
 export { IPlaceOrderRepos, placeOrder };

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

@@ -11,11 +11,8 @@ const voidAcceptedOfferIfNecessary_1 = require("./placeOrder/voidAcceptedOfferIf
  */
 function placeOrder(params) {
     return async (repos, settings) => {
-        if (typeof params.useOnOrderStatusChanged !== 'boolean') {
-            throw new factory_1.factory.errors.Argument('useOnOrderStatusChanged', 'must be boolean');
-        }
         // 注文番号から取引と注文をfixする
-        const { order, placeOrderTransaction, serialNumbers } = await (0, createPlacingOrderFromExistingTransaction_1.createPlacingOrderFromExistingTransaction)({
+        const { orderNumber, confirmationNumber, order, placeOrderTransaction, serialNumbers } = await (0, createPlacingOrderFromExistingTransaction_1.createPlacingOrderFromExistingTransaction)({
             project: { id: params.project.id },
             confirmationNumber: params.object.confirmationNumber,
             orderNumber: params.object.orderNumber
@@ -31,14 +28,14 @@ function placeOrder(params) {
         }
         const simpleOrder = {
             typeOf: order.typeOf,
-            orderNumber: order.orderNumber,
+            orderNumber,
             orderDate: order.orderDate
         };
         const orderActionPurpose = {
             typeOf: placeOrderTransaction.typeOf, id: placeOrderTransaction.id
         };
         const orderActionAttributes = {
-            agent: (typeof params.agent?.typeOf === 'string') ? params.agent : placeOrderTransaction.project,
+            agent: params.agent,
             object: simpleOrder,
             project: placeOrderTransaction.project,
             purpose: orderActionPurpose,
@@ -61,7 +58,6 @@ function placeOrder(params) {
             try {
                 // 冗長なオファーを除外する(念のため)
                 await (0, voidAcceptedOfferIfNecessary_1.voidAcceptedOfferIfNecessary)({
-                    // object: { orderNumber: order.orderNumber },
                     placeOrderId: placeOrderTransaction.id,
                     serialNumbers
                 })(repos);
@@ -81,38 +77,31 @@ function placeOrder(params) {
         if (params.useOnOrderStatusChanged) {
             // 経理レポートを保管->CreateAccountingReportへ移行(2024-02-02~)
             // PaymentDueであればonOrderStatusChangedを実行(2023-08-23~)
-            if (order.orderStatus === factory_1.factory.orderStatus.OrderPaymentDue) {
-                await (0, onOrderStatusChanged_1.onOrderPaymentDue)({
-                    order: {
-                        paymentMethods: order.paymentMethods,
-                        project: placeOrderTransaction.project,
-                        orderNumber: order.orderNumber,
-                        confirmationNumber: order.confirmationNumber,
-                        orderDate: order.orderDate,
-                        // seller: order.seller,
-                        typeOf: order.typeOf,
-                        // price: order.price,
-                        // priceCurrency: order.priceCurrency,
-                        orderStatus: order.orderStatus
-                    }
-                })({
-                    task: repos.task
-                });
-            }
-            else {
-                throw new factory_1.factory.errors.NotImplemented(`placing an order on the status '${order.orderStatus}' not implemented`);
-            }
+            await (0, onOrderStatusChanged_1.onOrderPaymentDue)({
+                order: {
+                    paymentMethods: order.paymentMethods,
+                    project: placeOrderTransaction.project,
+                    orderNumber,
+                    confirmationNumber,
+                    orderDate: order.orderDate,
+                    typeOf: order.typeOf,
+                    orderStatus: order.orderStatus
+                }
+            })({
+                task: repos.task
+            });
             // paymentMethods.length: 0の場合を考慮(2023-08-24~)
+            /* istanbul ignore else -- @preserve */
             if (order.paymentMethods.length === 0) {
                 // paymentMethods.length: 0の場合に、confirmPayTransactionは実行されないので、ここで強制的にpaymentDue2Processingを実行する必要がある
                 await (0, onAssetTransactionStatusChanged_1.paymentDue2Processing)({
                     project: { id: placeOrderTransaction.project.id },
-                    confirmationNumber: order.confirmationNumber,
-                    orderNumber: order.orderNumber,
+                    confirmationNumber,
+                    orderNumber,
                     useOnOrderStatusChanged: params.useOnOrderStatusChanged === true
                 })(repos, settings);
             }
         }
-        return { order };
+        // return { order };
     };
 }

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

@@ -1,7 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.fixOrderAsNeeded = fixOrderAsNeeded;
-const factory_1 = require("../../../../factory");
 const publishConfirmationNumberIfNotExist_1 = require("../../../transaction/placeOrder/publishConfirmationNumberIfNotExist");
 function fixOrderAsNeeded(params) {
     return async (repos) => {
@@ -12,7 +11,7 @@ function fixOrderAsNeeded(params) {
         // if (params.paymentServiceType === factory.service.paymentService.PaymentServiceType.MovieTicket) {
         const confirmationNumber = await (0, publishConfirmationNumberIfNotExist_1.publishConfirmationNumberIfNotExist)({
             id: params.purpose.id,
-            status: { $in: [factory_1.factory.transactionStatusType.InProgress] },
+            // status: { $in: [factory.transactionStatusType.InProgress] },
             object: { orderDate }
         })(repos);
         // }

package/lib/chevre/service/payment/any/authorize/fixTransactionNumber.d.ts

@@ -3,7 +3,8 @@ import type { AcceptPayActionRepo } from '../../../../repo/action/acceptPay';
 import type { AuthorizePaymentMethodActionRepo } from '../../../../repo/action/authorizePaymentMethod';
 import type { AuthorizationRepo } from '../../../../repo/authorization';
 import type { TicketRepo } from '../../../../repo/ticket';
-import type { ITransactionInProgress, PlaceOrderRepo } from '../../../../repo/transaction/placeOrder';
+import type { OrderInTransactionRepo } from '../../../../repo/orderInTransaction';
+import type { ITransactionInProgress } from '../../../../repo/transaction/placeOrder';
 import type { TransactionNumberRepo } from '../../../../repo/transactionNumber';
 import * as PayTransactionService from '../../../assetTransaction/pay';
 import { IInvoiceByTicketToken } from '../factory';
@@ -13,7 +14,7 @@ interface IFixTransactionNumberRepos {
     authorizePaymentMethodAction: AuthorizePaymentMethodActionRepo;
     authorization: AuthorizationRepo;
     ticket: TicketRepo;
-    placeOrder: PlaceOrderRepo;
+    orderInTransaction: OrderInTransactionRepo;
     transactionNumber: TransactionNumberRepo;
 }
 type IFixTransactionNumberOperation<T> = (repos: IFixTransactionNumberRepos) => Promise<T>;

package/lib/chevre/service/payment/any/authorize/handlePrePublishedPaymentMethodIdOnAuthorizing.d.ts

@@ -3,7 +3,8 @@ import type { AcceptPayActionRepo } from '../../../../repo/action/acceptPay';
 import type { AuthorizePaymentMethodActionRepo } from '../../../../repo/action/authorizePaymentMethod';
 import type { AuthorizationRepo } from '../../../../repo/authorization';
 import type { TicketRepo } from '../../../../repo/ticket';
-import type { ITransactionInProgress, PlaceOrderRepo } from '../../../../repo/transaction/placeOrder';
+import type { OrderInTransactionRepo } from '../../../../repo/orderInTransaction';
+import type { ITransactionInProgress } from '../../../../repo/transaction/placeOrder';
 import * as PayTransactionService from '../../../assetTransaction/pay';
 import type { IInvoiceByTicketToken } from '../factory';
 type IObjectWithoutDetail = factory.action.authorize.paymentMethod.any.IObjectWithoutDetail;
@@ -17,7 +18,7 @@ interface IHandlePrePublishedPaymentMethodIdOnAuthorizingRepos {
     authorizePaymentMethodAction: AuthorizePaymentMethodActionRepo;
     authorization: AuthorizationRepo;
     ticket: TicketRepo;
-    placeOrder: PlaceOrderRepo;
+    orderInTransaction: OrderInTransactionRepo;
 }
 /**
  * 決済承認前の決済採用アクションを参照する
@@ -29,9 +30,9 @@ declare function handlePrePublishedPaymentMethodIdOnAuthorizing(params: {
 }): (repos: IHandlePrePublishedPaymentMethodIdOnAuthorizingRepos) => Promise<{
     authorizeParams?: {
         creditCard: factory.action.authorize.paymentMethod.any.ICreditCard;
-        paymentMethodByTransaction: factory.transaction.placeOrder.IPaymentMethodByPaymentUrl;
         pendingPaymentAgencyTransaction: PayTransactionService.IPaymentAgencyTransaction;
         acceptAction2ticketResult?: IAcceptAction2ticketResult;
+        paymentMethodByTransaction?: never;
     };
     existingCompletedAuthorizeAction?: never;
 } | {