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

package/lib/chevre/service/offer/eventServiceByCOA/authorizeByAcceptAction.js

@@ -7,7 +7,7 @@ const factory_1 = require("../../../factory");
 /**
  * 採用アクションからCOA興行オファー承認
  */
-function authorizeByAcceptAction(params, options) {
+function authorizeByAcceptAction(params) {
     return async (repos) => {
         const acceptAction = await repos.accpetCOAOfferAction.findCompletedById({
             project: { id: params.project.id },
@@ -57,7 +57,7 @@ function authorizeByAcceptAction(params, options) {
                 store: { id: params.store.id },
                 result: { requestBody, responseBody }
             };
-            action = await (0, authorize_1.authorize)(authorizeParams, options)(repos);
+            action = await (0, authorize_1.authorize)(authorizeParams)(repos);
         }
         return action;
     };

package/lib/chevre/service/offer/eventServiceByCOA/changeOffers.js

@@ -133,7 +133,7 @@ function changeOffers(params) {
         const actionResult = {
             ...authorizeAction.result,
             price: price,
-            amount: []
+            // amount: [] // discontinue(2026-07-06~)
         };
         // ActiveActionStatus->CompletedActionStatusで再実装(2024-01-15~)
         await repos.action.reStart({ id: authorizeAction.id, typeOf: authorizeAction.typeOf });

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

@@ -1,5 +1,6 @@
 import type { AcceptedOfferRepo } from '../../repo/acceptedOffer';
 import type { AccountingReportRepo } from '../../repo/accountingReport';
+import type { IDeleteActionResult, ActionRepo } from '../../repo/action';
 import type { NoteRepo } from '../../repo/note';
 import type { OrderRepo } from '../../repo/order';
 import type { ReservationRepo } from '../../repo/reservation';
@@ -17,8 +18,11 @@ declare function deleteOrder(params: {
 }): (repos: {
     acceptedOffer: AcceptedOfferRepo;
     accountingReport: AccountingReportRepo;
+    action: ActionRepo;
     note: NoteRepo;
     order: OrderRepo;
     reservation: ReservationRepo;
-}) => Promise<void>;
+}) => Promise<{
+    deleteActionsResult: IDeleteActionResult[];
+}>;
 export { deleteOrder };

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

@@ -12,6 +12,7 @@ function deleteOrder(params) {
         if (typeof params.object.identifier !== 'string' || params.object.identifier === '') {
             throw new factory_1.factory.errors.ArgumentNull('object.identifier');
         }
+        let deleteActionsResult = [];
         const orders = await repos.order.projectFields({
             limit: 1,
             page: 1,
@@ -21,7 +22,7 @@ function deleteOrder(params) {
         const order = orders.shift();
         if (order === undefined) {
             // すでに削除済
-            return;
+            return { deleteActionsResult: [] };
         }
         if (typeof order.id !== 'string') {
             throw new factory_1.factory.errors.Internal(`order.id undefined. orderNumber: ${order.orderNumber}`);
@@ -43,8 +44,14 @@ function deleteOrder(params) {
                 typeOf: factory_1.factory.order.OrderType.Order
             }
         });
+        // アクション削除(2026-07-10~)
+        deleteActionsResult = await repos.action.deleteActionsByOrderNumber({
+            orderNumber: order.orderNumber,
+            project: { id: order.project.id },
+        });
         // 注文削除
         await repos.order.deleteByOrderNumber({ orderNumber: order.orderNumber });
+        return { deleteActionsResult };
     };
 }
 function deleteReservationsByOrder(order) {

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

@@ -1,17 +1,14 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.onPayTransactionCanceled = onPayTransactionCanceled;
-const findConfirmedPlaceOrder_1 = require("../findConfirmedPlaceOrder");
 const onOrderStatusChanged_1 = require("../onOrderStatusChanged");
 const factory_1 = require("../../../factory");
 function onPayTransactionCanceled(params) {
-    return async (repos
-    // settings: Settings
-    ) => {
+    return async (repos) => {
         if (typeof params.useOnOrderStatusChanged !== 'boolean') {
             throw new factory_1.factory.errors.Argument('useOnOrderStatusChanged', 'must be boolean');
         }
-        // 注文が存在すればキャンセル(2023-08-30~)
+        // 中止された決済取引に依存した注文ドキュメントがもし存在すればキャンセル(2023-08-30~)
         await cancelOrderIfExist({
             project: { id: params.project.id },
             paymentMethodId: params.object.transactionNumber,
@@ -32,14 +29,25 @@ function cancelOrderIfExist(params) {
                 paymentMethodIds: [params.paymentMethodId]
             },
             project: { id: { $eq: params.project.id } }
-        }, { inclusion: ['confirmationNumber', 'orderNumber'] });
+        }, { inclusion: ['orderNumber'] });
         const orderByPaymentMethodId = ordersByPaymentMethodId.shift();
         if (orderByPaymentMethodId !== undefined) {
-            const placeOrderTransaction = await (0, findConfirmedPlaceOrder_1.findConfirmedPlaceOrder)({
-                project: { id: params.project.id },
-                confirmationNumber: orderByPaymentMethodId.confirmationNumber,
-                orderNumber: orderByPaymentMethodId.orderNumber
-            })(repos);
+            const placeOrderTransactions = await repos.placeOrder.findPlaceOrderTransactions({
+                limit: 1,
+                page: 1,
+                project: { id: { $eq: params.project.id } },
+                typeOf: factory_1.factory.transactionType.PlaceOrder,
+                statuses: [factory_1.factory.transactionStatusType.Confirmed],
+                // resultではなくobjectで参照するように変更(2026-06-16~)
+                object: {
+                    orderNumber: { $eq: orderByPaymentMethodId.orderNumber },
+                },
+                inclusion: ['project', 'typeOf']
+            });
+            const placeOrderTransaction = placeOrderTransactions.shift();
+            if (placeOrderTransaction === undefined) {
+                throw new factory_1.factory.errors.NotFound(factory_1.factory.transactionType.PlaceOrder);
+            }
             const order = await repos.order.changeStatus({
                 project: { id: params.project.id },
                 orderNumber: orderByPaymentMethodId.orderNumber,

package/lib/chevre/service/order/onAssetTransactionStatusChanged/onPayTransactionConfirmed.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';
@@ -9,6 +10,7 @@ import type { IntegrationSettingRepo as Settings } from '../../../repo/setting/i
 interface IOnPayTransactionConfirmedRepos {
     acceptedOffer: AcceptedOfferRepo;
     assetTransaction: AssetTransactionRepo;
+    message: MessageRepo;
     order: OrderRepo;
     setting: SettingRepo;
     task: TaskRepo;

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/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,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
+        };
     };
 }