@chevre/domain 26.0.0-alpha.9 → 26.1.0-alpha.0

package/lib/chevre/service/payment/any/findCheckAction.d.ts

@@ -1,11 +1,11 @@
 import { factory } from '../../../factory';
 import type { CheckMovieTicketActionRepo, IMinimizedPurchaseNumberAuthResult } from '../../../repo/action/checkMovieTicket';
 import type { AsyncActionRepo } from '../../../repo/asyncAction';
-import type { TaskRepo } from '../../../repo/task';
 interface IFindCheckActionRepos {
-    checkMovieTicketAction: CheckMovieTicketActionRepo;
+    actions: {
+        checkMovieTicket: CheckMovieTicketActionRepo;
+    };
     asyncAction: AsyncActionRepo;
-    task: TaskRepo;
 }
 interface IFindCheckActionResult {
     /**
@@ -43,7 +43,5 @@ declare function findCheckAction(params: {
          */
         id: string;
     };
-}, options: {
-    useAsyncAction: boolean;
 }): (repos: IFindCheckActionRepos) => Promise<IFindCheckActionResult>;
 export { IFindCheckActionRepos, findCheckAction, };

package/lib/chevre/service/payment/any/findCheckAction.js

@@ -2,27 +2,27 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.findCheckAction = findCheckAction;
 const factory_1 = require("../../../factory");
