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

package/lib/chevre/service/offer/event/authorize/factory.js

@@ -80,16 +80,16 @@ function createReserveTransactionStartParams(params) {
             .toDate() // 余裕を持って
     };
 }
-function createAuthorizeSeatReservationActionAttributes(params, options) {
-    const { useLegacyAuthorizeOfferObject } = options;
-    const { event, transaction } = params;
-    const authorizeObjectEvent = {
-        id: event.id,
-        typeOf: factory_1.factory.eventType.ScreeningEvent // fix(2024-07-17~)
-    };
+function createAuthorizeSeatReservationActionAttributes(params) {
+    // const { useLegacyAuthorizeOfferObject } = options;
+    const { transaction } = params;
+    // const authorizeObjectEvent: factory.action.authorize.offer.eventService.IEventInObject = {
+    //     id: event.id,
+    //     typeOf: factory.eventType.ScreeningEvent // fix(2024-07-17~)
+    // };
     const object = {
         typeOf: factory_1.factory.action.authorize.offer.eventService.ObjectType.SeatReservation,
-        ...((useLegacyAuthorizeOfferObject) && { event: authorizeObjectEvent })
+        // ...((useLegacyAuthorizeOfferObject) && { event: authorizeObjectEvent })
     };
     const instrument = {
         typeOf: factory_1.factory.assetTransactionType.Reserve, // 変更(2024-03-08~)
@@ -144,82 +144,100 @@ function acceptedOffers2amount(params) {
     });
     return amount;
 }
-function acceptedOffers2programMembershipUsed(params) {
-    const programMembershipUsed = [];
-    const permitIdentifiers = [];
-    params.acceptedOffers.forEach(({ itemOffered }) => {
-        if (itemOffered.programMembershipUsed?.typeOf === factory_1.factory.programMembership.ProgramMembershipType.ProgramMembership) {
-            // メンバーシップコードに対してユニークに集計
-            if (!permitIdentifiers.includes(itemOffered.programMembershipUsed.identifier)) {
-                permitIdentifiers.push(itemOffered.programMembershipUsed.identifier);
-                const issuedThroughTypeOf = itemOffered.programMembershipUsed.issuedThrough.typeOf;
-                if (issuedThroughTypeOf === factory_1.factory.service.paymentService.PaymentServiceType.FaceToFace) {
-                    programMembershipUsed.push({
-                        typeOf: factory_1.factory.permit.PermitType.Permit,
-                        identifier: itemOffered.programMembershipUsed.identifier,
-                        issuedThrough: { typeOf: issuedThroughTypeOf }
-                    });
-                }
-                else {
-                    programMembershipUsed.push({
-                        typeOf: factory_1.factory.permit.PermitType.Permit,
-                        identifier: itemOffered.programMembershipUsed.identifier,
-                        issuedThrough: { typeOf: issuedThroughTypeOf, id: itemOffered.programMembershipUsed.issuedThrough.id }
-                    });
-                }
-            }
-        }
-    });
-    return programMembershipUsed;
-}
+// function acceptedOffers2programMembershipUsed(params: {
+//     acceptedOffers: IResultAcceptedOffer[];
+// }): factory.action.authorize.offer.eventService.IAggregateProgramMembershipUsed {
+//     const programMembershipUsed: factory.action.authorize.offer.eventService.IAggregateProgramMembershipUsed = [];
+//     const permitIdentifiers: string[] = [];
+//     params.acceptedOffers.forEach(
+//         ({ itemOffered }) => {
+//             if (itemOffered.programMembershipUsed?.typeOf === factory.programMembership.ProgramMembershipType.ProgramMembership) {
+//                 // メンバーシップコードに対してユニークに集計
+//                 if (!permitIdentifiers.includes(itemOffered.programMembershipUsed.identifier)) {
+//                     permitIdentifiers.push(itemOffered.programMembershipUsed.identifier);
+//                     const issuedThroughTypeOf = itemOffered.programMembershipUsed.issuedThrough.typeOf;
+//                     if (issuedThroughTypeOf === factory.service.paymentService.PaymentServiceType.FaceToFace) {
+//                         programMembershipUsed.push({
+//                             typeOf: factory.permit.PermitType.Permit,
+//                             identifier: itemOffered.programMembershipUsed.identifier,
+//                             issuedThrough: { typeOf: issuedThroughTypeOf }
+//                         });
+//                     } else {
+//                         programMembershipUsed.push({
+//                             typeOf: factory.permit.PermitType.Permit,
+//                             identifier: itemOffered.programMembershipUsed.identifier,
+//                             issuedThrough: { typeOf: issuedThroughTypeOf, id: itemOffered.programMembershipUsed.issuedThrough.id }
+//                         });
+//                     }
+//                 }
+//             }
+//         }
+//     );
+//     return programMembershipUsed;
+// }
 function acceptedOffers2authorizeResult(params) {
-    const { acceptedOffers4result, noOfferSpecified, ticketOffers } = params;
-    // const priceCurrency = factory.priceCurrency.JPY; // fix(2024-07-03~)
-    let offers;
+    const { acceptedOffers4result, noOfferSpecified,
+    // ticketOffers
+     } = params;
+    // let offers: factory.action.authorize.offer.eventService.IAcceptedOfferInResult[] | undefined;
     let price;
-    let programMembershipUsed = [];
+    // let programMembershipUsed: factory.action.authorize.offer.eventService.IAggregateProgramMembershipUsed = [];
     if (!noOfferSpecified) {
         price = acceptedOffers2amount({ acceptedOffers: acceptedOffers4result }); // オファー指定の場合のみ金額計算(2023-11-27~)
-        programMembershipUsed = acceptedOffers2programMembershipUsed({ acceptedOffers: acceptedOffers4result });
+        // programMembershipUsed = acceptedOffers2programMembershipUsed({ acceptedOffers: acceptedOffers4result });
         // オファーIDごとに集計
-        const offerIds = [...new Set(acceptedOffers4result.map((o) => String(o.id)))];
-        // const offerIds = [...new Set(acceptedOffers.map((o) => o.id))];
-        offers = offerIds.map((offerId) => {
-            const acceptedOffer = ticketOffers.find(({ id }) => id === offerId);
-            if (acceptedOffer === undefined) {
-                throw new factory_1.factory.errors.Internal(`acceptedOffer not found [id:${offerId}]`);
-            }
-            const amountOfThisGood = acceptedOffers4result.filter(({ id }) => id === offerId).length;
-            // const amountOfThisGood: number = acceptedOffers.filter(({ id }) => id === offerId).length;
-            const { acceptedPaymentMethod, priceSpecification } = acceptedOffer;
-            const unitPriceSpec = priceSpecification.priceComponent.find((spec) => spec.typeOf === factory_1.factory.priceSpecificationType.UnitPriceSpecification
-                && (!Array.isArray(spec.appliesToAddOn)) // アドオン単価ではない
-            );
-            if (unitPriceSpec === undefined) {
-                throw new factory_1.factory.errors.Internal(`unitPriceSpec not found [id:${offerId}]`);
-            }
-            const { eligibleQuantity } = unitPriceSpec;
-            return {
-                id: offerId,
-                includesObject: { amountOfThisGood },
-                typeOf: factory_1.factory.offerType.Offer,
-                priceSpecification: {
-                    ...(eligibleQuantity !== undefined) ? { eligibleQuantity } : undefined,
-                    // ...(eligibleTransactionVolume !== undefined) ? { eligibleTransactionVolume } : undefined // discontinue(2026-07-05~)
-                },
-                ...(acceptedPaymentMethod !== undefined) ? { acceptedPaymentMethod } : undefined
-            };
-        });
+        // const offerIds = [...new Set(acceptedOffers4result.map((o) => String(o.id)))];
+        // offers = offerIds.map<factory.action.authorize.offer.eventService.IAcceptedOfferInResult>((offerId) => {
+        //     const acceptedOffer = ticketOffers.find(({ id }) => id === offerId);
+        //     if (acceptedOffer === undefined) {
+        //         throw new factory.errors.Internal(`acceptedOffer not found [id:${offerId}]`);
+        //     }
+        //     const amountOfThisGood: number = acceptedOffers4result.filter(({ id }) => id === offerId).length;
+        //     // const amountOfThisGood: number = acceptedOffers.filter(({ id }) => id === offerId).length;
+        //     const { acceptedPaymentMethod, priceSpecification } = acceptedOffer;
+        //     const unitPriceSpec = priceSpecification.priceComponent.find(
+        //         (spec) => spec.typeOf === factory.priceSpecificationType.UnitPriceSpecification
+        //             && (!Array.isArray(spec.appliesToAddOn)) // アドオン単価ではない
+        //     ) as IUnitPriceSpecification | undefined;
+        //     if (unitPriceSpec === undefined) {
+        //         throw new factory.errors.Internal(`unitPriceSpec not found [id:${offerId}]`);
+        //     }
+        //     const { eligibleQuantity } = unitPriceSpec;
+        //     return {
+        //         id: offerId,
+        //         includesObject: { amountOfThisGood },
+        //         typeOf: factory.offerType.Offer,
+        //         priceSpecification: {
+        //             ...(eligibleQuantity !== undefined) ? { eligibleQuantity } : undefined,
+        //             // ...(eligibleTransactionVolume !== undefined) ? { eligibleTransactionVolume } : undefined // discontinue(2026-07-05~)
+        //         },
+        //         ...(acceptedPaymentMethod !== undefined) ? { acceptedPaymentMethod } : undefined
+        //     };
+        // });
     }
+    // discontinue useLegacyAuthorizeOfferResult(2026-07-18~)
+    // if (useLegacyAuthorizeOfferResult) {
+    //     return {
+    //         typeOf: factory.offerType.AggregateOffer,
+    //         // priceCurrency, // discontinue(2026-07-06~)
+    //         // amount: [], // discontinue(2026-07-06~)
+    //         itemOffered: {
+    //             serviceOutput: { programMembershipUsed } // add programMembershipUsed required(2024-08-15~)
+    //         },
+    //         ...(typeof price === 'number') ? { price } : undefined,
+    //         ...(Array.isArray(offers)) ? { offers } : undefined
+    //     };
+    // } else {
+    //     return {
+    //         typeOf: factory.offerType.AggregateOffer,
+    //         onlyPrice: true,
+    //         ...(typeof price === 'number') ? { price } : undefined,
+    //     };
+    // }
     return {
         typeOf: factory_1.factory.offerType.AggregateOffer,
-        // priceCurrency, // discontinue(2026-07-06~)
-        // amount: [], // discontinue(2026-07-06~)
-        itemOffered: {
-            serviceOutput: { programMembershipUsed } // add programMembershipUsed required(2024-08-15~)
-        },
+        onlyPrice: true,
         ...(typeof price === 'number') ? { price } : undefined,
-        ...(Array.isArray(offers)) ? { offers } : undefined
     };
 }
 function responseBody2acceptedOffers4result(params) {

package/lib/chevre/service/offer/event/authorize.d.ts

@@ -63,10 +63,6 @@ interface IAuthorizeOptions {
      * 最大n日前から予約可能
      */
     maxReservationGracePeriodInDays: number;
-    /**
-     * 2026-07-04~
-     */
-    useLegacyAuthorizeOfferObject: boolean;
 }
 /**
  * 興行オファー承認

package/lib/chevre/service/offer/event/authorize.js

@@ -32,9 +32,9 @@ function authorize(params, options) {
         // まず取引番号発行
         const { transactionNumber } = await repos.transactionNumber.publishByTimestamp({ startDate: now });
         const actionAttributes = (0, factory_2.createAuthorizeSeatReservationActionAttributes)({
-            event, transaction,
+            transaction,
             instrument: { transactionNumber }
-        }, options);
+        });
         const action = await repos.authorizeOfferAction.start(actionAttributes);
         try {
             const processStartReserveResult = await (0, processStartReserve4chevre_1.processStartReserve4chevre)({

package/lib/chevre/service/offer/event/voidTransaction.d.ts

@@ -36,7 +36,7 @@ interface IVoidTransactionRepos {
  * 興行オファー承認取消(タスクから実行 or apiから実行))
  * 取引中の承認アクション全てについて処理する or 特定の承認アクションについて処理する
  */
-declare function voidTransaction(params: factory.task.IData<factory.taskName.VoidReserveTransaction> & {
+declare function voidTransaction(params: factory.task.voidReserveTransaction.IData & {
     project: {
         id: string;
     };

package/lib/chevre/service/offer/event/voidTransactionByActionId.d.ts

@@ -36,7 +36,7 @@ interface IVoidTransactionByActionIdRepos {
  * 興行オファー承認取消(apiから実行)
  * 特定の承認アクションについて処理する
  */
-declare function voidTransactionByActionId(params: factory.task.IData<factory.taskName.VoidReserveTransaction> & {
+declare function voidTransactionByActionId(params: factory.task.voidReserveTransaction.IData & {
     project: {
         id: string;
     };

package/lib/chevre/service/offer/eventServiceByCOA/authorize/factory.d.ts

@@ -8,14 +8,13 @@ export declare function createAuthorizeSeatReservationActionAttributes(params: {
     acceptAction: {
         id: string;
     };
-    event: {
-        id: string;
-        typeOf: factory.eventType.ScreeningEvent;
-    };
     transaction: Pick<factory.transaction.ITransaction<factory.transactionType.PlaceOrder>, 'agent' | 'id' | 'project' | 'seller' | 'typeOf'>;
-    pendingTransaction: factory.action.authorize.offer.eventService.ICOAPendingTransaction;
-}, options: {
-    useLegacyAuthorizeOfferObject: boolean;
+    /**
+     * 仮予約済のCOA予約取引
+     */
+    pendingTransaction: {
+        transactionNumber: string;
+    };
 }): factory.action.authorize.offer.eventService.IAttributes;
 /**
  * 供給情報から承認アクションの価格を導き出す

package/lib/chevre/service/offer/eventServiceByCOA/authorize/factory.js

@@ -9,20 +9,20 @@ exports.responseBody2acceptedOffers4result = responseBody2acceptedOffers4result;
 const moment_1 = __importDefault(require("moment"));
 const util_1 = require("util");
 const factory_1 = require("../../../../factory");
-function createAuthorizeSeatReservationActionAttributes(params, options) {
-    const { useLegacyAuthorizeOfferObject } = options;
+function createAuthorizeSeatReservationActionAttributes(params) {
+    // const { useLegacyAuthorizeOfferObject } = options;
     const transaction = params.transaction;
-    const authorizeObjectEvent = {
-        id: params.event.id,
-        typeOf: params.event.typeOf
-    };
+    // const authorizeObjectEvent: factory.action.authorize.offer.eventService.IEventInObject = {
+    //     id: params.event.id,
+    //     typeOf: params.event.typeOf
+    // };
     const authorizeObject = {
         typeOf: factory_1.factory.action.authorize.offer.eventService.ObjectType.SeatReservation,
         id: params.acceptAction.id,
-        ...((useLegacyAuthorizeOfferObject) && {
-            event: authorizeObjectEvent,
-            pendingTransaction: params.pendingTransaction
-        })
+        // ...((useLegacyAuthorizeOfferObject) && {
+        //     event: authorizeObjectEvent,
+        //     pendingTransaction: params.pendingTransaction
+        // })
     };
     const instrument = {
         typeOf: factory_1.factory.assetTransactionType.COAReserveTransaction, // 変更(2024-03-08~)

package/lib/chevre/service/offer/eventServiceByCOA/authorize/validateAcceptedOffers.js

@@ -310,7 +310,8 @@ function validateAcceptedOffers(params) {
         // 指定された単価オファーを検索
         // ticketCodeで検索(2023-03-22~)
         if (offerIdentifiers.length > 0) {
-            availableUnitPriceOffers = await repos.offer.search({
+            // availableUnitPriceOffers = await repos.offer.search({
+            availableUnitPriceOffers = await repos.offer.findUnitPriceOffers({
                 identifier: { $in: offerIdentifiers },
                 project: { id: { $eq: params.project.id } }
             });

package/lib/chevre/service/offer/eventServiceByCOA/authorize.d.ts

@@ -53,11 +53,6 @@ export declare function authorize(params: {
         requestBody: IRequestBody;
         responseBody: IResponseBody;
     };
-}, options: {
-    /**
-     * 2026-07-04~
-     */
-    useLegacyAuthorizeOfferObject: boolean;
 }): IAuthorizeOperation<Pick<IAuthorizeOfferAction, 'id' | 'instrument'> & {
     result: IAuthorizeOfferAction['result'];
 }>;

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

@@ -12,7 +12,7 @@ const factory_2 = require("../../../factory");
 /**
  * COA興行オファー承認
  */
-function authorize(params, options) {
+function authorize(params) {
     return async (repos) => {
         const transaction = await repos.placeOrder.findPlaceOrderInProgressById({
             typeOf: factory_2.factory.transactionType.PlaceOrder,
@@ -28,15 +28,18 @@ function authorize(params, options) {
         }
         let screeningEvent;
         let acceptedOffers;
+        // const pendingTransaction: factory.action.authorize.offer.eventService.ICOAPendingTransaction = {
+        //     theaterCode: params.result.requestBody.theaterCode,
+        //     dateJouei: params.result.requestBody.dateJouei,
+        //     titleCode: params.result.requestBody.titleCode,
+        //     titleBranchNum: params.result.requestBody.titleBranchNum,
+        //     timeBegin: params.result.requestBody.timeBegin,
+        //     tmpReserveNum: params.result.responseBody.tmpReserveNum,
+        //     transactionNumber: params.result.responseBody.tmpReserveNum,
+        //     typeOf: factory.assetTransactionType.COAReserveTransaction
+        // };
         const pendingTransaction = {
-            theaterCode: params.result.requestBody.theaterCode,
-            dateJouei: params.result.requestBody.dateJouei,
-            titleCode: params.result.requestBody.titleCode,
-            titleBranchNum: params.result.requestBody.titleBranchNum,
-            timeBegin: params.result.requestBody.timeBegin,
-            tmpReserveNum: params.result.responseBody.tmpReserveNum,
             transactionNumber: params.result.responseBody.tmpReserveNum,
-            typeOf: factory_2.factory.assetTransactionType.COAReserveTransaction
         };
         try {
             screeningEvent = await repos.event.projectEventFieldsById({ id: params.object.event.id }, [
@@ -71,10 +74,10 @@ function authorize(params, options) {
             // アクション開始前に例外がthrowされてもCOA仮予約を取り消す機会をつくるためにFailedアクションを作成する(2023-09-12~)
             const failedActionAttributes = (0, factory_1.createAuthorizeSeatReservationActionAttributes)({
                 acceptAction: params.object.acceptAction,
-                event: { id: params.object.event.id, typeOf: factory_2.factory.eventType.ScreeningEvent },
+                // event: { id: params.object.event.id, typeOf: factory.eventType.ScreeningEvent },
                 transaction,
                 pendingTransaction
-            }, options);
+            });
             const failedAction = await repos.action.start(failedActionAttributes);
             await repos.action.giveUp({ typeOf: failedAction.typeOf, id: failedAction.id, error });
             throw error;
@@ -88,10 +91,10 @@ function authorize(params, options) {
         // 承認アクションを開始
         const actionAttributes = (0, factory_1.createAuthorizeSeatReservationActionAttributes)({
             acceptAction: params.object.acceptAction,
-            event: { id: screeningEvent.id, typeOf: screeningEvent.typeOf },
+            // event: { id: screeningEvent.id, typeOf: screeningEvent.typeOf },
             transaction,
             pendingTransaction
-        }, options);
+        });
         const action = await repos.action.start(actionAttributes);
         try {
             // 座席仮予約からオファー情報を生成する

package/lib/chevre/service/offer/eventServiceByCOA/authorizeByAcceptAction.d.ts

@@ -26,11 +26,6 @@ export declare function authorizeByAcceptAction(params: {
          */
         id: string;
     };
-}, options: {
-    /**
-     * 2026-07-04~
-     */
-    useLegacyAuthorizeOfferObject: boolean;
 }): IAuthorizeOperation<Pick<IAuthorizeOfferAction, 'id' | 'instrument'> & {
     result: IAuthorizeOfferAction['result'];
 }>;

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/findAcceptAction.d.ts

@@ -1,5 +1,6 @@
 import { factory } from '../../../factory';
 import type { AcceptCOAOfferActionRepo } from '../../../repo/action/acceptCOAOffer';
+import type { AsyncActionRepo } from '../../../repo/asyncAction';
 import type { TaskRepo } from '../../../repo/task';
 interface IFindAcceptActionResult {
     /**
@@ -34,8 +35,11 @@ declare function findAcceptAction(params: {
          */
         id: string;
     };
+}, options: {
+    useAsyncAction: boolean;
 }): (repos: {
     action: AcceptCOAOfferActionRepo;
+    asyncAction: AsyncActionRepo;
     task: TaskRepo;
 }) => Promise<IFindAcceptActionResult>;
 export { findAcceptAction };

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

@@ -2,16 +2,27 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.findAcceptAction = findAcceptAction;
 const factory_1 = require("../../../factory");
-function findAcceptAction(params) {
+function findAcceptAction(params, options) {
     return async (repos) => {
-        // タスク検索
-        const task = (await repos.task.projectFields({
-            limit: 1,
-            page: 1,
-            id: { $eq: params.sameAs.id },
-            project: { id: { $eq: params.project.id } },
-            name: factory_1.factory.taskName.AcceptCOAOffer
-        }, ['status', 'executionResults'])).shift();
+        // 非同期アクションに対応(2026-07-27~)
+        const { useAsyncAction } = options;
+        let task;
+        if (useAsyncAction) {
+            // まず非同期アクションを参照
+            task = await repos.asyncAction.findAsyncActionById({
+                id: { $eq: params.sameAs.id },
+                project: { id: { $eq: params.project.id } },
+                name: factory_1.factory.taskName.AcceptCOAOffer
+            }, ['status', 'executionResults']);
+        }
+        // 非同期アクションが存在しなければタスクを参照
+        if (task === undefined) {
+            task = await repos.task.findTaskById({
+                id: { $eq: params.sameAs.id },
+                project: { id: { $eq: params.project.id } },
+                name: factory_1.factory.taskName.AcceptCOAOffer
+            }, ['status', 'executionResults']);
+        }
         if (task === undefined) {
             throw new factory_1.factory.errors.NotFound(factory_1.factory.taskName.AcceptCOAOffer);
         }

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

@@ -228,7 +228,7 @@ function createInformTasks(params, setting) {
                 });
             });
             if (informTasks.length > 0) {
-                await repos.task.saveMany(informTasks, { emitImmediately: true });
+                await repos.task.saveMany(informTasks);
             }
         }
     };
@@ -281,7 +281,7 @@ function createInform2aggTasks(params, setting) {
                     };
                 });
                 if (informTasks.length > 0) {
-                    await repos.task.saveMany(informTasks, { emitImmediately: true });
+                    await repos.task.saveMany(informTasks);
                 }
             }
         }

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

@@ -122,7 +122,7 @@ function onConfirmed(params) {
                     executionResults: [],
                     data: onAssetTransactionStatusChangedTaskData
                 };
-                await repos.task.createOnAssetTransactionStatusChangedTaskIfNotExist(onAssetTransactionStatusChangedTask, { emitImmediately: true });
+                await repos.task.createOnAssetTransactionStatusChangedTaskIfNotExist(onAssetTransactionStatusChangedTask);
             }
         }
     };

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;