@chevre/domain 24.0.0-alpha.33 → 24.0.0-alpha.35

package/lib/chevre/repo/action/acceptCOAOffer.d.ts

@@ -20,4 +20,13 @@ export declare class AcceptCOAOfferActionRepo extends ActionProcessRepo<IAcceptC
             id: string;
         };
     }, inclusion: IKeyOfProjection[]): Promise<IAcceptCOAOfferAction>;
+    findAcceptCOAOfferActionsByPurpose(params: {
+        /**
+         * 注文取引でフィルター
+         */
+        purpose: {
+            typeOf: factory.transactionType;
+            id: string;
+        };
+    }): Promise<IAcceptCOAOfferAction[]>;
 }

package/lib/chevre/repo/action/acceptCOAOffer.js

@@ -58,5 +58,16 @@ class AcceptCOAOfferActionRepo extends actionProcess_1.ActionProcessRepo {
         }
         return doc;
     }
+    async findAcceptCOAOfferActionsByPurpose(params) {
+        return this.findAnyActionsByPurpose({
+            ...params,
+            typeOf: factory.actionType.AcceptAction,
+            purpose: {
+                typeOf: params.purpose.typeOf,
+                id: params.purpose.id
+            },
+            object: { typeOf: { $eq: factory.offerType.AggregateOffer } }
+        });
+    }
 }
 exports.AcceptCOAOfferActionRepo = AcceptCOAOfferActionRepo;

package/lib/chevre/repo/action/actionProcess.d.ts

@@ -56,7 +56,7 @@ export declare class ActionProcessRepo<TAction extends IAction<factory.actionTyp
      * アクション取消
      */
     cancelWithVoid(params: {
-        typeOf: factory.actionType.AcceptAction | factory.actionType.AuthorizeAction;
+        typeOf: TAction['typeOf'];
         id: string;
         cancelAction?: Pick<ICancelActionAction, 'agent' | 'sameAs' | 'startTime'>;
     }): Promise<void>;

package/lib/chevre/repo/action/authorizeOffer.d.ts

@@ -1,10 +1,40 @@
 import * as factory from '../../factory';
 import { ActionProcessRepo } from './actionProcess';
-export type IAuthorizeOfferAction = factory.action.authorize.offer.eventService.IAction;
+export type IAuthorizeEventServiceOfferAction = factory.action.authorize.offer.eventService.IAction;
+export type IAuthorizeProductOfferAction = factory.action.authorize.offer.product.IAction;
+export type IAuthorizeOfferAction = IAuthorizeEventServiceOfferAction | IAuthorizeProductOfferAction;
+export type IAuthorizeOfferActionWithInstrument = Pick<IAuthorizeEventServiceOfferAction | IAuthorizeProductOfferAction, 'instrument'>;
 /**
  * オファー承認リポジトリ
  */
 export declare class AuthorizeOfferActionRepo extends ActionProcessRepo<IAuthorizeOfferAction, never> {
+    findAuthorizeOfferInstrumentsByIds(params: {
+        /**
+         * 注文取引
+         */
+        purpose: {
+            id: string;
+        };
+        /**
+         * アクションIDリスト
+         */
+        ids: string[];
+    }): Promise<IAuthorizeOfferActionWithInstrument[]>;
+    findAuthorizeOfferActionsByPurpose(params: {
+        /**
+         * 注文取引でフィルター
+         */
+        purpose: {
+            typeOf: factory.transactionType;
+            id: string;
+        };
+        /**
+         * アクションステータスでフィルター
+         */
+        actionStatus?: {
+            $eq?: factory.actionStatusType.CompletedActionStatus;
+        };
+    }): Promise<IAuthorizeEventServiceOfferAction[]>;
     /**
      * アクション再開
      */

package/lib/chevre/repo/action/authorizeOffer.js

@@ -26,13 +26,43 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.AuthorizeOfferActionRepo = void 0;
 const factory = __importStar(require("../../factory"));
 // import { MONGO_MAX_TIME_MS } from '../settings';
-// import { createSchema, IModel as IActionModel, modelName } from './mongoose/schemas/action';
-// import { createSchema as createRecipeSchema, IModel as IActionRecipeModel, modelName as recipeModelName } from './mongoose/schemas/actionRecipe';
 const actionProcess_1 = require("./actionProcess");
 /**
  * オファー承認リポジトリ
  */
 class AuthorizeOfferActionRepo extends actionProcess_1.ActionProcessRepo {
+    async findAuthorizeOfferInstrumentsByIds(params) {
+        if (!Array.isArray(params.ids)) {
+            throw new factory.errors.Argument('ids', 'must be Array');
+        }
+        return this.findAnyActions({
+            typeOf: factory.actionType.AuthorizeAction,
+            purpose: {
+                typeOf: { $in: [factory.transactionType.PlaceOrder] },
+                id: { $in: [params.purpose.id] }
+            },
+            object: {
+                typeOf: {
+                    $in: [
+                        factory.action.authorize.offer.eventService.ObjectType.SeatReservation,
+                        factory.offerType.Offer
+                    ]
+                }
+            },
+            id: { $in: params.ids }
+        }, ['instrument']);
+    }
+    async findAuthorizeOfferActionsByPurpose(params) {
+        return this.findAnyActionsByPurpose({
+            ...params,
+            typeOf: factory.actionType.AuthorizeAction,
+            purpose: {
+                typeOf: params.purpose.typeOf,
+                id: params.purpose.id
+            },
+            object: { typeOf: { $eq: factory.action.authorize.offer.eventService.ObjectType.SeatReservation } }
+        });
+    }
     /**
      * アクション再開
      */

package/lib/chevre/repo/action/authorizePaymentMethod.d.ts

@@ -33,4 +33,16 @@ export declare class AuthorizePaymentMethodActionRepo extends ActionProcessRepo<
         };
         sort?: factory.action.ISortOrder;
     }): Promise<IAuthorizePaymentMethodAction[]>;