-function findCheckAction(params, options) {
+function findCheckAction(params) {
     return async (repos) => {
         // 非同期アクションに対応(2026-07-28~)
-        const { useAsyncAction } = options;
-        let task;
-        if (useAsyncAction) {
-            // まず非同期アクションを参照
-            task = await repos.asyncAction.findAsyncActionById({
-                id: { $eq: params.sameAs.id },
-                project: { id: { $eq: params.project.id } },
-                name: factory_1.factory.taskName.CheckMovieTicket
-            }, ['status', 'executionResults']);
-        }
-        // 非同期アクションが存在しなければタスクを参照
-        if (task === undefined) {
-            task = await repos.task.findTaskById({
-                id: { $eq: params.sameAs.id },
-                project: { id: { $eq: params.project.id } },
-                name: factory_1.factory.taskName.CheckMovieTicket
-            }, ['status', 'executionResults']);
-        }
+        // let task: Pick<factory.task.checkMovieTicket.ITask, 'id' | 'status' | 'executionResults'> | undefined;
+        // まず非同期アクションを参照
+        const task = await repos.asyncAction.findAsyncActionById({
+            id: { $eq: params.sameAs.id },
+            project: { id: { $eq: params.project.id } },
+            name: factory_1.factory.taskName.CheckMovieTicket
+        }, ['status', 'executionResults']);
+        // // 非同期アクションが存在しなければタスクを参照
+        // if (task === undefined) {
+        //     task = await repos.task.findTaskById(
+        //         {
+        //             id: { $eq: params.sameAs.id },
+        //             project: { id: { $eq: params.project.id } },
+        //             name: factory.taskName.CheckMovieTicket
+        //         },
+        //         ['status', 'executionResults']
+        //     );
+        // }
         if (task === undefined) {
             throw new factory_1.factory.errors.NotFound(factory_1.factory.taskName.CheckMovieTicket);
         }
@@ -43,18 +43,17 @@ function findCheckAction(params, options) {
                 break;
             default: {
                 // タスクがReadyでなければアクション検索
-                const authorizeAction = (await repos.checkMovieTicketAction.searchBySameAs({
-                    sameAs: { id: { $eq: task.id } },
-                    typeOf: { $eq: factory_1.factory.actionType.CheckAction }
+                const authorizeAction = (await repos.actions.checkMovieTicket.findActionBySameAs({
+                    sameAs: { id: task.id }
                     // purpose: { id: { $eq: String(params.purpose.id) } }
-                })).shift();
-                if (authorizeAction !== undefined) {
+                }));
+                if (typeof authorizeAction?.id === 'string') {
                     // purpose検証
                     if (authorizeAction.purpose?.id !== params.purpose.id) {
                         throw new factory_1.factory.errors.NotFound('Action');
                     }
                     // result from recipe(2024-06-10~)
-                    const purchaseNumberAuthResult = await repos.checkMovieTicketAction.findIMinimizedPurchaseNumberAuthResultByCheckMovieTicketRecipe({
+                    const purchaseNumberAuthResult = await repos.actions.checkMovieTicket.findIMinimizedPurchaseNumberAuthResultByCheckMovieTicketRecipe({
                         project: { id: params.project.id },
                         recipeFor: { id: authorizeAction.id }
                     });

package/lib/chevre/service/payment/any/invalidatePaymentUrl.d.ts

@@ -10,7 +10,6 @@ import type { OrderInTransactionRepo } from '../../../repo/orderInTransaction';
 import type { PlaceOrderRepo } from '../../../repo/transaction/placeOrder';
 interface IInvalidatePaymentUrlRepos {
     accountingReport: AccountingReportRepo;
-    action?: never;
     acceptPayAction: AcceptPayActionRepo;
     assetTransaction: AssetTransactionRepo;
     paymentAccepted: SellerPaymentAcceptedRepo;

package/lib/chevre/service/payment/any/onPayActionCompleted.d.ts

@@ -7,7 +7,6 @@ import type { PayActionRepo } from '../../../repo/action/pay';
 import type { RefundActionRepo } from '../../../repo/action/refund';
 import type { TaskRepo } from '../../../repo/task';
 interface IOnPayActionCompletedRepos {
-    action?: never;
     actions: {
         pay: PayActionRepo;
         refund: RefundActionRepo;

package/lib/chevre/service/payment/any/onPaymentStatusChanged.js

@@ -13,7 +13,7 @@ function onPaymentStatusChanged(params) {
             case factory_1.factory.actionType.PayAction: {
                 // アクションリポジトリから実アクションを参照する
                 // そうすることで、通知する情報は最低限で済む
-                const action = await repos.actions.pay.findById({ id: params.id, typeOf: params.typeOf });
+                const action = await repos.actions.pay.findAnyActionById({ id: params.id, typeOf: params.typeOf });
                 const optimizedAction = optimizeAction4report((action));
                 await (0, onPaid_1.onPaid)(optimizedAction, { id: action.project.id })(repos);
                 break;
@@ -21,7 +21,7 @@ function onPaymentStatusChanged(params) {
             case factory_1.factory.actionType.RefundAction: {
                 // アクションリポジトリから実アクションを参照する
                 // そうすることで、通知する情報は最低限で済む
-                const action = await repos.actions.refund.findById({ id: params.id, typeOf: params.typeOf });
+                const action = await repos.actions.refund.findAnyActionById({ id: params.id, typeOf: params.typeOf });
                 const optimizedAction = optimizeAction4report((action));
                 await (0, onRefunded_1.onRefunded)(optimizedAction, { id: action.project.id })(repos);
                 break;

package/lib/chevre/service/payment/any/onRefundActionCompletedOrFailed.d.ts

@@ -4,7 +4,6 @@ import type { PayActionRepo } from '../../../repo/action/pay';
 import type { RefundActionRepo } from '../../../repo/action/refund';
 import type { TaskRepo } from '../../../repo/task';
 interface IOnRefundActionCompletedOrFailedRepos {
-    action?: never;
     actions: {
         pay: PayActionRepo;
         refund: RefundActionRepo;

package/lib/chevre/service/payment/any/processVoidPayTransaction.d.ts

@@ -5,7 +5,6 @@ import type { AssetTransactionRepo } from '../../../repo/assetTransaction';
 import type { TaskRepo } from '../../../repo/task';
 import type { PlaceOrderRepo } from '../../../repo/transaction/placeOrder';
 interface IProcessVoidPayTransactionRepos {
-    action?: never;
     authorizePaymentMethodAction: AuthorizePaymentMethodActionRepo;
     accountingReport: AccountingReportRepo;
     assetTransaction: AssetTransactionRepo;

package/lib/chevre/service/payment/any/processVoidPayTransaction.js

@@ -58,7 +58,7 @@ function processVoidPayTransaction(params) {
         // 承認アクションを取得
         let authorizeActions;
         if (typeof params.id === 'string') {
-            const authorizeAction = await repos.authorizePaymentMethodAction.findById({ typeOf: factory_1.factory.actionType.AuthorizeAction, id: params.id });
+            const authorizeAction = await repos.authorizePaymentMethodAction.findAnyActionById({ typeOf: factory_1.factory.actionType.AuthorizeAction, id: params.id });
             // 取引内のアクションかどうか確認
             if (authorizeAction.purpose.typeOf !== transaction.typeOf || authorizeAction.purpose.id !== transaction.id) {
                 throw new factory_1.factory.errors.Argument('Transaction', 'Action not found in the transaction');
@@ -109,7 +109,7 @@ function processVoidPayTransaction(params) {
                 // 取引が存在すれば中止
                 const transactionNumber = action.object.paymentMethodId;
                 if (typeof transactionNumber === 'string' && transactionNumber.length > 0) {
-                    const payTransaction = (await repos.assetTransaction.search({
+                    const payTransaction = (await repos.assetTransaction.findAssetTransactionsByTypeOf({
                         limit: 1,
                         page: 1,
                         project: { id: { $eq: action.project.id } },

package/lib/chevre/service/payment/any/publishPaymentUrl.d.ts

@@ -60,7 +60,5 @@ declare function publishPaymentUrl(params: {
      */
     identifier?: string;
     instrument: factory.action.trade.pay.IAcceptedPaymentMethodOfferAsInstrument[];
-}, options: {
-    savePaymentMethodIdInTransaction: boolean;
 }): IPublishPaymentUrlOperation<Pick<PayTransactionService.IPublishPaymentUrlResult, 'paymentMethodId' | 'paymentUrl'>>;
 export { IPublishPaymentUrlRepos, publishPaymentUrl };

package/lib/chevre/service/payment/any/publishPaymentUrl.js

@@ -41,7 +41,7 @@ const factory_2 = require("./factory");
 /**
  * 外部決済ロケーションを発行する
  */
-function publishPaymentUrl(params, options) {
+function publishPaymentUrl(params) {
     return async (repos, settings) => {
         const { paymentServiceType, purpose, project } = params;
         if (purpose.typeOf !== factory_1.factory.transactionType.PlaceOrder) {
@@ -107,7 +107,7 @@ function publishPaymentUrl(params, options) {
             await repos.orderInTransaction.savePaymentMethodId({
                 id: transaction.id,
                 paymentMethod: { paymentMethodId: result.paymentMethodId }
-            }, options);
+            });
             return {
                 paymentMethodId: result.paymentMethodId,
                 paymentUrl: result.paymentUrl

package/lib/chevre/service/payment/any/voidPayTransaction.d.ts

@@ -22,7 +22,6 @@ declare function voidPayTransaction(params: factory.task.IData<factory.taskName.
     };
 }): (repos: {
     accountingReport: AccountingReportRepo;
-    action?: never;
     acceptPayAction: AcceptPayActionRepo;
     authorizePaymentMethodAction: AuthorizePaymentMethodActionRepo;
     assetTransaction: AssetTransactionRepo;

package/lib/chevre/service/payment/creditCard/authorize/processAuthorizeCreditCard.d.ts

@@ -9,7 +9,6 @@ interface ICreditCardPaymentAgencyTransaction {
     secureTran2Result?: never;
 }
 interface IProcessAuthorizeCreditCardRepos {
-    action?: never;
     authorizeInvoiceAction: AuthorizeInvoiceActionRepo;
     creditCardService: GMO.service.Credit;
 }

package/lib/chevre/service/payment/creditCard/authorize/processAuthorizeCreditCard3ds.d.ts

@@ -9,7 +9,6 @@ interface ICreditCardPaymentAgencyTransaction3ds {
     secureTran2Result: GMO.factory.service.credit.ISecureTran2Result;
 }
 interface IProcessAuthorizeCreditCard3dsRepos {
-    action?: never;
     authorizeInvoiceAction: AuthorizeInvoiceActionRepo;
     creditCardService: GMO.service.Credit;
 }

package/lib/chevre/service/payment/creditCard/authorize.d.ts

@@ -41,7 +41,6 @@ payTransaction: IPayTransactionAsAuthorizeInvoiceAction, paymentServiceId: strin
         id?: string;
     };
 }): (repos: {
-    action?: never;
     authorizeInvoiceAction: AuthorizeInvoiceActionRepo;
     paymentAccepted: SellerPaymentAcceptedRepo;
     paymentService: PaymentServiceRepo;

package/lib/chevre/service/payment/creditCard/payCreditCard.d.ts

@@ -11,7 +11,6 @@ import type { IntegrationSettingRepo as Settings } from '../../../repo/setting/i
  * クレジットカード決済
  */
 declare function payCreditCard(params: factory.action.trade.pay.IAttributes): (repos: {
-    action?: never;
     actions: {
         pay: PayActionRepo;
         refund: RefundActionRepo;

package/lib/chevre/service/payment/creditCard/refundCreditCard.d.ts

@@ -16,7 +16,6 @@ declare function refundCreditCard(params: Pick<factory.action.trade.refund.IAttr
         id: string;
     };
 }): (repos: {
-    action?: never;
     actions: {
         pay: PayActionRepo;
         refund: RefundActionRepo;

package/lib/chevre/service/payment/faceToFace.d.ts

@@ -11,7 +11,6 @@ declare function voidTransaction(__: factory.task.voidPayment.IData): (___: {
     product: ProductRepo;
 }) => Promise<void>;
 declare function payFaceToFace(params: factory.action.trade.pay.IAttributes): (repos: {
-    action?: never;
     actions: {
         pay: PayActionRepo;
         refund: RefundActionRepo;
@@ -21,7 +20,6 @@ declare function payFaceToFace(params: factory.action.trade.pay.IAttributes): (r
     task: TaskRepo;
 }) => Promise<void>;
 declare function refundFaceToFace(params: factory.task.refund.IData): (repos: {
-    action?: never;
     actions: {
         pay: PayActionRepo;
         refund: RefundActionRepo;

package/lib/chevre/service/payment/movieTicket/authorize.d.ts

@@ -39,12 +39,11 @@ declare function authorize(params: factory.assetTransaction.pay.IStartParamsWith
         id: string;
     };
 }): (repos: {
-    action?: never;
     actions: {
         pay: PayActionRepo;
         refund: RefundActionRepo;
+        checkMovieTicket: CheckMovieTicketActionRepo;
     };
-    checkMovieTicketAction: CheckMovieTicketActionRepo;
     accountingReport: AccountingReportRepo;
     credentials: CredentialsRepo;
     event: EventRepo;

package/lib/chevre/service/payment/movieTicket/checkMovieTicket.d.ts

@@ -8,7 +8,9 @@ import { factory } from '../../../factory';
 import type { IntegrationSettingRepo as Settings } from '../../../repo/setting/integration';
 import { ICheckResult } from './processPurchaseNumberAuth';
 interface ICheckOperationRepos {
-    checkMovieTicketAction: CheckMovieTicketActionRepo;
+    actions: {
+        checkMovieTicket: CheckMovieTicketActionRepo;
+    };
     credentials: CredentialsRepo;
     event: EventRepo;
     paymentAccepted: SellerPaymentAcceptedRepo;

package/lib/chevre/service/payment/movieTicket/checkMovieTicket.js

@@ -42,7 +42,7 @@ function checkMovieTicket(params) {
                 ? { sameAs: { id: params.sameAs.id, typeOf: 'Task' } } // タスク関連付け(2024-05-21~)
                 : undefined
         };
-        const action = await repos.checkMovieTicketAction.start(actionAttributes);
+        const action = await repos.actions.checkMovieTicket.start(actionAttributes);
         let processPurchaseNumberAuthResult;
         let recipe;
         try {
@@ -76,7 +76,7 @@ function checkMovieTicket(params) {
             // アクション保管用のエラーと両方保管(2024-05-22~)
             const errors = [(0, errorHandler_1.handleMvtkReserveError)(error), error];
             try {
-                await repos.checkMovieTicketAction.giveUp({ typeOf: actionAttributes.typeOf, id: action.id, error: errors });
+                await repos.actions.checkMovieTicket.giveUp({ typeOf: actionAttributes.typeOf, id: action.id, error: errors });
             }
             catch (__) {
                 // 失敗したら仕方ない
@@ -84,7 +84,7 @@ function checkMovieTicket(params) {
             throw errors[0];
         }
         const result = {};
-        await repos.checkMovieTicketAction.completeWithVoid({ typeOf: actionAttributes.typeOf, id: action.id, result, recipe });
+        await repos.actions.checkMovieTicket.completeWithVoid({ typeOf: actionAttributes.typeOf, id: action.id, result, recipe });
         return { result: processPurchaseNumberAuthResult };
     };
 }

package/lib/chevre/service/payment/movieTicket/payMovieTicket.d.ts

@@ -10,7 +10,6 @@ import type { TaskRepo } from '../../../repo/task';
 import { factory } from '../../../factory';
 import type { IntegrationSettingRepo as Settings } from '../../../repo/setting/integration';
 interface IPayOperationRepos {
-    action?: never;
     actions: {
         pay: PayActionRepo;
         refund: RefundActionRepo;

package/lib/chevre/service/payment/movieTicket/refundMovieTicket.d.ts

@@ -7,7 +7,6 @@ import type { TaskRepo } from '../../../repo/task';
 import { factory } from '../../../factory';
 import type { IntegrationSettingRepo as Settings } from '../../../repo/setting/integration';
 interface IRefundOperationRepos {
-    action?: never;
     actions: {
         pay: PayActionRepo;
         refund: RefundActionRepo;

package/lib/chevre/service/payment/movieTicket/validation.d.ts

@@ -7,7 +7,9 @@ import type { SellerPaymentAcceptedRepo } from '../../../repo/sellerPaymentAccep
 import type { TaskRepo } from '../../../repo/task';
 import { factory } from '../../../factory';
 export interface IValidateMovieTicketRepos {
-    checkMovieTicketAction: CheckMovieTicketActionRepo;
+    actions: {
+        checkMovieTicket: CheckMovieTicketActionRepo;
+    };
     credentials: CredentialsRepo;
     event: EventRepo;
     paymentAccepted: SellerPaymentAcceptedRepo;

package/lib/chevre/service/payment/movieTicket/validation.js

@@ -121,7 +121,7 @@ function checkByIdentifierIfNotYet(params) {
         }
         const specifiedCheckedActionId = params.checkedAction?.id;
         if (typeof specifiedCheckedActionId === 'string' && specifiedCheckedActionId !== '') {
-            alreadyCheckedAction = (await repos.checkMovieTicketAction.findCompletedCheckActions({
+            alreadyCheckedAction = (await repos.actions.checkMovieTicket.findCompletedCheckActions({
                 // limit: 1,
                 // page: 1,
                 // id: { $in: [specifiedCheckedActionId] },
@@ -163,7 +163,7 @@ function checkByIdentifierIfNotYet(params) {
         }
         debug('checkByIdentifierIfNotYet: alreadyCheckedAction:', JSON.stringify(alreadyCheckedAction), 'params:', JSON.stringify(params));
         if (alreadyCheckedAction !== undefined) {
-            const recipe = await repos.checkMovieTicketAction.findRecipeByAction({
+            const recipe = await repos.actions.checkMovieTicket.findRecipeByAction({
                 project: { id: params.screeningEvent.project.id },
                 recipeFor: { id: alreadyCheckedAction.id }
             });

package/lib/chevre/service/project.d.ts

@@ -2,7 +2,6 @@
  * プロジェクトサービス
  */
 import type { AccountTitleRepo } from '../repo/accountTitle';
-import type { ActionRepo } from '../repo/action';
 import type { AssetTransactionRepo } from '../repo/assetTransaction';
 import type { CategoryCodeRepo } from '../repo/categoryCode';
 import type { CreativeWorkRepo } from '../repo/creativeWork';
@@ -18,12 +17,10 @@ import type { ProductRepo } from '../repo/product';
 import type { ProjectRepo } from '../repo/project';
 import type { ReservationRepo } from '../repo/reservation';
 import type { SellerRepo } from '../repo/seller';
-import type { TaskRepo } from '../repo/task';
 export declare function deleteProject(params: {
     id: string;
 }): (repos: {
     accountTitle: AccountTitleRepo;
-    action: ActionRepo;
     categoryCode: CategoryCodeRepo;
     creativeWork: CreativeWorkRepo;
     event: EventRepo;
@@ -38,14 +35,12 @@ export declare function deleteProject(params: {
     movieTheater: MovieTheaterRepo;
     screeningRoom: ScreeningRoomRepo;
     seller: SellerRepo;
-    task: TaskRepo;
     assetTransaction: AssetTransactionRepo;
 }) => Promise<void>;
 export declare function cleanUpDatabaseByProject(params: {
     id: string;
 }): (repos: {
     accountTitle: AccountTitleRepo;
-    action: ActionRepo;
     assetTransaction: AssetTransactionRepo;
     categoryCode: CategoryCodeRepo;
     creativeWork: CreativeWorkRepo;
@@ -59,5 +54,4 @@ export declare function cleanUpDatabaseByProject(params: {
     movieTheater: MovieTheaterRepo;
     screeningRoom: ScreeningRoomRepo;
     seller: SellerRepo;
-    task: TaskRepo;
 }) => Promise<void>;

package/lib/chevre/service/project.js

@@ -13,7 +13,6 @@ function cleanUpDatabaseByProject(params) {
     return async (repos) => {
         // プロジェクトに所属する全データをリポジトリから削除する
         await repos.accountTitle.deleteByProject({ project: { id: params.id } });
-        await repos.action.deleteByProject({ project: { id: params.id } });
         await repos.assetTransaction.deleteByProject({ project: { id: params.id } });
         await repos.categoryCode.deleteCategoryCodesByProject({ project: { id: params.id } });
         await repos.movieTicketType.deleteMovieTicketTypesByProject({ project: { id: params.id } });
@@ -26,6 +25,5 @@ function cleanUpDatabaseByProject(params) {
         await repos.product.deleteByProject({ project: { id: params.id } });
         await repos.reservation.deleteByProject({ project: { id: params.id } });
         await repos.seller.deleteByProject({ project: { id: params.id } });
-        await repos.task.deleteByProject({ project: { id: params.id } });
     };
 }

package/lib/chevre/service/reserve/cancelReservation.d.ts

@@ -1,5 +1,5 @@
 import { factory } from '../../factory';
-import type { ActionRepo } from '../../repo/action';
+import type { CancelActionRepo } from '../../repo/action/cancel';
 import type { AssetTransactionRepo } from '../../repo/assetTransaction';
 import { OfferRateLimitRepo } from '../../repo/rateLimit/offer';
 import { ReservationRepo } from '../../repo/reservation';
@@ -10,7 +10,9 @@ import type { TaskRepo } from '../../repo/task';
  * 保留予約取消
  */
 declare function cancelPendingReservation(actionAttributes: factory.task.cancelPendingReservation.IPotentialCancelAction): (repos: {
-    action: ActionRepo;
+    actions: {
+        cancel: CancelActionRepo;
+    };
     assetTransaction: AssetTransactionRepo;
     stockHolder: StockHolderRepo;
     offerRateLimit: OfferRateLimitRepo;
@@ -22,7 +24,9 @@ declare function cancelPendingReservation(actionAttributes: factory.task.cancelP
  * 予約をキャンセルする
  */
 declare function cancelReservation(actionAttributesList: factory.action.cancel.reservation.IAttributes[]): (repos: {
-    action: ActionRepo;
+    actions: {
+        cancel: CancelActionRepo;
+    };
     stockHolder: StockHolderRepo;
     offerRateLimit: OfferRateLimitRepo;
     reservation: ReservationRepo;

package/lib/chevre/service/reserve/cancelReservation.js

@@ -39,7 +39,7 @@ function cancelPengindIfNotYet(params) {
     return async (repos) => {
         const reserveTransactionId = params.purpose.id;
         // 予約取引を検索
-        const reserveTransactions = await repos.assetTransaction.search({
+        const reserveTransactions = await repos.assetTransaction.findAssetTransactionsByTypeOf({
             limit: 1,
             page: 1,
             typeOf: factory_1.factory.assetTransactionType.Reserve,
@@ -52,24 +52,14 @@ function cancelPengindIfNotYet(params) {
         let actionId;
         const actionAttributes = (0, factory_2.createCancelPendingReservationAction)({ transaction: reserveTransaction });
         // 冪等性を担保(2023-06-05~)
-        const completedActions = await repos.action.findActionsByType({
-            limit: 1,
-            page: 1,
-            actionStatus: { $in: [factory_1.factory.actionStatusType.CompletedActionStatus] },
-            typeOf: { $eq: factory_1.factory.actionType.CancelAction },
-            object: {
-                typeOf: { $eq: factory_1.factory.reservationType.ReservationPackage },
-                reservationNumber: { $eq: reserveTransaction.transactionNumber }
-            },
-            purpose: {
-                id: { $in: [params.purpose.id] },
-                typeOf: { $in: [params.purpose.typeOf] }
-            }
-        }, ['id']);
-        if (completedActions.length === 0) {
+        const completedAction = await repos.actions.cancel.findCompletedCancelAction({
+            object: { reservationNumber: reserveTransaction.transactionNumber },
+            purpose: { id: params.purpose.id }
+        });
+        if (completedAction === null) {
             if (actionAttributes !== undefined) {
                 // アクション開始
-                const action = await repos.action.start(actionAttributes);
+                const action = await repos.actions.cancel.start(actionAttributes);
                 actionId = action.id;
                 const actionObject = actionAttributes.object;
                 // let cancelResult: ICancelResult | undefined;
@@ -126,7 +116,7 @@ function cancelPengindIfNotYet(params) {
                 }
                 catch (error) {
                     try {
-                        await repos.action.giveUp({ typeOf: action.typeOf, id: action.id, error });
+                        await repos.actions.cancel.giveUp({ typeOf: action.typeOf, id: action.id, error });
                     }
                     catch (__) {
                         // 失敗したら仕方ない
@@ -134,11 +124,11 @@ function cancelPengindIfNotYet(params) {
                     throw error;
                 }
                 const actionResult = {};
-                await repos.action.completeWithVoid({ typeOf: action.typeOf, id: action.id, result: actionResult });
+                await repos.actions.cancel.completeWithVoid({ typeOf: action.typeOf, id: action.id, result: actionResult });
             }
         }
         else {
-            actionId = completedActions.at(0)?.id;
+            actionId = completedAction.id;
         }
         return {
             reserveTransaction,
@@ -163,13 +153,13 @@ function cancelReservation(actionAttributesList) {
         const now = new Date();
         if (actionAttributesList.length > 0) {
             await Promise.all(actionAttributesList.map(async (actionAttributes) => {
-                const action = await repos.action.start(actionAttributes);
+                const action = await repos.actions.cancel.start(actionAttributes);
                 let cancelResult;
                 let canceledReservationForId;
                 try {
                     if (actionAttributes.object.typeOf === factory_1.factory.reservationType.ReservationPackage) {
                         // 予約取引を検索
-                        const reserveTransactions = await repos.assetTransaction.search({
+                        const reserveTransactions = await repos.assetTransaction.findAssetTransactionsByTypeOf({
                             limit: 1,
                             page: 1,
                             typeOf: factory_1.factory.assetTransactionType.Reserve,
@@ -226,7 +216,7 @@ function cancelReservation(actionAttributesList) {
                             inclusion: ['reservationNumber', 'reservationStatus', 'project', 'reservedTicket', 'subReservation', 'reservationFor']
                         });
                         // 予約取引を検索
-                        const reserveTransactions = await repos.assetTransaction.search({
+                        const reserveTransactions = await repos.assetTransaction.findAssetTransactionsByTypeOf({
                             limit: 1,
                             page: 1,
                             typeOf: factory_1.factory.assetTransactionType.Reserve,
@@ -275,7 +265,7 @@ function cancelReservation(actionAttributesList) {
                 }
                 catch (error) {
                     try {
-                        await repos.action.giveUp({ typeOf: action.typeOf, id: action.id, error });
+                        await repos.actions.cancel.giveUp({ typeOf: action.typeOf, id: action.id, error });
                     }
                     catch (__) {
                         // 失敗したら仕方ない
@@ -294,7 +284,7 @@ function cancelReservation(actionAttributesList) {
                     } : undefined
                     // canceledReservationId: canceledReservation?.id
                 };
-                await repos.action.completeWithVoid({ typeOf: action.typeOf, id: action.id, result: actionResult });
+                await repos.actions.cancel.completeWithVoid({ typeOf: action.typeOf, id: action.id, result: actionResult });
                 let canceledReservations = [];
                 if (actionAttributes.object.typeOf === factory_1.factory.reservationType.ReservationPackage) {
                     const reservationNumber = actionAttributes.object.reservationNumber;

package/lib/chevre/service/reserve/checkInReservation.d.ts

@@ -1,4 +1,4 @@
-import type { ActionRepo } from '../../repo/action';
+import type { ReserveActionRepo } from '../../repo/action/reserve';
 import type { AssetTransactionRepo } from '../../repo/assetTransaction';
 import type { AuthorizationRepo } from '../../repo/authorization';
 import type { ReservationRepo } from '../../repo/reservation';
@@ -32,7 +32,9 @@ interface ICheckInReservationParams {
     };
 }
 export declare function checkInReservation(params: ICheckInReservationParams): (repos: {
-    action: ActionRepo;
+    actions: {
+        reserve: ReserveActionRepo;
+    };
     assetTransaction: AssetTransactionRepo;
     code: AuthorizationRepo;
     reservation: ReservationRepo;

package/lib/chevre/service/reserve/checkInReservation.js

@@ -90,7 +90,7 @@ function reserveIfNotYet(params) {
     ) => {
         let reserveTransactions = [];
         if (Array.isArray(params.object.ids) && params.object.ids.length > 0) {
-            reserveTransactions = await repos.assetTransaction.search({
+            reserveTransactions = await repos.assetTransaction.findAssetTransactionsByTypeOf({
                 typeOf: factory_1.factory.assetTransactionType.Reserve,
                 object: {
                     reservations: { id: { $in: params.object.ids } }
@@ -100,7 +100,7 @@ function reserveIfNotYet(params) {
             debug(reserveTransactions.length, 'reserveTransactions found in reserveIfNotYet. ids:', params.object.ids, 'reserveTransactions:', JSON.stringify(reserveTransactions));
         }
         if (Array.isArray(params.object.reservationNumbers) && params.object.reservationNumbers.length > 0) {
-            reserveTransactions = await repos.assetTransaction.search({
+            reserveTransactions = await repos.assetTransaction.findAssetTransactionsByTypeOf({
                 typeOf: factory_1.factory.assetTransactionType.Reserve,
                 object: {
                     reservationNumber: { $in: params.object.reservationNumbers }

package/lib/chevre/service/reserve/confirmReservation.d.ts

@@ -1,5 +1,5 @@
 import { factory } from '../../factory';
-import type { ActionRepo } from '../../repo/action';
+import type { ReserveActionRepo } from '../../repo/action/reserve';
 import type { AssetTransactionRepo } from '../../repo/assetTransaction';
 import type { AuthorizationRepo } from '../../repo/authorization';
 import type { ReservationRepo } from '../../repo/reservation';
@@ -13,7 +13,9 @@ export declare function confirmReservation(params: {
     useOnReservationConfirmed: boolean;
     byTask: boolean;
 }): (repos: {
-    action: ActionRepo;
+    actions: {
+        reserve: ReserveActionRepo;
+    };
     assetTransaction: AssetTransactionRepo;
     code: AuthorizationRepo;
     reservation: ReservationRepo;