@chevre/domain 26.0.0-alpha.41 → 26.0.0-alpha.43

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,9 +122,7 @@ 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.findAssetTransactionsByTypeOf({
@@ -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/useReservation.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 { UseActionRepo } from '../../repo/action/use';
 import type { AssetTransactionRepo } from '../../repo/assetTransaction';
 import type { AuthorizationRepo } from '../../repo/authorization';
@@ -26,9 +26,9 @@ export declare function useReservation(params: {
         identifier?: string;
     };
 }): (repos: {
-    action: ActionRepo;
     actions: {
         use: UseActionRepo;
+        reserve: ReserveActionRepo;
     };
     assetTransaction: AssetTransactionRepo;
     code: AuthorizationRepo;

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

@@ -1,12 +1,14 @@
 import type { COA } from '@motionpicture/coa-service';
 import { factory } from '../../factory';
-import { ActionRepo } from '../../repo/action';
+import { CancelActionRepo } from '../../repo/action/cancel';
 declare function cancelPendingReservation(params: factory.task.cancelPendingReservation.IPotentialCancelCOAReserveAction & {
     project: {
         id: string;
     };
 }): (repos: {
-    action: ActionRepo;
+    actions: {
+        cancel: CancelActionRepo;
+    };
     reserveService: COA.service.Reserve;
 }) => Promise<void>;
 export { cancelPendingReservation };

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

@@ -23,7 +23,7 @@ function cancelPendingReservation(params) {
             processCancelPendingCOAReserveResult: { delTmpReserveArgs },
             project: { id: params.project.id }
         });
-        const action = await repos.action.start(actionAttributes, { recipe });
+        const action = await repos.actions.cancel.start(actionAttributes, { recipe });
         try {
             try {
                 await repos.reserveService.delTmpReserve(delTmpReserveArgs);
@@ -51,7 +51,7 @@ function cancelPendingReservation(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 (__) {
                 // 失敗したら仕方ない
@@ -59,6 +59,6 @@ function cancelPendingReservation(params) {
             throw error;
         }
         const actionResult = {};
-        await repos.action.completeWithVoid({ typeOf: action.typeOf, id: action.id, result: actionResult, recipe });
+        await repos.actions.cancel.completeWithVoid({ typeOf: action.typeOf, id: action.id, result: actionResult, recipe });
     };
 }

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

@@ -3,7 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.call = call;
 const coa_service_1 = require("@motionpicture/coa-service");
 const factory_1 = require("../../factory");
-const action_1 = require("../../repo/action");
+const cancel_1 = require("../../repo/action/cancel");
 const assetTransaction_1 = require("../../repo/assetTransaction");
 const offer_1 = require("../../repo/rateLimit/offer");
 const reservation_1 = require("../../repo/reservation");
@@ -33,7 +33,7 @@ function call(params) {
         // support COAReserve(2025-03-01~)
         if (data.purpose?.typeOf === factory_1.factory.assetTransactionType.Reserve) {
             await (0, cancelReservation_1.cancelPendingReservation)({ purpose: data.purpose })({
-                action: new action_1.ActionRepo(connection),
+                actions: { cancel: new cancel_1.CancelActionRepo(connection) },
                 assetTransaction: new assetTransaction_1.AssetTransactionRepo(connection),
                 stockHolder: new stockHolder_1.StockHolderRepo({ connection }),
                 offerRateLimit: new offer_1.OfferRateLimitRepo(redisClient),
@@ -63,7 +63,7 @@ function call(params) {
                 instrument,
                 project: { id: params.project.id }
             })({
-                action: new action_1.ActionRepo(connection),
+                actions: { cancel: new cancel_1.CancelActionRepo(connection) },
                 reserveService
             });
         }

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

@@ -2,7 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.call = call;
 const factory_1 = require("../../factory");
-const action_1 = require("../../repo/action");
+const cancel_1 = require("../../repo/action/cancel");
 const assetTransaction_1 = require("../../repo/assetTransaction");
 const offer_1 = require("../../repo/rateLimit/offer");
 const reservation_1 = require("../../repo/reservation");
@@ -20,15 +20,13 @@ function call(params) {
             throw new factory_1.factory.errors.Argument('settings', 'redisClient required');
         }
         await (0, cancelReservation_1.cancelReservation)(data.actionAttributes)({
-            action: new action_1.ActionRepo(connection),
+            actions: { cancel: new cancel_1.CancelActionRepo(connection) },
             reservation: new reservation_1.ReservationRepo(connection),
             setting: new setting_1.SettingRepo(connection),
             task: new task_1.TaskRepo(connection),
             assetTransaction: new assetTransaction_1.AssetTransactionRepo(connection),
             offerRateLimit: new offer_1.OfferRateLimitRepo(redisClient),
             stockHolder: new stockHolder_1.StockHolderRepo({ connection })
-        }
-        // settings
-        );
+        });
     };
 }

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

@@ -1,15 +1,14 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.call = call;
-const acceptedOffer_1 = require("../../repo/acceptedOffer");
-const accountingReport_1 = require("../../repo/accountingReport");
-const action_1 = require("../../repo/action");
+// import { AcceptedOfferRepo } from '../../repo/acceptedOffer';
+// import { AccountingReportRepo } from '../../repo/accountingReport';
+const confirm_1 = require("../../repo/action/confirm");
 const assetTransaction_1 = require("../../repo/assetTransaction");
-const event_1 = require("../../repo/event");
+// import { EventRepo } from '../../repo/event';
 const order_1 = require("../../repo/order");
-const project_1 = require("../../repo/project");
+// import { ProjectRepo } from '../../repo/project';
 const task_1 = require("../../repo/task");
-// import { TransactionRepo } from '../../repo/transaction';
 const confirmPayTransaction_1 = require("../order/confirmPayTransaction");
 /**
  * タスク実行関数
@@ -20,15 +19,15 @@ function call(params) {
             ...params.data,
             project: params.project
         }, {})({
-            acceptedOffer: new acceptedOffer_1.AcceptedOfferRepo(connection),
-            action: new action_1.ActionRepo(connection),
+            // acceptedOffer: new AcceptedOfferRepo(connection),
+            // action: new ActionRepo(connection),
+            actions: { confirm: new confirm_1.ConfirmActionRepo(connection) },
             assetTransaction: new assetTransaction_1.AssetTransactionRepo(connection),
             order: new order_1.OrderRepo(connection),
-            accountingReport: new accountingReport_1.AccountingReportRepo(connection),
-            event: new event_1.EventRepo(connection),
-            project: new project_1.ProjectRepo(connection),
+            // accountingReport: new AccountingReportRepo(connection),
+            // event: new EventRepo(connection),
+            // project: new ProjectRepo(connection),
             task: new task_1.TaskRepo(connection),
-            // transaction: new TransactionRepo(connection)
         });
     };
 }

package/lib/chevre/service/task/confirmReserveTransaction.d.ts

@@ -3,7 +3,8 @@ import { factory } from '../../factory';
 import type { IntegrationSettingRepo as Settings } from '../../repo/setting/integration';
 import type { ICallResult, IExecutableTaskKeys, IOperationExecute } from '../taskHandler';
 import { AcceptedOfferRepo } from '../../repo/acceptedOffer';
-import { ActionRepo } from '../../repo/action';
+import { ConfirmActionRepo } from '../../repo/action/confirm';
+import { ReserveActionRepo } from '../../repo/action/reserve';
 import { AssetTransactionRepo } from '../../repo/assetTransaction';
 import { AuthorizationRepo } from '../../repo/authorization';
 import { OrderRepo } from '../../repo/order';
@@ -30,7 +31,10 @@ export declare function confirmReserveTransaction(params: Omit<factory.task.IDat
     useOnOrderStatusChanged: boolean;
 }): (repos: {
     acceptedOffer: AcceptedOfferRepo;
-    action: ActionRepo;
+    actions: {
+        confirm: ConfirmActionRepo;
+        reserve: ReserveActionRepo;
+    };
     assetTransaction: AssetTransactionRepo;
     code: AuthorizationRepo;
     order: OrderRepo;

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

@@ -10,7 +10,8 @@ const confirm_1 = require("../assetTransaction/reserve/confirm");
 const reserveCOA_1 = require("../assetTransaction/reserveCOA");
 const factory_2 = require("../assetTransaction/reserveCOA/factory");
 const acceptedOffer_1 = require("../../repo/acceptedOffer");
-const action_1 = require("../../repo/action");
+const confirm_2 = require("../../repo/action/confirm");
+const reserve_1 = require("../../repo/action/reserve");
 const assetTransaction_1 = require("../../repo/assetTransaction");
 const authorization_1 = require("../../repo/authorization");
 const order_1 = require("../../repo/order");
@@ -53,7 +54,10 @@ function call(params) {
             useOnOrderStatusChanged: true
         })({
             acceptedOffer: new acceptedOffer_1.AcceptedOfferRepo(connection),
-            action: new action_1.ActionRepo(connection),
+            actions: {
+                confirm: new confirm_2.ConfirmActionRepo(connection),
+                reserve: new reserve_1.ReserveActionRepo(connection),
+            },
             assetTransaction: new assetTransaction_1.AssetTransactionRepo(connection),
             code: new authorization_1.AuthorizationRepo(connection),
             order: new order_1.OrderRepo(connection),
@@ -179,7 +183,7 @@ function confirmReserveTransaction(params, options) {
             object: confirmActionObject,
             ...(typeof sameAs?.id === 'string') ? { sameAs: { id: sameAs.id, typeOf: 'Task' } } : undefined // link sameAs(2024-06-10~)
         };
-        const action = await repos.action.start(confirmActionAttributes, {
+        const action = await repos.actions.confirm.start(confirmActionAttributes, {
             ...(recipe !== undefined) ? { recipe } : undefined // add recipe(2024-06-11~)
         });
         try {
@@ -209,7 +213,7 @@ function confirmReserveTransaction(params, options) {
         }
         catch (error) {
             try {
-                await repos.action.giveUp({ typeOf: confirmActionAttributes.typeOf, id: action.id, error });
+                await repos.actions.confirm.giveUp({ typeOf: confirmActionAttributes.typeOf, id: action.id, error });
             }
             catch (__) {
                 // 失敗したら仕方ない
@@ -219,7 +223,7 @@ function confirmReserveTransaction(params, options) {
         const result = {
         // ...(updReserveResult !== undefined) ? { updReserveResult } : {} // discontinue(2024-06-11~)
         };
-        await repos.action.completeWithVoid({
+        await repos.actions.confirm.completeWithVoid({
             typeOf: confirmActionAttributes.typeOf, id: action.id, result,
             ...(recipe !== undefined) ? { recipe } : undefined // add recipe(2024-06-11~)
         });

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

@@ -2,7 +2,6 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.call = call;
 const accountingReport_1 = require("../../repo/accountingReport");
-// import { ActionRepo } from '../../repo/action';
 const pay_1 = require("../../repo/action/pay");
 const refund_1 = require("../../repo/action/refund");
 const assetTransaction_1 = require("../../repo/assetTransaction");

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

@@ -3,15 +3,14 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.call = call;
 const factory_1 = require("../../factory");
 const acceptedOffer_1 = require("../../repo/acceptedOffer");
-const action_1 = require("../../repo/action");
+const reserve_1 = require("../../repo/action/reserve");
 const assetTransaction_1 = require("../../repo/assetTransaction");
 const authorization_1 = require("../../repo/authorization");
 const order_1 = require("../../repo/order");
-// import { OwnershipInfoRepo } from '../../repo/ownershipInfo';
 const reservation_1 = require("../../repo/reservation");
 const setting_1 = require("../../repo/setting");
 const task_1 = require("../../repo/task");
-const reserve_1 = require("../reserve");
+const reserve_2 = require("../reserve");
 /**
  * タスク実行関数
  */
@@ -19,11 +18,10 @@ function call(params) {
     return async ({ connection }) => {
         await onAuthorizationCreated(params)({
             acceptedOffer: new acceptedOffer_1.AcceptedOfferRepo(connection),
-            action: new action_1.ActionRepo(connection),
+            actions: { reserve: new reserve_1.ReserveActionRepo(connection) },
             assetTransaction: new assetTransaction_1.AssetTransactionRepo(connection),
             code: new authorization_1.AuthorizationRepo(connection),
             order: new order_1.OrderRepo(connection),
-            // ownershipInfo: new OwnershipInfoRepo(connection),
             reservation: new reservation_1.ReservationRepo(connection),
             setting: new setting_1.SettingRepo(connection),
             task: new task_1.TaskRepo(connection)
@@ -49,12 +47,6 @@ function onAuthorizationCreated(params) {
                     reservationNumbers = await repos.acceptedOffer.distinctValues({
                         orderNumber: { $in: [orderNumber] }
                     }, 'acceptedOffers.itemOffered.reservationNumber');
-                    // reservationForIds = await repos.acceptedOffer.distinctValues(
-                    //     {
-                    //         orderNumber: { $in: [orderNumber] }
-                    //     },
-                    //     'acceptedOffers.itemOffered.reservationFor.id'
-                    // );
                 }
                 break;
             case 'OwnershipInfo':
@@ -64,12 +56,11 @@ function onAuthorizationCreated(params) {
             default:
             // no op
         }
-        await (0, reserve_1.checkInReservation)({
+        await (0, reserve_2.checkInReservation)({
             project: { id: params.project.id },
             object: {
                 ids: reservationIds,
                 reservationNumbers: reservationNumbers
-                // reservationFor: { ids: reservationForIds }
             },
             purpose: { code: params.data.code },
             instrument: {

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

@@ -3,7 +3,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.call = call;
 const factory_1 = require("../../factory");
 const accountTitle_1 = require("../../repo/accountTitle");
-const action_1 = require("../../repo/action");
 const aggregateOffer_1 = require("../../repo/aggregateOffer");
 const categoryCode_1 = require("../../repo/categoryCode");
 const creativeWork_1 = require("../../repo/creativeWork");
@@ -34,7 +33,6 @@ function call(params) {
         const { data } = params;
         await onResourceUpdated(data)({
             accountTitle: new accountTitle_1.AccountTitleRepo(connection),
-            action: new action_1.ActionRepo(connection),
             aggregateOffer: new aggregateOffer_1.AggregateOfferRepo(connection),
             categoryCode: new categoryCode_1.CategoryCodeRepo(connection),
             creativeWork: new creativeWork_1.CreativeWorkRepo(connection),

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

@@ -4,7 +4,6 @@ exports.call = call;
 const factory_1 = require("../../factory");
 const acceptedOffer_1 = require("../../repo/acceptedOffer");
 const accountingReport_1 = require("../../repo/accountingReport");
-// import { ActionRepo } from '../../repo/action';
 const pay_1 = require("../../repo/action/pay");
 const refund_1 = require("../../repo/action/refund");
 const checkMovieTicket_1 = require("../../repo/action/checkMovieTicket");

package/lib/chevre/service/task/payment/invalidatePaymentUrlByTask.d.ts

@@ -10,7 +10,6 @@ import type { SellerPaymentAcceptedRepo } from '../../../repo/sellerPaymentAccep
 import type { TaskRepo } from '../../../repo/task';
 type IInvalidatePaymentUrlOperation<T> = (repos: {
     accountingReport: AccountingReportRepo;
-    action?: never;
     actions: {
         pay: PayActionRepo;
         refund: RefundActionRepo;

package/lib/chevre/service/task/payment/payByTask.d.ts

@@ -32,7 +32,6 @@ declare function payTask2payActionAttributes(params: factory.task.pay.IData & {
 }): (repos: IPayTask2payActionAttributesRepos) => Promise<factory.action.trade.pay.IAttributes>;
 interface IPayByTaskRepos {
     acceptedOffer: AcceptedOfferRepo;
-    action?: never;
     actions: {
         pay: PayActionRepo;
         refund: RefundActionRepo;

package/lib/chevre/service/task/payment/refundByTask.d.ts

@@ -17,7 +17,6 @@ declare function refundByTask(params: factory.task.refund.IData & {
         id: string;
     };
 }): (repos: {
-    action?: never;
     actions: {
         pay: PayActionRepo;
         refund: RefundActionRepo;

package/lib/chevre/service/task/payment/voidPaymentByTask.d.ts

@@ -1,5 +1,4 @@
 import type { AccountingReportRepo } from '../../../repo/accountingReport';
-import type { ActionRepo } from '../../../repo/action';
 import type { PayActionRepo } from '../../../repo/action/pay';
 import type { RefundActionRepo } from '../../../repo/action/refund';
 import type { AuthorizeInvoiceActionRepo } from '../../../repo/action/authorizeInvoice';
@@ -13,7 +12,6 @@ import type { TaskRepo } from '../../../repo/task';
 import { factory } from '../../../factory';
 import type { IntegrationSettingRepo as Settings } from '../../../repo/setting/integration';
 declare function voidPaymentByTask(params: factory.task.voidPayment.IData): (repos: {
-    action: ActionRepo;
     actions: {
         pay: PayActionRepo;
         refund: RefundActionRepo;

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

@@ -4,11 +4,11 @@ exports.call = call;
 const factory_1 = require("../../factory");
 const acceptedOffer_1 = require("../../repo/acceptedOffer");
 const accountingReport_1 = require("../../repo/accountingReport");
-const action_1 = require("../../repo/action");
+const order_1 = require("../../repo/action/order");
 const authorizeOffer_1 = require("../../repo/action/authorizeOffer");
 const authorizePaymentMethod_1 = require("../../repo/action/authorizePaymentMethod");
 const message_1 = require("../../repo/message");
-const order_1 = require("../../repo/order");
+const order_2 = require("../../repo/order");
 const orderInTransaction_1 = require("../../repo/orderInTransaction");
 const setting_1 = require("../../repo/setting");
 const integration_1 = require("../../repo/setting/integration");
@@ -29,11 +29,13 @@ function call(params) {
         })({
             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),
+            actions: {
+                order: new order_1.OrderActionRepo(connection),
+                authorizeOffer: new authorizeOffer_1.AuthorizeOfferActionRepo(connection),
+                authorizePaymentMethod: new authorizePaymentMethod_1.AuthorizePaymentMethodActionRepo(connection),
+            },
             message: new message_1.MessageRepo(connection),
-            order: new order_1.OrderRepo(connection),
+            order: new order_2.OrderRepo(connection),
             orderInTransaction: new orderInTransaction_1.OrderInTransactionRepo(connection),
             setting: new setting_1.SettingRepo(connection),
             task: new task_1.TaskRepo(connection),

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

@@ -3,7 +3,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.call = call;
 const factory_1 = require("../../factory");
 const accountingReport_1 = require("../../repo/accountingReport");
-// import { ActionRepo } from '../../repo/action';
 const pay_1 = require("../../repo/action/pay");
 const refund_1 = require("../../repo/action/refund");
 const assetTransaction_1 = require("../../repo/assetTransaction");

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

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.call = call;
-const action_1 = require("../../repo/action");
+const reserve_1 = require("../../repo/action/reserve");
 const assetTransaction_1 = require("../../repo/assetTransaction");
 const authorization_1 = require("../../repo/authorization");
 const reservation_1 = require("../../repo/reservation");
@@ -15,19 +15,16 @@ function call(params) {
     return async ({ connection }) => {
         const { data } = params;
         await (0, confirmReservation_1.confirmReservation)({
-            // actionAttributesList: data.actionAttributes,
             potentialReserveAction: data, // optimize(2024-07-01~)
             useOnReservationConfirmed: true,
             byTask: true
         })({
-            action: new action_1.ActionRepo(connection),
+            actions: { reserve: new reserve_1.ReserveActionRepo(connection) },
             assetTransaction: new assetTransaction_1.AssetTransactionRepo(connection),
             code: new authorization_1.AuthorizationRepo(connection),
             reservation: new reservation_1.ReservationRepo(connection),
             setting: new setting_1.SettingRepo(connection),
             task: new task_1.TaskRepo(connection)
-        }
-        // settings
-        );
+        });
     };
 }

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

@@ -2,7 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.call = call;
 const acceptedOffer_1 = require("../../repo/acceptedOffer");
-const action_1 = require("../../repo/action");
+const returnAction_1 = require("../../repo/action/returnAction");
 const order_1 = require("../../repo/order");
 const setting_1 = require("../../repo/setting");
 const task_1 = require("../../repo/task");
@@ -19,9 +19,8 @@ function call(params) {
             useOnOrderStatusChanged: true
         })({
             acceptedOffer: new acceptedOffer_1.AcceptedOfferRepo(connection),
-            action: new action_1.ActionRepo(connection),
+            actions: { returnAction: new returnAction_1.ReturnActionRepo(connection) },
             order: new order_1.OrderRepo(connection),
-            // ownershipInfo: new OwnershipInfoRepo(connection),
             setting: new setting_1.SettingRepo(connection),
             task: new task_1.TaskRepo(connection),
             returnOrder: new returnOrder_1.ReturnOrderRepo(connection)

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

@@ -39,7 +39,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.call = call;
 const moment_1 = __importDefault(require("moment"));
 const factory_1 = require("../../factory");
-const action_1 = require("../../repo/action");
+const returnAction_1 = require("../../repo/action/returnAction");
 const pay_1 = require("../../repo/action/pay");
 const assetTransaction_1 = require("../../repo/assetTransaction");
 const order_1 = require("../../repo/order");
@@ -54,17 +54,14 @@ const RefundTransactionService = __importStar(require("../assetTransaction/refun
  * タスク実行関数
  */
 function call(params) {
-    return async ({ redisClient, connection }) => {
-        if (redisClient === undefined) {
-            throw new factory_1.factory.errors.Argument('settings', 'redisClient required');
-        }
+    return async ({ connection }) => {
         await returnPayTransaction({
             ...params.data,
             sameAs: { id: params.id }
         })({
-            action: new action_1.ActionRepo(connection),
             actions: {
                 pay: new pay_1.PayActionRepo(connection),
+                returnAction: new returnAction_1.ReturnActionRepo(connection)
             },
             assetTransaction: new assetTransaction_1.AssetTransactionRepo(connection),
             order: new order_1.OrderRepo(connection),
@@ -156,8 +153,7 @@ function returnPayTransaction(taskData) {
             transactionNumber = (await repos.transactionNumber.publishByTimestamp({ startDate: new Date() })).transactionNumber;
         }
         const refundActionAttributes = task2actionAttributes({ taskData, transactionNumber, order });
-        const action = await repos.action.start(refundActionAttributes);
-        // let refundTransaction: Pick<factory.assetTransaction.refund.ITransaction, 'id' | 'transactionNumber' | 'typeOf'> | undefined;
+        const action = await repos.actions.returnAction.start(refundActionAttributes);
         try {
             if (typeof transactionNumber === 'string') {
                 const refundFee = transaction2refundFee({ returnOrderTransaction }); // 返品手数料
@@ -177,7 +173,6 @@ function returnPayTransaction(taskData) {
                     product: repos.product,
                     assetTransaction: repos.assetTransaction
                 });
-                // refundTransaction = { id, transactionNumber, typeOf };
                 await RefundTransactionService.confirm({
                     transactionNumber,
                     potentialActions: { refund: { purpose: refundPurpose } }
@@ -188,17 +183,15 @@ function returnPayTransaction(taskData) {
         }
         catch (error) {
             try {
-                await repos.action.giveUp({ typeOf: action.typeOf, id: action.id, error });
+                await repos.actions.returnAction.giveUp({ typeOf: action.typeOf, id: action.id, error });
             }
             catch (__) {
                 // no op
             }
             throw error;
         }
-        const result = {
-        // ...(typeof refundTransaction?.id === 'string') ? { refundTransaction } : undefined // migrate into instrument(2024-06-17~)
-        }; // optimize(2024-04-27~)
-        await repos.action.completeWithVoid({ typeOf: action.typeOf, id: action.id, result: result });
+        const result = {}; // optimize(2024-04-27~)
+        await repos.actions.returnAction.completeWithVoid({ typeOf: action.typeOf, id: action.id, result: result });
         await onRefund({ refundActionAttributes, order })({ task: repos.task });
     };
 }