+    findAuthorizePaymentMethodResultsById(params: {
+        /**
+         * 注文取引
+         */
+        purpose: {
+            id: string;
+        };
+        /**
+         * アクションIDリスト
+         */
+        ids: string[];
+    }): Promise<Pick<IAuthorizePaymentMethodAction, 'result'>[]>;
 }

package/lib/chevre/repo/action/authorizePaymentMethod.js

@@ -46,5 +46,19 @@ class AuthorizePaymentMethodActionRepo extends actionProcess_1.ActionProcessRepo
             }
         });
     }
+    async findAuthorizePaymentMethodResultsById(params) {
+        if (!Array.isArray(params.ids)) {
+            throw new factory.errors.Argument('ids', 'must be Array');
+        }
+        return this.findAnyActions({
+            typeOf: factory.actionType.AuthorizeAction,
+            purpose: {
+                typeOf: { $in: [factory.transactionType.PlaceOrder] },
+                id: { $in: [params.purpose.id] }
+            },
+            object: { typeOf: { $eq: factory.action.authorize.paymentMethod.any.ResultType.Payment } },
+            id: { $in: params.ids }
+        }, ['result']);
+    }
 }
 exports.AuthorizePaymentMethodActionRepo = AuthorizePaymentMethodActionRepo;

package/lib/chevre/repo/action/authorizeTicketedObject.d.ts

@@ -0,0 +1,8 @@
+import * as factory from '../../factory';
+import { ActionProcessRepo } from './actionProcess';
+export type IAuthorizeTicketedObjectAction = factory.action.authorize.ticketedObject.IAction;
+/**
+ * 決済とオファー以外に対する汎用承認リポジトリ
+ */
+export declare class AuthorizeTicketedObjectActionRepo extends ActionProcessRepo<IAuthorizeTicketedObjectAction, never> {
+}

package/lib/chevre/repo/action/authorizeTicketedObject.js

@@ -0,0 +1,11 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.AuthorizeTicketedObjectActionRepo = void 0;
+// import { MONGO_MAX_TIME_MS } from '../settings';
+const actionProcess_1 = require("./actionProcess");
+/**
+ * 決済とオファー以外に対する汎用承認リポジトリ
+ */
+class AuthorizeTicketedObjectActionRepo extends actionProcess_1.ActionProcessRepo {
+}
+exports.AuthorizeTicketedObjectActionRepo = AuthorizeTicketedObjectActionRepo;

package/lib/chevre/repo/action.d.ts

