@chevre/domain 24.0.0-alpha.3 → 24.0.0-alpha.31

package/lib/chevre/service/assetTransaction/reserveCOA/cancel.js

@@ -27,6 +27,9 @@ exports.cancel = cancel;
 exports.cancelByAcceptAction = cancelByAcceptAction;
 const factory = __importStar(require("../../../factory"));
 const cancelReservation_1 = require("../../reserveCOA/cancelReservation");
+/**
+ * 興行オファー承認アクションからCOA予約を取り消す
+ */
 function cancel(params, options) {
     return async (repos) => {
         // object.pendingTransactionに連携内容情報が記録されているので、その情報を元に仮予約を取り消す
@@ -77,9 +80,12 @@ function cancel(params, options) {
         }
     };
 }
+/**
+ * 興行オファー採用アクションからCOA予約を取り消す
+ */
 function cancelByAcceptAction(params, options) {
     return async (repos) => {
-        const recipe = await repos.action.findRecipeByAction({
+        const recipe = await repos.acceptCOAOfferAction.findRecipeByAction({
             project: { id: params.action.project.id },
             recipeFor: { id: params.action.id }
         });

package/lib/chevre/service/notification/triggerWebhook.d.ts

@@ -2,13 +2,14 @@ import * as factory from '../../factory';
 import type { ActionRepo } from '../../repo/action';
 import type { PotentialActionRepo } from '../../repo/potentialAction';
 import type { SettingRepo } from '../../repo/setting';
+interface ITriggerWebhookRepos {
+    action: ActionRepo;
+    potentialAction: PotentialActionRepo;
+    setting: SettingRepo;
+}
 declare function triggerWebhook(params: factory.task.IData<factory.taskName.TriggerWebhook> & {
     project: {
         id: string;
     };
-}): (repos: {
-    action: ActionRepo;
-    potentialAction: PotentialActionRepo;
-    setting: SettingRepo;
-}) => Promise<void>;
-export { triggerWebhook };
+}): (repos: ITriggerWebhookRepos) => Promise<void>;
+export { ITriggerWebhookRepos, triggerWebhook };

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';
@@ -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']);

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

@@ -8,7 +8,7 @@ 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';
 declare function issueEventOfferTicket(params: {
     now: Date;
     audience: Pick<factory.action.authorize.offer.eventService.IPurpose, 'id'>;
@@ -41,7 +41,7 @@ declare function issueEventOfferTicket(params: {
     memberProgram: MemberProgramRepo;
     productOffer: ProductOfferRepo;
     ticket: TicketRepo;
-    transaction: TransactionRepo;
+    placeOrder: PlaceOrderRepo;
 }) => Promise<{
     ticketToken: string;
 }>;

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

@@ -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/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,11 @@ 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 {
     action: ActionRepo;
+    acceptCOAOfferAction: AcceptCOAOfferActionRepo;
+    authorizeOfferAction: AuthorizeOfferActionRepo;
     assetTransaction: AssetTransactionRepo;
     stockHolder: StockHolderRepo;
     offerRateLimit: OfferRateLimitRepo;
@@ -19,7 +23,7 @@ interface IVoidTransactionRepos {
     reservation: ReservationRepo;
     setting: SettingRepo;
     task: TaskRepo;
-    transaction: TransactionRepo;
+    placeOrder: PlaceOrderRepo;
     /**
      * COAオファー承認取消の場合必須
      */

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

@@ -45,7 +45,7 @@ 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,
@@ -124,7 +124,7 @@ 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']);
@@ -179,6 +179,7 @@ function cancelAcceptActions(params) {
             }
             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;

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

@@ -1,21 +1,23 @@
-import type { ActionRepo } from '../../../repo/action';
+import type { AuthorizeOfferActionRepo } from '../../../repo/action/authorizeOffer';
+import type { AcceptCOAOfferActionRepo } from '../../../repo/action/acceptCOAOffer';
 import type { CategoryCodeRepo } from '../../../repo/categoryCode';
 import type { EventRepo } from '../../../repo/event';
 import type { OfferRepo } from '../../../repo/offer/unitPriceInCatalog';
 import type { OrderInTransactionRepo } from '../../../repo/orderInTransaction';
-import type { TransactionRepo } from '../../../repo/transaction';
+import type { PlaceOrderRepo } from '../../../repo/transaction/placeOrder';
 import { IRequestBody, IResponseBody } from './authorize/factory';
 import { IAcceptedOfferBeforeAuthorize4COA } from './authorize/validateAcceptedOffers';
 import * as factory from '../../../factory';
 export { IRequestBody, IResponseBody };
 export type IAuthorizeActionResult = factory.action.authorize.offer.eventService.IResult;
 export interface IAuthorizeRepos {
-    action: ActionRepo;
+    action: AuthorizeOfferActionRepo;
+    accpetCOAOfferAction: AcceptCOAOfferActionRepo;
     categoryCode: CategoryCodeRepo;
     event: EventRepo;
     offer: OfferRepo;
     orderInTransaction: OrderInTransactionRepo;
-    transaction: TransactionRepo;
+    placeOrder: PlaceOrderRepo;
 }
 export type IAuthorizeOperation<T> = (repos: IAuthorizeRepos) => Promise<T>;
 export type IAuthorizeOfferAction = factory.action.authorize.offer.eventService.IAction;

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

@@ -28,7 +28,6 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.authorize = authorize;
 const moment_1 = __importDefault(require("moment"));
-// import { publishOrderNumberIfNotExist } from '../../transaction/placeOrder/publishOrderNumberIfNotExist';
 const any_1 = require("../any");
 const factory_1 = require("./authorize/factory");
 const validateAcceptedOffers_1 = require("./authorize/validateAcceptedOffers");
@@ -38,7 +37,7 @@ const factory = __importStar(require("../../../factory"));
  */
 function authorize(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', 'project', 'seller', 'typeOf', 'instrument']);
@@ -104,15 +103,9 @@ function authorize(params) {
             await repos.action.giveUp({ typeOf: failedAction.typeOf, id: failedAction.id, error });
             throw error;
         }
-        // const now = new Date();
-        // const orderNumber = await publishOrderNumberIfNotExist({
-        //     project: { id: transaction.project.id },
-        //     id: transaction.id,
-        //     object: { orderDate: now }
-        // })(repos);
-        const orderNumber = await repos.transaction.findInProgressOrderNumberById({ id: params.transaction.id });
+        const orderNumber = await repos.placeOrder.findInProgressOrderNumberById({ id: params.transaction.id });
         if (typeof orderNumber !== 'string') {
-            // 事前に発行されているはず
+            // 事前に発行されているはず(acceptCOAOfferにて)
             throw new factory.errors.NotFound('transaction.object.orderNumber');
         }
         let result;

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

@@ -32,18 +32,26 @@ const factory = __importStar(require("../../../factory"));
  */
 function authorizeByAcceptAction(params) {
     return async (repos) => {
-        const acceptAction = (await repos.action.search({
-            limit: 1,
-            page: 1,
-            project: { id: { $eq: params.project.id } },
-            id: { $in: [params.object.id] },
-            typeOf: { $eq: factory.actionType.AcceptAction },
-            purpose: { id: { $in: [params.purpose.id] } },
-            actionStatus: { $in: [factory.actionStatusType.CompletedActionStatus] }
-        }, ['result', 'object', 'potentialActions'])).shift();
-        if (acceptAction === undefined) {
-            throw new factory.errors.NotFound(factory.actionType.AcceptAction);
-        }
+        // const acceptAction = (<IAcceptAction[]>await repos.action.search(
+        //     {
+        //         limit: 1,
+        //         page: 1,
+        //         project: { id: { $eq: params.project.id } },
+        //         id: { $in: [params.object.id] },
+        //         typeOf: { $eq: factory.actionType.AcceptAction },
+        //         purpose: { id: { $in: [params.purpose.id] } },
+        //         actionStatus: { $in: [factory.actionStatusType.CompletedActionStatus] }
+        //     },
+        //     ['result', 'object', 'potentialActions']
+        // )).shift();
+        // if (acceptAction === undefined) {
+        //     throw new factory.errors.NotFound(factory.actionType.AcceptAction);
+        // }
+        const acceptAction = await repos.accpetCOAOfferAction.findCompletedById({
+            project: { id: params.project.id },
+            id: params.object.id,
+            purpose: { id: params.purpose.id },
+        }, ['result', 'object', 'potentialActions']);
         const acceptResult = acceptAction.result;
         if (acceptResult === undefined) {
             throw new factory.errors.NotFound(`${factory.actionType.AcceptAction}.result`);
@@ -67,7 +75,7 @@ function authorizeByAcceptAction(params) {
         }
         else {
             // recipe依存へ変更(2024-06-11~)
-            const recipe = await repos.action.findRecipeByAction({
+            const recipe = await repos.accpetCOAOfferAction.findRecipeByAction({
                 project: { id: params.project.id },
                 recipeFor: { id: params.object.id }
             });

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

@@ -32,19 +32,20 @@ const any_1 = require("../any");
 const factory_1 = require("./authorize/factory");
 const validateAcceptedOffers_1 = require("./authorize/validateAcceptedOffers");
 const factory = __importStar(require("../../../factory"));
+// type IAcceptAction = Pick<factory.action.accept.coaOffer.IAction, 'result'>;
 /**
  * COA興行オファー承認のオファーを変更
  */
 function changeOffers(params) {
     return async (repos) => {
-        const transaction = await repos.transaction.projectFieldsInProgressById({
+        const transaction = await repos.placeOrder.findPlaceOrderInProgressById({
             typeOf: factory.transactionType.PlaceOrder,
             id: params.transaction.id
         }, ['typeOf', 'agent', 'project', 'seller']);
         if (transaction.agent.id !== params.agent.id) {
             throw new factory.errors.Forbidden('Transaction not yours');
         }
-        const orderNumber = await repos.transaction.findInProgressOrderNumberById({ id: params.transaction.id });
+        const orderNumber = await repos.placeOrder.findInProgressOrderNumberById({ id: params.transaction.id });
         if (typeof orderNumber !== 'string') {
             // 事前に発行されているはず
             throw new factory.errors.NotFound('transaction.object.orderNumber');
@@ -61,13 +62,21 @@ function changeOffers(params) {
         if (typeof originalAcceptActionId !== 'string' || originalAcceptActionId === '') {
             throw new factory.errors.NotFound('authorizeAction.object.id');
         }
-        const originalAcceptResult = (await repos.action.search({
-            limit: 1,
-            page: 1,
-            project: { id: { $eq: authorizeAction.project.id } },
-            id: { $in: [originalAcceptActionId] },
-            typeOf: { $eq: factory.actionType.AcceptAction }
-        }, ['result'])).shift()?.result;
+        // const originalAcceptResult = (<IAcceptAction[]>await repos.action.search(
+        //     {
+        //         limit: 1,
+        //         page: 1,
+        //         project: { id: { $eq: authorizeAction.project.id } },
+        //         id: { $in: [originalAcceptActionId] },
+        //         typeOf: { $eq: factory.actionType.AcceptAction }
+        //     },
+        //     ['result']
+        // )).shift()?.result;
+        const originalAcceptResult = (await repos.accpetCOAOfferAction.findCompletedById({
+            project: { id: authorizeAction.project.id },
+            id: originalAcceptActionId,
+            purpose: { id: authorizeAction.purpose.id },
+        }, ['result'])).result;
         if (originalAcceptResult === undefined) {
             throw new factory.errors.NotFound(`${factory.actionType.AcceptAction}.result`);
         }
@@ -126,7 +135,7 @@ function changeOffers(params) {
         // authorizeAction.object.acceptedOffer = acceptedOffers; // discontinue acceptedOffers(2024-06-21~)
         // recipe依存へ変更(2024-06-11~)
         // const updTmpReserveSeatResult = authorizeAction.result?.responseBody;
-        const recipe = await repos.action.findRecipeByAction({
+        const recipe = await repos.accpetCOAOfferAction.findRecipeByAction({
             project: { id: transaction.project.id },
             recipeFor: { id: originalAcceptActionId }
         });

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

@@ -1,5 +1,5 @@
 import * as factory from '../../../factory';
-import type { ActionRepo } from '../../../repo/action';
+import type { AcceptCOAOfferActionRepo } from '../../../repo/action/acceptCOAOffer';
 import type { TaskRepo } from '../../../repo/task';
 interface IFindAcceptActionResult {
     /**
@@ -35,7 +35,7 @@ declare function findAcceptAction(params: {
         id: string;
     };
 }): (repos: {
-    action: ActionRepo;
+    action: AcceptCOAOfferActionRepo;
     task: TaskRepo;
 }) => Promise<IFindAcceptActionResult>;
 export { findAcceptAction };