@chevre/domain 26.0.0-alpha.8 → 26.0.0

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,7 +39,6 @@ declare function authorize(params: factory.assetTransaction.pay.IStartParamsWith
         id: string;
     };
 }): (repos: {
-    action?: never;
     actions: {
         pay: PayActionRepo;
         refund: RefundActionRepo;

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/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;

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

@@ -78,19 +78,6 @@ function reserveTransaction2action(params) {
     // if (typeof transaction.object.underName?.typeOf === 'string') {
     //     underName = transaction.object.underName;
     // }
-    // const moneyTransferActions: factory.action.transfer.moneyTransfer.IAttributes[] = [];
-    // const pendingReservations = (Array.isArray(transaction.object.subReservation)) ? transaction.object.subReservation : [];
-    // pendingReservations.forEach((reservation) => {
-    //     const acceptedOffer4reservation = transaction.object.acceptedOffer?.find(
-    //         (o) => o.itemOffered?.serviceOutput?.id === reservation.id
-    //     );
-    //     moneyTransferActions.push(...createMoneyTransferActions({
-    //         acceptedOffer: acceptedOffer4reservation,
-    //         reservation,
-    //         transaction: params.transaction,
-    //         underName
-    //     }));
-    // });
     const reservationPackage = {
         reservationFor: {
             id: String(reservationFor.id),
@@ -135,12 +122,10 @@ function createReservationUnderName(params) {
         ...((typeof telephone === 'string') && { telephone })
     };
 }
-function reserveIfNotYet(
-// params: factory.action.reserve.IAttributes,
-params, options) {
+function reserveIfNotYet(params, options) {
     return async (repos) => {
         const reservationPackage = params.object;
-        const reserveTransaction = (await repos.assetTransaction.search({
+        const reserveTransaction = (await repos.assetTransaction.findAssetTransactionsByTypeOf({
             limit: 1,
             page: 1,
             typeOf: factory_1.factory.assetTransactionType.Reserve,
@@ -152,23 +137,12 @@ params, options) {
         const actionAttributes = reserveTransaction2action({ transaction: reserveTransaction });
         // 冪等性を担保(2023-05-31~)
         debug('searching completed reserveAction... byTask:', options?.byTask, 'reservationNumber:', reservationPackage.reservationNumber);
-        const completedActions = await repos.action.findActionsByType({
-            limit: 1,
-            page: 1,
-            actionStatus: { $in: [factory_1.factory.actionStatusType.CompletedActionStatus] },
-            typeOf: { $eq: actionAttributes.typeOf },
-            object: {
-                typeOf: { $eq: actionAttributes.object.typeOf }
-                // reservationNumber: { $eq: params.object.reservationNumber }
-            },
-            purpose: {
-                id: { $in: [actionAttributes.purpose.id] },
-                typeOf: { $in: [actionAttributes.purpose.typeOf] }
-            }
-        }, ['id']);
-        debug(completedActions.length, 'completed reserveAction found. byTask:', options?.byTask, 'reservationNumber:', reservationPackage.reservationNumber);
-        if (completedActions.length === 0) {
-            const action = await repos.action.start(actionAttributes);
+        const completedAction = await repos.actions.reserve.findCompletedReserveAction({
+            purpose: { id: actionAttributes.purpose.id }
+        });
+        debug(completedAction?.id, 'completed reserveAction found. byTask:', options?.byTask, 'reservationNumber:', reservationPackage.reservationNumber);
+        if (completedAction === null) {
+            const action = await repos.actions.reserve.start(actionAttributes);
             try {
                 let underName;
                 const underNameByTransaction = reserveTransaction.object.underName;
@@ -217,7 +191,7 @@ params, options) {
             }
             catch (error) {
                 try {
-                    await repos.action.giveUp({ typeOf: action.typeOf, id: action.id, error });
+                    await repos.actions.reserve.giveUp({ typeOf: action.typeOf, id: action.id, error });
                 }
                 catch (__) {
                     // 失敗したら仕方ない
@@ -225,7 +199,7 @@ params, options) {
                 throw error;
             }
             const actionResult = {};
-            await repos.action.completeWithVoid({ typeOf: action.typeOf, id: action.id, result: actionResult });
+            await repos.actions.reserve.completeWithVoid({ typeOf: action.typeOf, id: action.id, result: actionResult });
         }
         return { actionAttributes, reserveTransaction };
     };

package/lib/chevre/service/reserve/potentialActions/onReservationConfirmed.js

@@ -42,7 +42,7 @@ function onReservationConfirmed(confirmedReservations, reserveAction) {
                     // );
                     const taskIdentifier = `${project.id}:${factory_1.factory.taskName.OnAuthorizationCreated}:${factory_1.factory.assetTransactionType.Reserve}:${reservationNumber}:onReservationConfirmed`;
                     onAuthorizationCreatedTask = {
-                        alternateName: taskIdentifier,
+                        // alternateName: taskIdentifier,
                         identifier: taskIdentifier,
                         name: factory_1.factory.taskName.OnAuthorizationCreated,
                         status: factory_1.factory.taskStatus.Ready,

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

@@ -1,5 +1,6 @@
 import { factory } from '../../factory';
-import type { ActionRepo } from '../../repo/action';
+import type { ReserveActionRepo } from '../../repo/action/reserve';
+import type { UseActionRepo } from '../../repo/action/use';
 import type { AssetTransactionRepo } from '../../repo/assetTransaction';
 import type { AuthorizationRepo } from '../../repo/authorization';
 import type { OrderRepo } from '../../repo/order';
@@ -25,7 +26,10 @@ export declare function useReservation(params: {
         identifier?: string;
     };
 }): (repos: {
-    action: ActionRepo;
+    actions: {
+        use: UseActionRepo;
+        reserve: ReserveActionRepo;
+    };
     assetTransaction: AssetTransactionRepo;
     code: AuthorizationRepo;
     order: OrderRepo;

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

@@ -23,8 +23,6 @@ function useReservation(params) {
                     break;
                 }
             }
-            // } else {
-            //     ticketToken = params?.instrument?.ticketToken;
         }
         // if (params.verifyToken === true) {} // タスク作成前に検証済なので検証不要
         // confirmReservationが間に合わない可能性を考慮する(2023-06-01~)
@@ -33,29 +31,15 @@ function useReservation(params) {
         const reservation = await repos.reservation.findReservationById({
             id: reservationId,
             inclusion: [
-                // 'issuedThrough',
-                // 'reservedTicket',
                 'project', 'reservationFor', 'reservationNumber', 'typeOf'
             ]
         });
-        // if (typeof reservation.issuedThrough.id !== 'string') {
-        //     // COA予約では予約使用アクションを想定していないので、興行idは必ず存在するはず
-        //     throw new factory.errors.Internal('reservation.issuedThrough.id must be string');
-        // }
-        // const { reservedTicket } = reservation;
         // optimize(2026-05-06~)
         const reservationAsObject = {
             id: reservation.id,
             reservationNumber: reservation.reservationNumber,
             typeOf: reservation.typeOf,
-            reservationFor: { id: reservation.reservationFor.id, typeOf: reservation.reservationFor.typeOf },
-            // discontinue issuedThrough,reservedTicket(2026-05-06~)
-            // issuedThrough: { id: reservation.issuedThrough.id, typeOf: reservation.issuedThrough.typeOf },
-            // reservedTicket: {
-            //     typeOf: reservedTicket.typeOf,
-            //     ...(typeof reservedTicket.identifier === 'string') ? { identifier: reservedTicket.identifier } : undefined,
-            //     ...(typeof reservedTicket.ticketedSeat?.typeOf === 'string') ? { ticketedSeat: reservedTicket.ticketedSeat } : undefined
-            // }
+            reservationFor: { id: reservation.reservationFor.id, typeOf: reservation.reservationFor.typeOf }
         };
         // extend instrument to array(2025-02-18~)
         const instrument = [
@@ -79,7 +63,7 @@ function useReservation(params) {
                 ? { location: { typeOf: factory_1.factory.placeType.Place, identifier: params.location.identifier } }
                 : undefined
         };
-        const action = await repos.action.start(actionAttributes);
+        const action = await repos.actions.use.startUseAction(actionAttributes);
         // ひとまず予約数:1に限定する
         if (actionAttributes.object.length !== 1) {
             throw new factory_1.factory.errors.Argument('object', 'number of using reservations must be 1');
@@ -91,14 +75,14 @@ function useReservation(params) {
         }
         catch (error) {
             try {
-                await repos.action.giveUp({ typeOf: action.typeOf, id: action.id, error });
+                await repos.actions.use.giveUpUseAction({ typeOf: action.typeOf, id: action.id, error });
             }
             catch (__) {
                 // 失敗したら仕方ない
             }
             throw error;
         }
-        await repos.action.completeWithVoid({ typeOf: action.typeOf, id: action.id, result: {} });
+        await repos.actions.use.completeUseAction({ typeOf: action.typeOf, id: action.id });
         await (0, onReservationUsed_1.onReservationUsed)(attendedReservation, {
             ...actionAttributes,
             id: action.id,
@@ -107,12 +91,10 @@ function useReservation(params) {
     };
 }
 function reserveIfNotYet(params) {
-    return async (repos
-    // settings: Settings
-    ) => {
+    return async (repos) => {
         let reserveTransactions = [];
         if (typeof params.object.id === 'string' && params.object.id.length > 0) {
-            reserveTransactions = await repos.assetTransaction.search({
+            reserveTransactions = await repos.assetTransaction.findAssetTransactionsByTypeOf({
                 typeOf: factory_1.factory.assetTransactionType.Reserve,
                 object: {
                     reservations: { id: { $in: [params.object.id] } }