@@ -1,4 +1,4 @@
-import { FilterQuery, UpdateQuery } from 'mongoose';
+import { FilterQuery } from 'mongoose';
 import * as factory from '../factory';
 import type { IDocType } from './mongoose/schemas/action';
 import { IAction, IKeyOfProjection, ActionProcessRepo, ICancelActionAction, IActionRecipe } from './action/actionProcess';
@@ -7,7 +7,7 @@ export { ICancelActionAction };
 /**
  * 汎用アクションリポジトリで開始可能なアクションタイプ
  */
-type StartableActionType = Exclude<factory.actionType, factory.actionType.AcceptAction | factory.actionType.CheckAction>;
+type StartableActionType = Exclude<factory.actionType, factory.actionType.AcceptAction | factory.actionType.CheckAction | factory.actionType.AuthorizeAction>;
 type IAvailableActionRecipe = IActionRecipe<Exclude<factory.recipe.RecipeCategory, factory.recipe.RecipeCategory.publishPaymentUrl | factory.recipe.RecipeCategory.checkMovieTicket | factory.recipe.RecipeCategory.acceptCOAOffer | factory.recipe.RecipeCategory.authorizeInvoice | factory.recipe.RecipeCategory.authorizeInvoice3ds>>;
 /**
  * アクションリポジトリ
@@ -16,7 +16,7 @@ export declare class ActionRepo extends ActionProcessRepo<IAction<StartableActio
     /**
      * アクション検索
      */
