@chevre/domain 24.0.0-alpha.6 → 24.0.0-alpha.60

package/lib/chevre/service/notification/triggerWebhook.js

@@ -190,7 +190,7 @@ function processInformAction(params, options) {
                     try {
                         body = await res.text();
                     }
-                    catch (error) {
+                    catch (_error) {
                         // no op
                     }
                     switch (res.status) {

package/lib/chevre/service/offer/any.d.ts

@@ -4,7 +4,7 @@ interface IAcceptOfferOperationRepos {
     orderInTransaction: OrderInTransactionRepo;
 }
 type IAcceptOfferOperation<T> = (repos: IAcceptOfferOperationRepos) => Promise<T>;
-export type IAuthorizeActionWithInstrument = Pick<factory.action.authorize.offer.moneyTransfer.IAction | factory.action.authorize.offer.product.IAction | factory.action.authorize.offer.eventService.IAction, 'instrument'>;
+export type IAuthorizeActionWithInstrument = Pick<factory.action.authorize.offer.product.IAction | factory.action.authorize.offer.eventService.IAction, 'instrument'>;
 export declare function acceptOffer(params: {
     orderNumber: string;
     project: {

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

@@ -8,7 +8,7 @@ declare function createReserveTransactionStartParams(params: {
     event: {
         id: string;
     };
-    broker?: factory.reservation.IBroker<factory.reservationType>;
+    broker?: factory.reservation.IBroker;
     transaction: Pick<factory.transaction.ITransaction<factory.transactionType.PlaceOrder>, 'expires' | 'seller'>;
     transactionNumber: string;
 }): factory.assetTransaction.reserve.IStartParamsWithoutDetail;

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

@@ -121,8 +121,6 @@ function createAuthorizeSeatReservationActionAttributes(params) {
         event: authorizeObjectEvent
         // pendingTransaction: params.pendingTransaction, // discontinue(2024-06-22~)
         // ...(params.broker !== undefined) ? { broker: params.broker } : undefined // discontinue(2024-06-24~)
-        // useResultAcceptedOffers: false // discontinue(2024-06-24~)
-        // acceptedOffer: acceptedOffers // discontinue(2024-06-19~)
     };
     const instrument = {
         // typeOf: 'WebAPI',
@@ -359,6 +357,23 @@ function createReservation(params) {
                 ? { duration: event.superEvent.workPerformed.duration }
                 : undefined
         };
+        const superEvent = {
+            typeOf: event.superEvent.typeOf,
+            id: event.superEvent.id,
+            location: event.superEvent.location,
+            name: event.superEvent.name,
+            soundFormat: event.superEvent.soundFormat,
+            workPerformed,
+            ...(typeof event.superEvent.duration === 'string') ? { duration: event.superEvent.duration } : undefined,
+            ...(event.superEvent.headline !== undefined) ? { headline: event.superEvent.headline } : undefined
+            // videoFormatをデータとしても廃止(万が一に備えてUSE_DEPRECATED_VIDEO_FORMATで再設定可能)(2026-02-03~)
+            // ...(USE_DEPRECATED_VIDEO_FORMAT)
+            //     ? {
+            //         // 現時点で型廃止済だがデータとしては互換性維持(2026-01-15~)
+            //         videoFormat: (<any>event.superEvent).videoFormat
+            //     }
+            //     : undefined
+        };
         const reservationFor = {
             typeOf: event.typeOf,
             id: event.id,
@@ -370,24 +385,7 @@ function createReservation(params) {
                 .toDate(),
             startDate: (0, moment_1.default)(event.startDate)
                 .toDate(),
-            // 最適化(2022-05-31~)
-            superEvent: {
-                typeOf: event.superEvent.typeOf,
-                id: event.superEvent.id,
-                location: event.superEvent.location,
-                name: event.superEvent.name,
-                soundFormat: event.superEvent.soundFormat,
-                workPerformed,
-                ...(typeof event.superEvent.duration === 'string') ? { duration: event.superEvent.duration } : undefined,
-                ...(event.superEvent.headline !== undefined) ? { headline: event.superEvent.headline } : undefined
-                // videoFormatをデータとしても廃止(万が一に備えてUSE_DEPRECATED_VIDEO_FORMATで再設定可能)(2026-02-03~)
-                // ...(USE_DEPRECATED_VIDEO_FORMAT)
-                //     ? {
-                //         // 現時点で型廃止済だがデータとしては互換性維持(2026-01-15~)
-                //         videoFormat: (<any>event.superEvent).videoFormat
-                //     }
-                //     : undefined
-            }
+            superEvent
         };
         if (params.issuedThrough.typeOf !== factory.product.ProductType.EventService) {
             throw new factory.errors.Argument('issuedThrough', `issuedThrough.typeOf must be ${factory.product.ProductType.EventService}`);
@@ -407,44 +405,6 @@ function createReservation(params) {
                 : undefined
         };
     }
-    else if (itemOffered.typeOf === factory.reservationType.BusReservation
-        && event.typeOf === factory.tripType.BusTrip) {
-        // const tripByEvent = event.offers?.itemOffered.serviceOutput?.reservationFor;
-        // if (typeof tripByEvent?.typeOf !== 'string') {
-        //     throw new factory.errors.NotFound('event.offers.itemOffered.serviceOutput.reservationFor');
-        // }
-        const reservationFor = {
-            typeOf: event.typeOf,
-            id: event.id,
-            arrivalBusStop: event.arrivalBusStop,
-            departureBusStop: event.departureBusStop,
-            name: event.name,
-            departureTime: (0, moment_1.default)(event.departureTime)
-                .toDate(),
-            arrivalTime: (0, moment_1.default)(event.arrivalTime)
-                .toDate(),
-            busName: event.busName,
-            busNumber: event.busNumber,
-            identifier: event.identifier
-        };
-        if (params.issuedThrough.typeOf !== factory.product.ProductType.Transportation) {
-            throw new factory.errors.Argument('issuedThrough', `issuedThrough.typeOf must be ${factory.product.ProductType.Transportation}`);
-        }
-        reservationItem = {
-            typeOf: itemOffered.typeOf,
-            additionalProperty: itemOffered.additionalProperty,
-            additionalTicketText: itemOffered.additionalTicketText,
-            id: itemOffered.id,
-            issuedThrough: params.issuedThrough,
-            reservationNumber: params.reservationNumber,
-            reservationFor,
-            reservedTicket,
-            // 使用メンバーシップがあれば追加
-            ...(typeof itemOffered.programMembershipUsed?.typeOf === 'string')
-                ? { programMembershipUsed: itemOffered.programMembershipUsed }
-                : undefined
-        };
-    }
     else {
         throw new factory.errors.Argument('itemOffered');
     }

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

@@ -1,6 +1,5 @@
 import * as factory from '../../../../factory';
 import { Settings } from '../../../../settings';
-import type { ActionRepo } from '../../../../repo/action';
 import type { AdvanceBookingRequirementRepo } from '../../../../repo/advanceBookingRequirement';
 import type { AssetTransactionRepo } from '../../../../repo/assetTransaction';
 import type { AuthorizationRepo } from '../../../../repo/authorization';
@@ -33,7 +32,7 @@ declare function processStartReserve4chevre(params: {
             identifier?: string;
         };
     };
-    broker?: factory.reservation.IBroker<factory.reservationType>;
+    broker?: factory.reservation.IBroker;
     transactionNumber: string;
     transaction: Pick<factory.transaction.ITransaction<factory.transactionType.PlaceOrder>, 'agent' | 'expires' | 'id' | 'project' | 'seller' | 'typeOf'>;
     availableAtOrFrom: {
@@ -51,7 +50,6 @@ declare function processStartReserve4chevre(params: {
      */
     maxReservationGracePeriodInDays: number;
 }): (repos: {
-    action: ActionRepo;
     advanceBookingRequirement: AdvanceBookingRequirementRepo;
     authorization: AuthorizationRepo;
     stockHolder: StockHolderRepo;

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

@@ -1,6 +1,6 @@
 import * as factory from '../../../factory';
 import { Settings } from '../../../settings';
-import type { ActionRepo } from '../../../repo/action';
+import type { AuthorizeOfferActionRepo } from '../../../repo/action/authorizeOffer';
 import type { AdvanceBookingRequirementRepo } from '../../../repo/advanceBookingRequirement';
 import type { AssetTransactionRepo } from '../../../repo/assetTransaction';
 import type { AuthorizationRepo } from '../../../repo/authorization';
@@ -26,10 +26,11 @@ import type { SettingRepo } from '../../../repo/setting';
 import type { StockHolderRepo } from '../../../repo/stockHolder';
 import type { TaskRepo } from '../../../repo/task';
 import type { TicketRepo } from '../../../repo/ticket';
-import type { TransactionRepo } from '../../../repo/transaction';
+import type { PlaceOrderRepo } from '../../../repo/transaction/placeOrder';
 import type { TransactionNumberRepo } from '../../../repo/transactionNumber';
 interface IAuthorizeRepos {
-    action: ActionRepo;
+    action?: never;
+    authorizeOfferAction: AuthorizeOfferActionRepo;
     advanceBookingRequirement: AdvanceBookingRequirementRepo;
     assetTransaction: AssetTransactionRepo;
     authorization: AuthorizationRepo;
@@ -55,7 +56,7 @@ interface IAuthorizeRepos {
     setting: SettingRepo;
     task: TaskRepo;
     ticket: TicketRepo;
-    transaction: TransactionRepo;
+    placeOrder: PlaceOrderRepo;
     transactionNumber: TransactionNumberRepo;
 }
 type IAuthorizeOperation<T> = (repos: IAuthorizeRepos, settings: Settings) => Promise<T>;
@@ -98,4 +99,4 @@ declare function authorize(params: {
 }, options: IAuthorizeOptions): IAuthorizeOperation<Pick<IAuthorizeOfferAction, 'id'> & {
     result: IAuthorizeOfferAction['result'];
 }>;
-export { authorize };
+export { IAuthorizeRepos, authorize };

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

@@ -25,7 +25,7 @@ var __importStar = (this && this.__importStar) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.authorize = authorize;
 const factory = __importStar(require("../../../factory"));
-const publishOrderNumberIfNotExist_1 = require("../../transaction/placeOrder/publishOrderNumberIfNotExist");
+const issueOrderNumberIfNotExist_1 = require("../../transaction/placeOrder/issueOrderNumberIfNotExist");
 const any_1 = require("../any");
 const defaultOffer_1 = require("./authorize/defaultOffer");
 const factory_1 = require("./authorize/factory");
@@ -52,7 +52,7 @@ function authorize(params, options) {
         })(repos);
         let acceptedOffers4result;
         const now = new Date();
-        const orderNumber = await (0, publishOrderNumberIfNotExist_1.publishOrderNumberIfNotExist)({
+        const orderNumber = await (0, issueOrderNumberIfNotExist_1.issueOrderNumberIfNotExist)({
             project: { id: params.project.id },
             id: transaction.id,
             object: { orderDate: now }
@@ -63,7 +63,7 @@ function authorize(params, options) {
             event, transaction,
             instrument: { transactionNumber }
         });
-        const action = await repos.action.start(actionAttributes);
+        const action = await repos.authorizeOfferAction.start(actionAttributes);
         try {
             const processStartReserveResult = await (0, processStartReserve4chevre_1.processStartReserve4chevre)({
                 acceptedOffers, event,
@@ -92,7 +92,7 @@ function authorize(params, options) {
         }
         catch (error) {
             try {
-                await repos.action.giveUp({ typeOf: action.typeOf, id: action.id, error });
+                await repos.authorizeOfferAction.giveUp({ typeOf: action.typeOf, id: action.id, error });
             }
             catch (__) {
                 // no op
@@ -100,13 +100,13 @@ function authorize(params, options) {
             throw error;
         }
         const result = (0, factory_1.acceptedOffers2authorizeResult)({ acceptedOffers, acceptedOffers4result, noOfferSpecified, ticketOffers });
-        await repos.action.completeWithVoid({ typeOf: action.typeOf, id: action.id, result: result });
+        await repos.authorizeOfferAction.completeWithVoid({ typeOf: action.typeOf, id: action.id, result: result });
         return { id: action.id, result };
     };
 }
 function validateCreateRequest(params) {
     return async (repos) => {
-        const transaction = await repos.transaction.projectFieldsInProgressById({
+        const transaction = await repos.placeOrder.findPlaceOrderInProgressById({
             typeOf: factory.transactionType.PlaceOrder,
             id: params.transaction.id
         }, ['agent', 'expires', 'project', 'seller', 'typeOf', 'instrument']);
@@ -329,25 +329,25 @@ function acceptedOfferWithoutDetail2acceptedOffer(params) {
                 };
             }
             switch (typeOf) {
-                case factory.reservationType.BusReservation:
-                    const serviceOutputAsBusReservation = {
-                        typeOf,
-                        ...(Array.isArray(additionalProperty)) ? { additionalProperty } : undefined,
-                        ...(typeof additionalTicketText === 'string') ? { additionalTicketText } : undefined,
-                        ...(programMembershipUsed !== undefined) ? { programMembershipUsed } : undefined,
-                        ...(Array.isArray(subReservation)) ? { subReservation } : undefined,
-                        ...(reservedTicket !== undefined) ? {
-                            reservedTicket: {
-                                typeOf: 'Ticket',
-                                // チケット識別子指定拡張(2024-04-15~)
-                                ...(typeof reservedTicket.identifier === 'string') ? { identifier: reservedTicket.identifier } : undefined,
-                                ...(typeof ticketedSeat?.typeOf === 'string') ? { ticketedSeat } : undefined
-                            }
-                        } : undefined
-                    };
-                    itemOfferedServiceOutput = serviceOutputAsBusReservation;
-                    break;
-                case factory.reservationType.EventReservation:
+                // case factory.reservationType.BusReservation:
+                //     const serviceOutputAsBusReservation: factory.assetTransaction.reserve.IBusReservatonAsItemOfferedServiceOutput = {
+                //         typeOf,
+                //         ...(Array.isArray(additionalProperty)) ? { additionalProperty } : undefined,
+                //         ...(typeof additionalTicketText === 'string') ? { additionalTicketText } : undefined,
+                //         ...(programMembershipUsed !== undefined) ? { programMembershipUsed } : undefined,
+                //         ...(Array.isArray(subReservation)) ? { subReservation } : undefined,
+                //         ...(reservedTicket !== undefined) ? {
+                //             reservedTicket: {
+                //                 typeOf: 'Ticket',
+                //                 // チケット識別子指定拡張(2024-04-15~)
+                //                 ...(typeof reservedTicket.identifier === 'string') ? { identifier: reservedTicket.identifier } : undefined,
+                //                 ...(typeof ticketedSeat?.typeOf === 'string') ? { ticketedSeat } : undefined
+                //             }
+                //         } : undefined
+                //     };
+                //     itemOfferedServiceOutput = serviceOutputAsBusReservation;
+                //     break;
+                case factory.reservationType.EventReservation: {
                     const serviceOutputAsEventReservation = {
                         typeOf,
                         ...(Array.isArray(additionalProperty)) ? { additionalProperty } : undefined,
@@ -365,7 +365,9 @@ function acceptedOfferWithoutDetail2acceptedOffer(params) {
                     };
                     itemOfferedServiceOutput = serviceOutputAsEventReservation;
                     break;
+                }
                 default:
+                    throw new factory.errors.NotImplemented(`serviceOutput not implemented. typeOf:${typeOf}`);
                 // no op
             }
         }

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

@@ -1,5 +1,5 @@
 import * as factory from '../../../factory';
-import type { ActionRepo } from '../../../repo/action';
+import type { AuthorizeTicketedObjectActionRepo } from '../../../repo/action/authorizeTicketedObject';
 import type { AuthorizationRepo } from '../../../repo/authorization';
 import type { EventRepo } from '../../../repo/event';
 import type { EventOfferRepo } from '../../../repo/eventOffer';
@@ -8,7 +8,20 @@ import type { MemberRepo } from '../../../repo/member';
 import type { MemberProgramRepo } from '../../../repo/memberProgram';
 import type { ProductOfferRepo } from '../../../repo/productOffer';
 import type { TicketRepo } from '../../../repo/ticket';
-import type { TransactionRepo } from '../../../repo/transaction';
+import type { PlaceOrderRepo } from '../../../repo/transaction/placeOrder';
+interface IIssueEventOfferTicketRepos {
+    action?: never;
+    authorizeTicketedObjectAction: AuthorizeTicketedObjectActionRepo;
+    authorization: AuthorizationRepo;
+    event: EventRepo;
+    eventOffer: EventOfferRepo;
+    issuer: IssuerRepo;
+    member: MemberRepo;
+    memberProgram: MemberProgramRepo;
+    productOffer: ProductOfferRepo;
+    ticket: TicketRepo;
+    placeOrder: PlaceOrderRepo;
+}
 declare function issueEventOfferTicket(params: {
     now: Date;
     audience: Pick<factory.action.authorize.offer.eventService.IPurpose, 'id'>;
@@ -31,18 +44,7 @@ declare function issueEventOfferTicket(params: {
          */
         id: string;
     };
-}): (repos: {
-    action: ActionRepo;
-    authorization: AuthorizationRepo;
-    event: EventRepo;
-    eventOffer: EventOfferRepo;
-    issuer: IssuerRepo;
-    member: MemberRepo;
-    memberProgram: MemberProgramRepo;
-    productOffer: ProductOfferRepo;
-    ticket: TicketRepo;
-    transaction: TransactionRepo;
-}) => Promise<{
+}): (repos: IIssueEventOfferTicketRepos) => Promise<{
     ticketToken: string;
 }>;
-export { issueEventOfferTicket };
+export { IIssueEventOfferTicketRepos, issueEventOfferTicket };

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

@@ -44,7 +44,7 @@ function createOfferTicket(params) {
                 id: instrument.id
             }
         };
-        const action = await repos.action.start(actionAttributes);
+        const action = await repos.authorizeTicketedObjectAction.start(actionAttributes);
         let authorizations;
         try {
             authorizations = await repos.authorization.issueAuthorization([{
@@ -59,7 +59,7 @@ function createOfferTicket(params) {
         }
         catch (error) {
             try {
-                await repos.action.giveUp({ typeOf: action.typeOf, id: action.id, error });
+                await repos.authorizeTicketedObjectAction.giveUp({ typeOf: action.typeOf, id: action.id, error });
             }
             catch (__) {
                 // 失敗したら仕方ない
@@ -67,7 +67,7 @@ function createOfferTicket(params) {
             throw error;
         }
         const result = authorizations.map(({ code, typeOf }) => ({ code, typeOf }));
-        await repos.action.completeWithVoid({ typeOf: action.typeOf, id: action.id, result: result });
+        await repos.authorizeTicketedObjectAction.completeWithVoid({ typeOf: action.typeOf, id: action.id, result: result });
         const ticketToken = authorizations.shift()?.code;
         if (typeof ticketToken !== 'string') {
             // 基本的にありえないフロー
@@ -86,7 +86,7 @@ function issueEventOfferTicket(params) {
     return async (repos) => {
         const { now, audience, eventId, eventOfferId, ticketedOffer, author, project, instrument } = params;
         // 取引は存在するか
-        const transaction = await repos.transaction.projectFieldsInProgressById({ typeOf: factory.transactionType.PlaceOrder, id: audience.id }, ['expires', 'typeOf', 'seller']);
+        const transaction = await repos.placeOrder.findPlaceOrderInProgressById({ typeOf: factory.transactionType.PlaceOrder, id: audience.id }, ['expires', 'typeOf', 'seller']);
         // イベントは存在するか
         const event = await repos.event.projectEventFieldsById({ id: eventId }, ['project', 'offers', 'identifier']);
         // 取引番号発行

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

@@ -243,7 +243,7 @@ function searchEventTicketOffers(params) {
         switch (eventOffers.offeredThrough.identifier) {
             case factory.service.webAPI.Identifier.COA:
                 throw new factory.errors.NotImplemented(`booking service '${eventOffers.offeredThrough.identifier}' not implemented`);
-            default:
+            default: {
                 const searchOffersResult = await searchEventTicketOffersByEvent({
                     event,
                     store: params.store,
@@ -258,6 +258,7 @@ function searchEventTicketOffers(params) {
                 })(repos);
                 offers = searchOffersResult.ticketOffers;
                 unitPriceOffers = searchOffersResult.unitPriceOffers;
+            }
         }
         return { ticketOffers: offers, unitPriceOffers };
     };

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

@@ -230,7 +230,7 @@ function searchOffersByIds(params) {
         switch (eventOffers.offeredThrough.identifier) {
             case factory.service.webAPI.Identifier.COA:
                 throw new factory.errors.NotImplemented(`booking service '${eventOffers.offeredThrough.identifier}' not implemented`);
-            default:
+            default: {
                 const searchOffersResult = await searchEventTicketOffersByEvent({
                     ids: params.ids,
                     event,
@@ -246,6 +246,7 @@ function searchOffersByIds(params) {
                 })(repos);
                 offers = searchOffersResult.ticketOffers;
                 unitPriceOffers = searchOffersResult.unitPriceOffers;
+            }
         }
         return { ticketOffers: offers, unitPriceOffers };
     };

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

@@ -8,7 +8,6 @@ import type { ReservationRepo } from '../../../../repo/reservation';
 import type { SettingRepo } from '../../../../repo/setting';
 import type { StockHolderRepo } from '../../../../repo/stockHolder';
 import type { TaskRepo } from '../../../../repo/task';
-import type { TransactionRepo } from '../../../../repo/transaction';
 interface IVoidTransactionRepos {
     action: ActionRepo;
     assetTransaction: AssetTransactionRepo;
@@ -18,7 +17,6 @@ interface IVoidTransactionRepos {
     reservation: ReservationRepo;
     setting: SettingRepo;
     task: TaskRepo;
-    transaction: TransactionRepo;
 }
 declare function processVoidTransaction4chevre(params: {
     action: factory.action.authorize.offer.eventService.IAction;

package/lib/chevre/service/offer/event/voidTransaction/processVoidTransaction4chevre.js

@@ -25,6 +25,7 @@ var __importStar = (this && this.__importStar) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.processVoidTransaction4chevre = processVoidTransaction4chevre;
 const factory = __importStar(require("../../../../factory"));
+// import type { TransactionRepo } from '../../../../repo/transaction';
 const reserve_1 = require("../../../assetTransaction/reserve");
 function processVoidTransaction4chevre(params) {
     return async (repos, settings) => {

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

@@ -1,6 +1,7 @@
 import type * as COA from '@motionpicture/coa-service';
 import * as factory from '../../../../factory';
 import { ActionRepo } from '../../../../repo/action';
+import { AcceptCOAOfferActionRepo } from '../../../../repo/action/acceptCOAOffer';
 import { TaskRepo } from '../../../../repo/task';
 declare function processVoidTransaction4coa(params: {
     action: factory.action.authorize.offer.eventService.IAction;
@@ -23,6 +24,7 @@ declare function processVoidTransactionByAcceptAction4coa(params: {
     asyncCancelPendingReservation: boolean;
 }): (repos: {
     action: ActionRepo;
+    acceptCOAOfferAction: AcceptCOAOfferActionRepo;
     reserveService: COA.service.Reserve;
     task: TaskRepo;
 }) => Promise<void>;

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

@@ -2,6 +2,8 @@ import type * as COA from '@motionpicture/coa-service';
 import * as factory from '../../../factory';
 import { Settings } from '../../../settings';
 import type { ActionRepo } from '../../../repo/action';
+import type { AcceptCOAOfferActionRepo } from '../../../repo/action/acceptCOAOffer';
+import type { AuthorizeOfferActionRepo } from '../../../repo/action/authorizeOffer';
 import type { AssetTransactionRepo } from '../../../repo/assetTransaction';
 import type { OrderInTransactionRepo } from '../../../repo/orderInTransaction';
 import type { OfferRateLimitRepo } from '../../../repo/rateLimit/offer';
@@ -9,9 +11,14 @@ import type { ReservationRepo } from '../../../repo/reservation';
 import type { SettingRepo } from '../../../repo/setting';
 import type { StockHolderRepo } from '../../../repo/stockHolder';
 import type { TaskRepo } from '../../../repo/task';
-import type { TransactionRepo } from '../../../repo/transaction';
+import type { PlaceOrderRepo } from '../../../repo/transaction/placeOrder';
 interface IVoidTransactionRepos {
+    /**
+     * CancelAction開始で使用される
+     */
     action: ActionRepo;
+    acceptCOAOfferAction: AcceptCOAOfferActionRepo;
+    authorizeOfferAction: AuthorizeOfferActionRepo;
     assetTransaction: AssetTransactionRepo;
     stockHolder: StockHolderRepo;
     offerRateLimit: OfferRateLimitRepo;
@@ -19,7 +26,7 @@ interface IVoidTransactionRepos {
     reservation: ReservationRepo;
     setting: SettingRepo;
     task: TaskRepo;
-    transaction: TransactionRepo;
+    placeOrder: PlaceOrderRepo;
     /**
      * COAオファー承認取消の場合必須
      */
@@ -40,4 +47,4 @@ declare function voidTransaction(params: factory.task.IData<factory.taskName.Voi
         id: string;
     };
 }): (repos: IVoidTransactionRepos, settings: Settings) => Promise<void>;
-export { voidTransaction };
+export { IVoidTransactionRepos, voidTransaction };

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

@@ -45,21 +45,21 @@ function voidTransaction(params) {
             agent: { id: params.project.id, typeOf: factory.organizationType.Project },
             ...(typeof params.sameAs?.id === 'string') ? { sameAs: { id: params.sameAs.id, typeOf: 'Task' } } : undefined
         };
-        const transaction = await repos.transaction.projectFieldsById({ typeOf: params.purpose.typeOf, id: params.purpose.id }, ['typeOf', 'status', 'object']);
+        const transaction = await repos.placeOrder.findPlaceOrderById({ typeOf: params.purpose.typeOf, id: params.purpose.id }, ['typeOf', 'status', 'object']);
         // 興行オファー承認アクション検索
-        let authorizeActions = await repos.action.searchByPurpose({
-            typeOf: factory.actionType.AuthorizeAction,
+        let authorizeActions = await repos.authorizeOfferAction.findAuthorizeOfferActionsByPurpose({
+            // typeOf: factory.actionType.AuthorizeAction,
             purpose: {
                 typeOf: params.purpose.typeOf,
                 id: params.purpose.id
             },
-            object: { typeOf: { $eq: factory.action.authorize.offer.eventService.ObjectType.SeatReservation } }
+            // object: { typeOf: { $eq: factory.action.authorize.offer.eventService.ObjectType.SeatReservation } }
         });
         switch (transaction.status) {
             case factory.transactionStatusType.InProgress:
                 throw new factory.errors.NotImplemented(`${transaction.status} not implemented`);
             // 確定取引に対応(2023-05-07~)
-            case factory.transactionStatusType.Confirmed:
+            case factory.transactionStatusType.Confirmed: {
                 // OrderCancelledを考慮(2023-08-30~)
                 const orderCancelled = params.purpose.result?.order?.orderStatus === factory.orderStatus.OrderCancelled;
                 if (!orderCancelled) {
@@ -67,6 +67,7 @@ function voidTransaction(params) {
                     authorizeActions = authorizeActions.filter((a) => a.actionStatus !== factory.actionStatusType.CompletedActionStatus);
                 }
                 break;
+            }
             default:
             // no op
         }
@@ -89,10 +90,10 @@ function voidTransaction(params) {
             }
         }
         await Promise.all(authorizeActions.map(async (action) => {
-            await repos.action.cancelWithVoid({ typeOf: action.typeOf, id: action.id, cancelAction });
+            await repos.authorizeOfferAction.cancelWithVoid({ typeOf: action.typeOf, id: action.id, cancelAction });
             switch (action.instrument.typeOf) {
                 // case WebAPIIdentifier.COA:
-                case factory.assetTransactionType.COAReserveTransaction:
+                case factory.assetTransactionType.COAReserveTransaction: {
                     const { reserveService } = repos;
                     if (reserveService === undefined) {
                         throw new factory.errors.Internal('repos.reserveService required');
@@ -103,6 +104,7 @@ function voidTransaction(params) {
                         task: repos.task
                     });
                     break;
+                }
                 default:
                     await (0, processVoidTransaction4chevre_1.processVoidTransaction4chevre)({
                         // action: <factory.action.authorize.offer.eventService.IAction<WebAPIIdentifier.Chevre>>action
@@ -124,33 +126,33 @@ function cancelAcceptActions(params) {
             agent: { id: params.project.id, typeOf: factory.organizationType.Project },
             ...(typeof params.sameAs?.id === 'string') ? { sameAs: { id: params.sameAs.id, typeOf: 'Task' } } : undefined
         };
-        const transaction = await repos.transaction.projectFieldsById({
+        const transaction = await repos.placeOrder.findPlaceOrderById({
             typeOf: params.purpose.typeOf,
             id: params.purpose.id
         }, ['typeOf', 'status']);
         // 興行オファー承認アクション検索
-        const completedAuthorizeActions = await repos.action.searchByPurpose({
-            typeOf: factory.actionType.AuthorizeAction,
+        const completedAuthorizeActions = await repos.authorizeOfferAction.findAuthorizeOfferActionsByPurpose({
+            // typeOf: factory.actionType.AuthorizeAction,
             purpose: {
                 typeOf: params.purpose.typeOf,
                 id: params.purpose.id
             },
-            object: { typeOf: { $eq: factory.action.authorize.offer.eventService.ObjectType.SeatReservation } },
+            // object: { typeOf: { $eq: factory.action.authorize.offer.eventService.ObjectType.SeatReservation } },
             actionStatus: { $eq: factory.actionStatusType.CompletedActionStatus }
         });
         // 興行オファー採用アクション検索
-        let acceptActions = await repos.action.searchByPurpose({
-            typeOf: factory.actionType.AcceptAction,
+        let acceptActions = await repos.acceptCOAOfferAction.findAcceptCOAOfferActionsByPurpose({
+            // typeOf: factory.actionType.AcceptAction,
             purpose: {
                 typeOf: params.purpose.typeOf,
                 id: params.purpose.id
             },
-            object: { typeOf: { $eq: factory.offerType.AggregateOffer } }
+            // object: { typeOf: { $eq: factory.offerType.AggregateOffer } }
         });
         switch (transaction.status) {
             case factory.transactionStatusType.InProgress:
                 throw new factory.errors.NotImplemented(`${transaction.status} not implemented`);
-            case factory.transactionStatusType.Confirmed:
+            case factory.transactionStatusType.Confirmed: {
                 // OrderCancelledを考慮
                 const orderCancelled = params.purpose.result?.order?.orderStatus === factory.orderStatus.OrderCancelled;
                 if (!orderCancelled) {
@@ -168,17 +170,19 @@ function cancelAcceptActions(params) {
                     });
                 }
                 break;
+            }
             default:
             // no op
         }
         const { reserveService } = repos;
         await Promise.all(acceptActions.map(async (action) => {
-            await repos.action.cancelWithVoid({ typeOf: action.typeOf, id: action.id, cancelAction });
+            await repos.acceptCOAOfferAction.cancelWithVoid({ typeOf: action.typeOf, id: action.id, cancelAction });
             if (reserveService === undefined) {
                 throw new factory.errors.Internal('repos.reserveService required');
             }
             await (0, processVoidTransaction4coa_1.processVoidTransactionByAcceptAction4coa)({ action }, { asyncCancelPendingReservation: true })({
                 action: repos.action,
+                acceptCOAOfferAction: repos.acceptCOAOfferAction,
                 reserveService,
                 task: repos.task
             });