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

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/importFromCOA.js

@@ -68,7 +68,9 @@ function importFromCOA(params) {
         }
         catch (error) {
             let throwsError = true;
-            if (error.name === 'AbortError') {
+            if (error.name === 'AbortError'
+                || error.name === 'TimeoutError' // native AbortSignalの場合
+            ) {
                 throwsError = false;
             }
             if (error.name === 'COAServiceError') {
@@ -135,7 +137,9 @@ function importCategoryCodesFromCOA(params) {
         }
         catch (error) {
             let throwsError = true;
-            if (error.name === 'AbortError') {
+            if (error.name === 'AbortError'
+                || error.name === 'TimeoutError' // native AbortSignalの場合
+            ) {
                 throwsError = false;
             }
             if (error.name === 'COAServiceError') {

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
             });

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

@@ -2,6 +2,7 @@ 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 { 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 +10,13 @@ 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 IVoidTransactionByActionIdRepos {
+    /**
+     * CancelAction開始で使用される
+     */
     action: ActionRepo;
+    authorizeOfferAction: AuthorizeOfferActionRepo;
     assetTransaction: AssetTransactionRepo;
     stockHolder: StockHolderRepo;
     offerRateLimit: OfferRateLimitRepo;
@@ -19,7 +24,7 @@ interface IVoidTransactionByActionIdRepos {
     reservation: ReservationRepo;
     setting: SettingRepo;
     task: TaskRepo;
-    transaction: TransactionRepo;
+    placeOrder: PlaceOrderRepo;
     /**
      * COAオファー承認取消の場合必須
      */
@@ -40,4 +45,4 @@ declare function voidTransactionByActionId(params: factory.task.IData<factory.ta
         id: string;
     };
 }): (repos: IVoidTransactionByActionIdRepos, settings: Settings) => Promise<void>;
-export { voidTransactionByActionId };
+export { IVoidTransactionByActionIdRepos, voidTransactionByActionId };

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

@@ -42,21 +42,21 @@ function voidTransactionByActionId(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.projectFieldsInProgressById({
+        const transaction = await repos.placeOrder.findPlaceOrderInProgressById({
             typeOf: factory.transactionType.PlaceOrder,
             id: params.purpose.id
         }, ['typeOf']);
         // if (transaction.agent.id !== params.agent.id) {
         //     throw new factory.errors.Forbidden('Transaction not yours');
         // }
-        const orderNumber = await repos.transaction.findInProgressOrderNumberById({ id: params.purpose.id });
-        const action = await repos.action.findById({ typeOf: factory.actionType.AuthorizeAction, id: params.id });
+        const orderNumber = await repos.placeOrder.findInProgressOrderNumberById({ id: params.purpose.id });
+        const action = await repos.authorizeOfferAction.findById({ typeOf: factory.actionType.AuthorizeAction, id: params.id });
         if (action.purpose.typeOf !== transaction.typeOf || action.purpose.id !== transaction.id) {
             throw new factory.errors.Argument('Transaction', 'Action not found in the transaction');
         }
         // MongoDBでcompleteステータスであるにも関わらず、Chevreでは削除されている、というのが最悪の状況
         // それだけは回避するためにMongoDBを先に変更
-        await repos.action.cancelWithVoid({ typeOf: factory.actionType.AuthorizeAction, id: params.id, cancelAction });
+        await repos.authorizeOfferAction.cancelWithVoid({ typeOf: factory.actionType.AuthorizeAction, id: params.id, cancelAction });
         // add orderInTransaction(2024-01-15~)
         // USE_CREATE_ORDER_ON_OFFER_ACCEPTEDの場合、orderNumber発行済のはず
         // const orderNumberByTransaction = transaction.object.orderNumber;
@@ -69,7 +69,7 @@ function voidTransactionByActionId(params) {
             })(repos);
         }
         switch (action.instrument.typeOf) {
-            case factory.assetTransactionType.COAReserveTransaction:
+            case factory.assetTransactionType.COAReserveTransaction: {
                 const { reserveService } = repos;
                 if (reserveService === undefined) {
                     throw new factory.errors.Internal('repos.reserveService required');
@@ -80,6 +80,7 @@ function voidTransactionByActionId(params) {
                     task: repos.task
                 });
                 break;
+            }
             default:
                 await (0, processVoidTransaction4chevre_1.processVoidTransaction4chevre)({
                     action

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

@@ -1,16 +1,27 @@
 import type * as COA from '@motionpicture/coa-service';
-import type { ActionRepo } from '../../../repo/action';
+import type { AcceptCOAOfferActionRepo } from '../../../repo/action/acceptCOAOffer';
+import type { AuthorizeOfferActionRepo } from '../../../repo/action/authorizeOffer';
 import type { EventRepo } from '../../../repo/event';
 import type { OrderNumberRepo } from '../../../repo/orderNumber';
 import type { ProjectRepo } from '../../../repo/project';
-import type { TransactionRepo } from '../../../repo/transaction';
+import type { PlaceOrderRepo } from '../../../repo/transaction/placeOrder';
 import * as factory from '../../../factory';
 interface IAcceptRepos {
-    action: ActionRepo;
+    action: AcceptCOAOfferActionRepo;
     event: EventRepo;
     orderNumber: OrderNumberRepo;
     project: ProjectRepo;
-    transaction: TransactionRepo;
+    placeOrder: PlaceOrderRepo;
+    reserveService: COA.service.Reserve;
+    masterService: COA.service.Master;
+}
+interface IReAcceptRepos {
+    action: AcceptCOAOfferActionRepo;
+    authorizeOfferAction: AuthorizeOfferActionRepo;
+    event: EventRepo;
+    orderNumber: OrderNumberRepo;
+    project: ProjectRepo;
+    placeOrder: PlaceOrderRepo;
     reserveService: COA.service.Reserve;
     masterService: COA.service.Master;
 }
@@ -34,5 +45,5 @@ declare function reAcceptOffer(params: IAccepteOfferParams & {
          */
         id: string;
     };
-}): (repos: IAcceptRepos) => Promise<void>;
+}): (repos: IReAcceptRepos) => Promise<void>;
 export { acceptOffer, reAcceptOffer };

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

@@ -27,7 +27,7 @@ exports.acceptOffer = acceptOffer;
 exports.reAcceptOffer = reAcceptOffer;
 const errorHandler_1 = require("../../../errorHandler");
 const factory = __importStar(require("../../../factory"));
-const publishOrderNumberIfNotExist_1 = require("../../transaction/placeOrder/publishOrderNumberIfNotExist");
+const issueOrderNumberIfNotExist_1 = require("../../transaction/placeOrder/issueOrderNumberIfNotExist");
 const authorize_1 = require("./acceptOffer/authorize");
 const factory_1 = require("./acceptOffer/factory");
 function findCOAInfo(params) {
@@ -58,12 +58,12 @@ function acceptOffer(params) {
         if (typeof params.sameAs.id !== 'string' || params.sameAs.id === '') {
             throw new factory.errors.ArgumentNull('sameAs.id');
         }
-        const transaction = await repos.transaction.projectFieldsInProgressById({
+        const transaction = await repos.placeOrder.findPlaceOrderInProgressById({
             typeOf: factory.transactionType.PlaceOrder,
             id: params.purpose.id
         }, ['project', 'agent', 'typeOf']);
-        // publishOrderNumber(2025-03-11~)
-        await (0, publishOrderNumberIfNotExist_1.publishOrderNumberIfNotExist)({
+        // issueOrderNumber(2025-03-11~)
+        await (0, issueOrderNumberIfNotExist_1.issueOrderNumberIfNotExist)({
             project: { id: transaction.project.id },
             id: transaction.id,
             object: { orderDate: new Date() }
@@ -144,18 +144,18 @@ function reAcceptOffer(params) {
         if (typeof params.potentialActions?.id !== 'string' || params.potentialActions.id === '') {
             throw new factory.errors.ArgumentNull('potentialActions.id');
         }
-        const transaction = await repos.transaction.projectFieldsInProgressById({
+        const transaction = await repos.placeOrder.findPlaceOrderInProgressById({
             typeOf: factory.transactionType.PlaceOrder,
             id: params.purpose.id
         }, ['project', 'agent', 'typeOf']);
-        const orderNumber = await repos.transaction.findInProgressOrderNumberById({ id: transaction.id });
+        const orderNumber = await repos.placeOrder.findInProgressOrderNumberById({ id: transaction.id });
         if (typeof orderNumber !== 'string') {
             // 事前に発行されているはず
             throw new factory.errors.NotFound('transaction.object.orderNumber');
         }
         const coaInfo = await findCOAInfo({ id: params.object.event.id, project: { id: transaction.project.id } })(repos);
         // 承認アクション存在検証
-        await repos.action.findById({ id: params.potentialActions.id, typeOf: factory.actionType.AuthorizeAction }, ['id'], []);
+        await repos.authorizeOfferAction.findById({ id: params.potentialActions.id, typeOf: factory.actionType.AuthorizeAction }, ['id'], []);
         const actionAttributes = {
             project: transaction.project,
             typeOf: factory.actionType.AcceptAction,

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

@@ -22,7 +22,7 @@ export declare function offers2resultPrice(offers: IAcceptedOffer4COA[]): {
     price: number;
     eligibleMonetaryAmount: never[];
 };
-type IResultAcceptedOffer = factory.order.IAcceptedOffer<factory.order.IEventReservation>;
+type IResultAcceptedOffer = factory.order.IAcceptedOffer<factory.order.ICOAEventReservation>;
 /**
  * COA仮予約結果から注文アイテムを生成する
  */