-    search<T extends StartableActionType>(params: factory.action.ISearchConditions, inclusion: IKeyOfProjection[]): Promise<IAction<T>[]>;
+    search<T extends StartableActionType>(params: factory.action.ISearchConditions & {}, inclusion: IKeyOfProjection[]): Promise<IAction<T>[]>;
     findPayAction(params: {
         project: {
             id: string;
@@ -29,7 +29,7 @@ export declare class ActionRepo extends ActionProcessRepo<IAction<StartableActio
     /**
      * 取引に対するアクションを検索する
      */
-    searchByPurpose<T extends factory.actionType.AcceptAction | factory.actionType.AuthorizeAction>(params: {
+    searchByPurpose<T extends factory.actionType.AuthorizeAction>(params: {
         typeOf?: T;
         purpose: {
             typeOf: factory.transactionType;
@@ -60,14 +60,6 @@ export declare class ActionRepo extends ActionProcessRepo<IAction<StartableActio
             id: string;
         };
     }): Promise<void>;
-    updateById(params: {
-        id: string;
-        update: any;
-    }): Promise<void>;
-    findByIdAndUpdate(params: {
-        id: string;
-        update: UpdateQuery<IAction<factory.actionType>>;
-    }): Promise<void>;
     /**
      * イベントと入場ゲート指定で予約使用アクションを集計する
      * discontinue(2024-12-26~)

package/lib/chevre/repo/action.js

@@ -365,20 +365,33 @@ class ActionRepo extends actionProcess_1.ActionProcessRepo {
     //             }
     //         });
     // }
-    async updateById(params) {
-        await this.actionModel.updateOne({ _id: { $eq: params.id } }, params.update)
-            .exec();
-    }
-    async findByIdAndUpdate(params) {
-        await this.actionModel.findOneAndUpdate({ _id: { $eq: params.id } }, params.update, { projection: { _id: 1 } })
-            .lean()
-            .exec()
-            .then((doc) => {
-            if (doc === null) {
-                throw new factory.errors.NotFound(this.actionModel.modelName);
-            }
-        });
-    }
+    // public async updateById(params: {
+    //     id: string;
+    //     update: any;
+    // }): Promise<void> {
+    //     await this.actionModel.updateOne(
+    //         { _id: { $eq: params.id } },
+    //         params.update
+    //     )
+    //         .exec();
+    // }
+    // public async findByIdAndUpdate(params: {
+    //     id: string;
+    //     update: UpdateQuery<IAction<factory.actionType>>;
+    // }): Promise<void> {
+    //     await this.actionModel.findOneAndUpdate(
+    //         { _id: { $eq: params.id } },
+    //         params.update,
+    //         { projection: { _id: 1 } }
+    //     )
+    //         .lean<{ _id: ObjectId }>()
+    //         .exec()
+    //         .then((doc) => {
+    //             if (doc === null) {
+    //                 throw new factory.errors.NotFound(this.actionModel.modelName);
+    //             }
+    //         });
+    // }
     /**
      * イベントと入場ゲート指定で予約使用アクションを集計する
      * discontinue(2024-12-26~)

package/lib/chevre/repository.d.ts

@@ -14,6 +14,7 @@ import type { AuthorizeInvoiceActionRepo } from './repo/action/authorizeInvoice'
 import type { AuthorizeOfferActionRepo } from './repo/action/authorizeOffer';
 import type { AuthorizeProductOfferActionRepo } from './repo/action/authorizeProductOffer';
 import type { AuthorizePaymentMethodActionRepo } from './repo/action/authorizePaymentMethod';
+import type { AuthorizeTicketedObjectActionRepo } from './repo/action/authorizeTicketedObject';
 import type { CheckMovieTicketActionRepo } from './repo/action/checkMovieTicket';
 import type { CheckThingActionRepo } from './repo/action/checkThing';
 import type { AdditionalPropertyRepo } from './repo/additionalProperty';
@@ -155,6 +156,10 @@ export declare namespace action {
     namespace AuthorizePaymentMethod {
         function createInstance(...params: ConstructorParameters<typeof AuthorizePaymentMethodActionRepo>): Promise<AuthorizePaymentMethodActionRepo>;
     }
+    type AuthorizeTicketedObject = AuthorizeTicketedObjectActionRepo;
+    namespace AuthorizeTicketedObject {
+        function createInstance(...params: ConstructorParameters<typeof AuthorizeTicketedObjectActionRepo>): Promise<AuthorizeTicketedObjectActionRepo>;
+    }
     type CheckMovieTicket = CheckMovieTicketActionRepo;
     namespace CheckMovieTicket {
         function createInstance(...params: ConstructorParameters<typeof CheckMovieTicketActionRepo>): Promise<CheckMovieTicketActionRepo>;

package/lib/chevre/repository.js

@@ -170,6 +170,17 @@ var action;
         }
         AuthorizePaymentMethod.createInstance = createInstance;
     })(AuthorizePaymentMethod = action.AuthorizePaymentMethod || (action.AuthorizePaymentMethod = {}));
+    let AuthorizeTicketedObject;
+    (function (AuthorizeTicketedObject) {
+        let repo;
+        async function createInstance(...params) {
+            if (repo === undefined) {
+                repo = (await Promise.resolve().then(() => __importStar(require('./repo/action/authorizeTicketedObject')))).AuthorizeTicketedObjectActionRepo;
+            }
+            return new repo(...params);
+        }
+        AuthorizeTicketedObject.createInstance = createInstance;
+    })(AuthorizeTicketedObject = action.AuthorizeTicketedObject || (action.AuthorizeTicketedObject = {}));
     let CheckMovieTicket;
     (function (CheckMovieTicket) {
         let repo;

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';
@@ -9,6 +9,19 @@ import type { MemberProgramRepo } from '../../../repo/memberProgram';
 import type { ProductOfferRepo } from '../../../repo/productOffer';
 import type { TicketRepo } from '../../../repo/ticket';
 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;
-    placeOrder: PlaceOrderRepo;
-}) => 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') {
             // 基本的にありえないフロー

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

@@ -13,6 +13,9 @@ import type { StockHolderRepo } from '../../../repo/stockHolder';
 import type { TaskRepo } from '../../../repo/task';
 import type { PlaceOrderRepo } from '../../../repo/transaction/placeOrder';
 interface IVoidTransactionRepos {
+    /**
+     * CancelAction開始で使用される
+     */
     action: ActionRepo;
     acceptCOAOfferAction: AcceptCOAOfferActionRepo;
     authorizeOfferAction: AuthorizeOfferActionRepo;
@@ -44,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

@@ -47,13 +47,13 @@ function voidTransaction(params) {
         };
         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:
@@ -89,7 +89,7 @@ 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:
@@ -129,23 +129,23 @@ function cancelAcceptActions(params) {
             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:
@@ -173,7 +173,7 @@ function cancelAcceptActions(params) {
         }
         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');
             }

package/lib/chevre/service/order/placeOrder/createPlacingOrderFromExistingTransaction.d.ts

@@ -1,10 +1,13 @@
-import type { ActionRepo } from '../../../repo/action';
+import type { AuthorizeOfferActionRepo } from '../../../repo/action/authorizeOffer';
+import type { AuthorizePaymentMethodActionRepo } from '../../../repo/action/authorizePaymentMethod';
 import type { IPlacingOrder, OrderInTransactionRepo } from '../../../repo/orderInTransaction';
 import type { PlaceOrderRepo } from '../../../repo/transaction/placeOrder';
 import * as factory from '../../../factory';
 type IPlaceOrderTransaction = Pick<factory.transaction.placeOrder.ITransaction, 'id' | 'project' | 'typeOf' | 'result' | 'object' | 'seller'>;
 interface ICreatePlacingOrderFromExistingTransactionRepos {
-    action: ActionRepo;
+    action?: never;
+    authorizeOfferAction: AuthorizeOfferActionRepo;
+    authorizePaymentMethodAction: AuthorizePaymentMethodActionRepo;
     orderInTransaction: OrderInTransactionRepo;
     placeOrder: PlaceOrderRepo;
 }

package/lib/chevre/service/order/placeOrder/createPlacingOrderFromExistingTransaction.js

@@ -54,31 +54,46 @@ function createPlacingOrderFromExistingTransaction(params) {
         if (Array.isArray(authorizeActionsAsResult) && authorizeActionsAsResult.length > 0) {
             const completedAuthorizeActionIds = authorizeActionsAsResult.map(({ id }) => id);
             if (completedAuthorizeActionIds.length > 0) {
-                authorizePaymentActions = await repos.action.search({
-                    typeOf: factory.actionType.AuthorizeAction,
-                    purpose: {
-                        typeOf: { $in: [factory.transactionType.PlaceOrder] },
-                        id: { $in: [placeOrderTransactionWithResult.id] }
-                    },
-                    object: { typeOf: { $eq: factory.action.authorize.paymentMethod.any.ResultType.Payment } },
-                    id: { $in: completedAuthorizeActionIds }
-                }, ['result']);
-                authorizeOfferActionsWithInstrument = await repos.action.search({
-                    typeOf: factory.actionType.AuthorizeAction,
-                    purpose: {
-                        typeOf: { $in: [factory.transactionType.PlaceOrder] },
-                        id: { $in: [placeOrderTransactionWithResult.id] }
-                    },
-                    object: {
-                        typeOf: {
-                            $in: [
-                                factory.action.authorize.offer.eventService.ObjectType.SeatReservation,
-                                factory.offerType.Offer
-                            ]
-                        }
-                    },
-                    id: { $in: completedAuthorizeActionIds }
-                }, ['instrument']);
+                // authorizePaymentActions = <Pick<factory.action.authorize.paymentMethod.any.IAction, 'result'>[]>
+                //     await repos.action.search<factory.actionType.AuthorizeAction>(
+                //         {
+                //             typeOf: factory.actionType.AuthorizeAction,
+                //             purpose: {
+                //                 typeOf: { $in: [factory.transactionType.PlaceOrder] },
+                //                 id: { $in: [placeOrderTransactionWithResult.id] }
+                //             },
+                //             object: { typeOf: { $eq: factory.action.authorize.paymentMethod.any.ResultType.Payment } },
+                //             id: { $in: completedAuthorizeActionIds }
+                //         },
+                //         ['result']
+                //     );
+                authorizePaymentActions = await repos.authorizePaymentMethodAction.findAuthorizePaymentMethodResultsById({
+                    purpose: { id: placeOrderTransactionWithResult.id },
+                    ids: completedAuthorizeActionIds
+                });
+                // authorizeOfferActionsWithInstrument = <IAuthorizeActionWithInstrument[]>await repos.action.search<factory.actionType.AuthorizeAction>(
+                //     {
+                //         typeOf: factory.actionType.AuthorizeAction,
+                //         purpose: {
+                //             typeOf: { $in: [factory.transactionType.PlaceOrder] },
+                //             id: { $in: [placeOrderTransactionWithResult.id] }
+                //         },
+                //         object: {
+                //             typeOf: {
+                //                 $in: [
+                //                     factory.action.authorize.offer.eventService.ObjectType.SeatReservation,
+                //                     factory.offerType.Offer
+                //                 ]
+                //             }
+                //         },
+                //         id: { $in: completedAuthorizeActionIds }
+                //     },
+                //     ['instrument']
+                // );
+                authorizeOfferActionsWithInstrument = await repos.authorizeOfferAction.findAuthorizeOfferInstrumentsByIds({
+                    purpose: { id: placeOrderTransactionWithResult.id },
+                    ids: completedAuthorizeActionIds
+                });
             }
         }
         // orderedItem生成のためにacceptedOffersを取得

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

@@ -1,6 +1,8 @@
 import type { AcceptedOfferRepo } from '../../repo/acceptedOffer';
 import type { AccountingReportRepo } from '../../repo/accountingReport';
 import type { ActionRepo } from '../../repo/action';
+import type { AuthorizeOfferActionRepo } from '../../repo/action/authorizeOffer';
+import type { AuthorizePaymentMethodActionRepo } from '../../repo/action/authorizePaymentMethod';
 import type { OrderRepo } from '../../repo/order';
 import type { OrderInTransactionRepo } from '../../repo/orderInTransaction';
 import type { SettingRepo } from '../../repo/setting';
@@ -12,6 +14,8 @@ interface IPlaceOrderRepos {
     acceptedOffer: AcceptedOfferRepo;
     accountingReport: AccountingReportRepo;
     action: ActionRepo;
+    authorizeOfferAction: AuthorizeOfferActionRepo;
+    authorizePaymentMethodAction: AuthorizePaymentMethodActionRepo;
     order: OrderRepo;
     orderInTransaction: OrderInTransactionRepo;
     setting: SettingRepo;

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

@@ -42,7 +42,12 @@ function placeOrder(params) {
             project: { id: params.project.id },
             confirmationNumber: params.object.confirmationNumber,
             orderNumber: params.object.orderNumber
-        })(repos);
+        })({
+            authorizeOfferAction: repos.authorizeOfferAction,
+            authorizePaymentMethodAction: repos.authorizePaymentMethodAction,
+            orderInTransaction: repos.orderInTransaction,
+            placeOrder: repos.placeOrder,
+        });
         // USE_ORDER_PAYMENT_DUE_ON_PLACED設定を廃止したので、必ずOrderPaymentDueのはず(2024-01-10~)
         if (order.orderStatus !== factory.orderStatus.OrderPaymentDue) {
             throw new factory.errors.Internal(`orderStatus must be ${factory.orderStatus.OrderPaymentDue}`);

package/lib/chevre/service/task/placeOrder.js

@@ -4,6 +4,8 @@ exports.call = call;
 const acceptedOffer_1 = require("../../repo/acceptedOffer");
 const accountingReport_1 = require("../../repo/accountingReport");
 const action_1 = require("../../repo/action");
+const authorizeOffer_1 = require("../../repo/action/authorizeOffer");
+const authorizePaymentMethod_1 = require("../../repo/action/authorizePaymentMethod");
 const order_1 = require("../../repo/order");
 const orderInTransaction_1 = require("../../repo/orderInTransaction");
 const setting_1 = require("../../repo/setting");
@@ -23,6 +25,8 @@ function call(data) {
             acceptedOffer: new acceptedOffer_1.AcceptedOfferRepo(connection),
             accountingReport: new accountingReport_1.AccountingReportRepo(connection),
             action: new action_1.ActionRepo(connection),
+            authorizeOfferAction: new authorizeOffer_1.AuthorizeOfferActionRepo(connection),
+            authorizePaymentMethodAction: new authorizePaymentMethod_1.AuthorizePaymentMethodActionRepo(connection),
             order: new order_1.OrderRepo(connection),
             orderInTransaction: new orderInTransaction_1.OrderInTransactionRepo(connection),
             setting: new setting_1.SettingRepo(connection),

package/package.json

@@ -99,5 +99,5 @@
     "postversion": "git push origin --tags",
     "prepublishOnly": "npm run clean && npm run build"
   },
-  "version": "24.0.0-alpha.33"
+  "version": "24.0.0-alpha.35"
 }