@chevre/domain 24.0.0-alpha.4 → 24.0.0-alpha.41

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

@@ -28,6 +28,12 @@ const factory = __importStar(require("../../factory"));
 const acceptedPaymentMethod_1 = require("../../repo/acceptedPaymentMethod");
 const accountingReport_1 = require("../../repo/accountingReport");
 const action_1 = require("../../repo/action");
+const pay_1 = require("../../repo/action/pay");
+const refund_1 = require("../../repo/action/refund");
+const checkMovieTicket_1 = require("../../repo/action/checkMovieTicket");
+const acceptPay_1 = require("../../repo/action/acceptPay");
+const authorizeInvoice_1 = require("../../repo/action/authorizeInvoice");
+const authorizePaymentMethod_1 = require("../../repo/action/authorizePaymentMethod");
 const assetTransaction_1 = require("../../repo/assetTransaction");
 const authorization_1 = require("../../repo/authorization");
 const confirmationNumber_1 = require("../../repo/confirmationNumber");
@@ -43,7 +49,8 @@ const project_1 = require("../../repo/project");
 const sellerPaymentAccepted_1 = require("../../repo/sellerPaymentAccepted");
 const task_1 = require("../../repo/task");
 const ticket_1 = require("../../repo/ticket");
-const transaction_1 = require("../../repo/transaction");
+// import { TransactionRepo } from '../../repo/transaction';
+const placeOrder_1 = require("../../repo/transaction/placeOrder");
 const transactionNumber_1 = require("../../repo/transactionNumber");
 // import { TransactionProcessRepo } from '../../repo/transactionProcess';
 const any_1 = require("../payment/any");
@@ -60,7 +67,8 @@ function call(params) {
             return;
         }
         let callResult;
-        const actionRepo = new action_1.ActionRepo(connection);
+        // const actionRepo = new ActionRepo(connection);
+        const authorizePaymentMethodActionRepo = new authorizePaymentMethod_1.AuthorizePaymentMethodActionRepo(connection);
         // const transactionProcessRepo = new TransactionProcessRepo(redisClient, { lockExpiresInSeconds: 120 });
         const paymentServiceId = params.data.object.issuedThrough.id;
         const credentialsExpireInSeconds = settings.movieticketReserve.credentialsExpireInSeconds;
@@ -74,7 +82,15 @@ function call(params) {
             })({
                 acceptedPaymentMethod: new acceptedPaymentMethod_1.AcceptedPaymentMethodRepo(connection),
                 accountingReport: new accountingReport_1.AccountingReportRepo(connection),
-                action: actionRepo,
+                action: new action_1.ActionRepo(connection),
+                actions: {
+                    pay: new pay_1.PayActionRepo(connection),
+                    refund: new refund_1.RefundActionRepo(connection),
+                },
+                checkMovieTicketAction: new checkMovieTicket_1.CheckMovieTicketActionRepo(connection),
+                acceptPayAction: new acceptPay_1.AcceptPayActionRepo(connection),
+                authorizeInvoiceAction: new authorizeInvoice_1.AuthorizeInvoiceActionRepo(connection),
+                authorizePaymentMethodAction: authorizePaymentMethodActionRepo,
                 assetTransaction: new assetTransaction_1.AssetTransactionRepo(connection),
                 authorization: new authorization_1.AuthorizationRepo(connection),
                 confirmationNumber: new confirmationNumber_1.ConfirmationNumberRepo({ connection }),
@@ -93,7 +109,8 @@ function call(params) {
                 project: new project_1.ProjectRepo(connection),
                 task: new task_1.TaskRepo(connection),
                 ticket: new ticket_1.TicketRepo(connection),
-                transaction: new transaction_1.TransactionRepo(connection),
+                placeOrder: new placeOrder_1.PlaceOrderRepo(connection),
+                // transaction: new TransactionRepo(connection),
                 transactionNumber: new transactionNumber_1.TransactionNumberRepo({ connection })
                 // transactionProcess: transactionProcessRepo
             }, settings);
@@ -101,7 +118,7 @@ function call(params) {
         catch (error) {
             let throwsError = true;
             // アクションが存在すればタスクを実行済扱いにする
-            const action = (await actionRepo.searchBySameAs({
+            const action = (await authorizePaymentMethodActionRepo.searchBySameAs({
                 sameAs: { id: { $eq: params.id } },
                 purpose: { id: { $eq: params.data.purpose.id } },
                 typeOf: { $eq: factory.actionType.AuthorizeAction }

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

@@ -25,7 +25,7 @@ var __importStar = (this && this.__importStar) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.call = call;
 const factory = __importStar(require("../../factory"));
-const action_1 = require("../../repo/action");
+const checkMovieTicket_1 = require("../../repo/action/checkMovieTicket");
 const credentials_1 = require("../../repo/credentials");
 const event_1 = require("../../repo/event");
 const paymentService_1 = require("../../repo/paymentService");
@@ -45,7 +45,7 @@ function call(params) {
         if (!options.executeById) {
             return;
         }
-        const actionRepo = new action_1.ActionRepo(connection);
+        const actionRepo = new checkMovieTicket_1.CheckMovieTicketActionRepo(connection);
         // const transactionProcessRepo = new TransactionProcessRepo(redisClient, { lockExpiresInSeconds: 120 });
         const paymentServiceId = params.data.object[0]?.id;
         const credentialsExpireInSeconds = settings.movieticketReserve.credentialsExpireInSeconds;
@@ -56,7 +56,7 @@ function call(params) {
                 ...params.data,
                 sameAs: { id: params.id, typeOf: 'Task' }
             })({
-                action: actionRepo,
+                checkMovieTicketAction: actionRepo,
                 credentials: new credentials_1.CredentialsRepo(redisClient, {
                     scope: `${factory.service.paymentService.PaymentServiceType.MovieTicket}:${paymentServiceId}`,
                     expireInSeconds: (useCredentialsRepo) ? credentialsExpireInSeconds : 0

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

@@ -26,7 +26,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.call = call;
 const factory = __importStar(require("../../factory"));
 const acceptedOffer_1 = require("../../repo/acceptedOffer");
-const action_1 = require("../../repo/action");
+const checkThing_1 = require("../../repo/action/checkThing");
 const assetTransaction_1 = require("../../repo/assetTransaction");
 const event_1 = require("../../repo/event");
 const order_1 = require("../../repo/order");
@@ -43,7 +43,7 @@ function call(params) {
         if (redisClient === undefined) {
             throw new factory.errors.Argument('settings', 'redisClient required');
         }
-        const actionRepo = new action_1.ActionRepo(connection);
+        const actionRepo = new checkThing_1.CheckThingActionRepo(connection);
         const { data } = params;
         const actionAttributes = {
             agent: { id: params.project.id, typeOf: factory.organizationType.Project },

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

@@ -9,7 +9,7 @@ const event_1 = require("../../repo/event");
 const order_1 = require("../../repo/order");
 const project_1 = require("../../repo/project");
 const task_1 = require("../../repo/task");
-const transaction_1 = require("../../repo/transaction");
+// import { TransactionRepo } from '../../repo/transaction';
 const confirmPayTransaction_1 = require("../order/confirmPayTransaction");
 /**
  * タスク実行関数
@@ -29,7 +29,7 @@ function call(params) {
             event: new event_1.EventRepo(connection),
             project: new project_1.ProjectRepo(connection),
             task: new task_1.TaskRepo(connection),
-            transaction: new transaction_1.TransactionRepo(connection)
+            // transaction: new TransactionRepo(connection)
         });
     };
 }

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

@@ -176,7 +176,7 @@ function confirmReserveTransaction(params, options) {
         // let updReserveResult: COA.factory.reserve.IUpdReserveResult | undefined;
         let recipe;
         switch (params.object.typeOf) {
-            case factory.assetTransactionType.COAReserveTransaction:
+            case factory.assetTransactionType.COAReserveTransaction: {
                 // 最適化されたタスクに対応するため、ここでIObject4COAを注文から生成する(2024-01-24~)
                 const order = await fixOrderAsPurpose({
                     project: { id: params.project.id },
@@ -194,6 +194,7 @@ function confirmReserveTransaction(params, options) {
                     project: { id: params.project.id }
                 });
                 break;
+            }
             default:
                 confirmActionObject = params.object;
         }
@@ -210,7 +211,7 @@ function confirmReserveTransaction(params, options) {
         try {
             const object = confirmActionAttributes.object;
             switch (object.typeOf) {
-                case factory.assetTransactionType.COAReserveTransaction:
+                case factory.assetTransactionType.COAReserveTransaction: {
                     // COA本予約
                     const processConfirmCOAReserveResult = await (0, reserveCOA_1.confirm)({
                         project: { id: confirmActionAttributes.project.id },
@@ -223,6 +224,7 @@ function confirmReserveTransaction(params, options) {
                         project: { id: confirmActionAttributes.project.id }
                     });
                     break;
+                }
                 default:
                     // 予約取引確定
                     await (0, confirm_1.confirm)({

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

@@ -389,7 +389,6 @@ function getCreditCardPaymentServiceChannel(params) {
 function createDeleteTransactionTask(params) {
     return async (repos) => {
         const deleteTransactionTasks = [
-            factory.transactionType.MoneyTransfer,
             factory.transactionType.PlaceOrder,
             factory.transactionType.ReturnOrder
         ].map((transactionType) => {

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

@@ -37,6 +37,8 @@ const reservation_1 = require("../../repo/reservation");
 const setting_1 = require("../../repo/setting");
 const task_1 = require("../../repo/task");
 const transaction_1 = require("../../repo/transaction");
+const placeOrder_1 = require("../../repo/transaction/placeOrder");
+const returnOrder_1 = require("../../repo/transaction/returnOrder");
 const TransactionService = __importStar(require("../transaction"));
 /**
  * タスク実行関数
@@ -56,7 +58,9 @@ function call(data) {
             reservation: new reservation_1.ReservationRepo(connection),
             setting: new setting_1.SettingRepo(connection),
             task: new task_1.TaskRepo(connection),
-            transaction: new transaction_1.TransactionRepo(connection)
+            transaction: new transaction_1.TransactionRepo(connection),
+            placeOrder: new placeOrder_1.PlaceOrderRepo(connection),
+            returnOrder: new returnOrder_1.ReturnOrderRepo(connection),
         });
     };
 }

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

@@ -3,6 +3,8 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.call = call;
 const accountingReport_1 = require("../../repo/accountingReport");
 const action_1 = require("../../repo/action");
+const pay_1 = require("../../repo/action/pay");
+const refund_1 = require("../../repo/action/refund");
 const assetTransaction_1 = require("../../repo/assetTransaction");
 const paymentService_1 = require("../../repo/paymentService");
 const paymentServiceProvider_1 = require("../../repo/paymentServiceProvider");
@@ -17,6 +19,10 @@ function call(params) {
         })({
             accountingReport: new accountingReport_1.AccountingReportRepo(connection),
             action: new action_1.ActionRepo(connection),
+            actions: {
+                pay: new pay_1.PayActionRepo(connection),
+                refund: new refund_1.RefundActionRepo(connection),
+            },
             assetTransaction: new assetTransaction_1.AssetTransactionRepo(connection),
             paymentAccepted: new sellerPaymentAccepted_1.SellerPaymentAcceptedRepo(connection),
             paymentService: new paymentService_1.PaymentServiceRepo(connection),

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

@@ -6,7 +6,8 @@ const assetTransaction_1 = require("../../repo/assetTransaction");
 const order_1 = require("../../repo/order");
 const setting_1 = require("../../repo/setting");
 const task_1 = require("../../repo/task");
-const transaction_1 = require("../../repo/transaction");
+// import { TransactionRepo } from '../../repo/transaction';
+const placeOrder_1 = require("../../repo/transaction/placeOrder");
 const onAssetTransactionStatusChanged_1 = require("../order/onAssetTransactionStatusChanged");
 /**
  * タスク実行関数
@@ -19,7 +20,8 @@ function call(data) {
             order: new order_1.OrderRepo(connection),
             setting: new setting_1.SettingRepo(connection),
             task: new task_1.TaskRepo(connection),
-            transaction: new transaction_1.TransactionRepo(connection)
+            // transaction: new TransactionRepo(connection),
+            placeOrder: new placeOrder_1.PlaceOrderRepo(connection)
         }, settings);
     };
 }

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

@@ -5,7 +5,7 @@ const acceptedOffer_1 = require("../../repo/acceptedOffer");
 const order_1 = require("../../repo/order");
 const setting_1 = require("../../repo/setting");
 const task_1 = require("../../repo/task");
-const transaction_1 = require("../../repo/transaction");
+const placeOrder_1 = require("../../repo/transaction/placeOrder");
 const payOrder_1 = require("../order/payOrder");
 /**
  * タスク実行関数
@@ -17,7 +17,7 @@ function call(data) {
             order: new order_1.OrderRepo(connection),
             setting: new setting_1.SettingRepo(connection),
             task: new task_1.TaskRepo(connection),
-            transaction: new transaction_1.TransactionRepo(connection)
+            placeOrder: new placeOrder_1.PlaceOrderRepo(connection)
         }, settings);
     };
 }

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

@@ -450,7 +450,7 @@ function createInformMovieTheaterTasks(params, setting) {
         // );
         // 入場ゲートを廃止(2026-01-17~)
         const movieTheaters4inform = movieTheaters.map((movieTheater) => {
-            const { hasEntranceGate, ...movieTheaterWithoutEntranceGates } = movieTheater;
+            const { hasEntranceGate, ...movieTheaterWithoutEntranceGates } = movieTheater; // eslint-disable-line @typescript-eslint/no-unused-vars
             return {
                 ...movieTheaterWithoutEntranceGates
                 // ...movieTheater

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

@@ -28,6 +28,9 @@ const factory = __importStar(require("../../factory"));
 const acceptedOffer_1 = require("../../repo/acceptedOffer");
 const accountingReport_1 = require("../../repo/accountingReport");
 const action_1 = require("../../repo/action");
+const pay_1 = require("../../repo/action/pay");
+const refund_1 = require("../../repo/action/refund");
+const checkMovieTicket_1 = require("../../repo/action/checkMovieTicket");
 const assetTransaction_1 = require("../../repo/assetTransaction");
 const credentials_1 = require("../../repo/credentials");
 const event_1 = require("../../repo/event");
@@ -51,7 +54,8 @@ function call(params) {
             ...params.data,
             sameAs: { id: params.id, typeOf: 'Task' } // タスクIDを関連付け(2024-04-20~)
         })({
-            action: new action_1.ActionRepo(connection),
+            // action: new ActionRepo(connection),
+            checkMovieTicketAction: new checkMovieTicket_1.CheckMovieTicketActionRepo(connection),
             acceptedOffer: new acceptedOffer_1.AcceptedOfferRepo(connection),
             assetTransaction: new assetTransaction_1.AssetTransactionRepo(connection),
             order: new order_1.OrderRepo(connection)
@@ -69,6 +73,10 @@ function call(params) {
             acceptedOffer: new acceptedOffer_1.AcceptedOfferRepo(connection),
             accountingReport: new accountingReport_1.AccountingReportRepo(connection),
             action: new action_1.ActionRepo(connection),
+            actions: {
+                pay: new pay_1.PayActionRepo(connection),
+                refund: new refund_1.RefundActionRepo(connection),
+            },
             assetTransaction: new assetTransaction_1.AssetTransactionRepo(connection),
             credentials: new credentials_1.CredentialsRepo(redisClient, {
                 scope: `${factory.service.paymentService.PaymentServiceType.MovieTicket}:${paymentServiceId}`,

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

@@ -2,6 +2,8 @@ import * as factory from '../../../factory';
 import { Settings } from '../../../settings';
 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 { AssetTransactionRepo } from '../../../repo/assetTransaction';
 import type { PaymentServiceRepo } from '../../../repo/paymentService';
 import type { PaymentServiceProviderRepo } from '../../../repo/paymentServiceProvider';
@@ -10,6 +12,10 @@ import type { TaskRepo } from '../../../repo/task';
 type IInvalidatePaymentUrlOperation<T> = (repos: {
     accountingReport: AccountingReportRepo;
     action: ActionRepo;
+    actions: {
+        pay: PayActionRepo;
+        refund: RefundActionRepo;
+    };
     paymentAccepted: SellerPaymentAcceptedRepo;
     paymentService: PaymentServiceRepo;
     paymentServiceProvider: PaymentServiceProviderRepo;

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

@@ -1,6 +1,9 @@
 import type { AcceptedOfferRepo } from '../../../repo/acceptedOffer';
 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 { CheckMovieTicketActionRepo } from '../../../repo/action/checkMovieTicket';
 import type { AssetTransactionRepo } from '../../../repo/assetTransaction';
 import type { CredentialsRepo } from '../../../repo/credentials';
 import type { EventRepo } from '../../../repo/event';
@@ -13,6 +16,12 @@ import type { SellerPaymentAcceptedRepo } from '../../../repo/sellerPaymentAccep
 import type { TaskRepo } from '../../../repo/task';
 import * as factory from '../../../factory';
 import { Settings } from '../../../settings';
+interface IPayTask2payActionAttributesRepos {
+    checkMovieTicketAction: CheckMovieTicketActionRepo;
+    acceptedOffer: AcceptedOfferRepo;
+    assetTransaction: AssetTransactionRepo;
+    order: OrderRepo;
+}
 declare function payTask2payActionAttributes(params: factory.task.pay.IData & {
     sameAs?: {
         /**
@@ -21,18 +30,14 @@ declare function payTask2payActionAttributes(params: factory.task.pay.IData & {
         id: string;
         typeOf: 'Task';
     };
-}): (repos: {
-    action: ActionRepo;
-    acceptedOffer: AcceptedOfferRepo;
-    assetTransaction: AssetTransactionRepo;
-    order: OrderRepo;
-}) => Promise<factory.action.trade.pay.IAttributes>;
-/**
- * 決済確定
- */
-declare function payByTask(payActionAttributes: factory.action.trade.pay.IAttributes): (repos: {
+}): (repos: IPayTask2payActionAttributesRepos) => Promise<factory.action.trade.pay.IAttributes>;
+interface IPayByTaskRepos {
     acceptedOffer: AcceptedOfferRepo;
     action: ActionRepo;
+    actions: {
+        pay: PayActionRepo;
+        refund: RefundActionRepo;
+    };
     accountingReport: AccountingReportRepo;
     assetTransaction: AssetTransactionRepo;
     credentials: CredentialsRepo;
@@ -44,5 +49,9 @@ declare function payByTask(payActionAttributes: factory.action.trade.pay.IAttrib
     product: ProductRepo;
     project: ProjectRepo;
     task: TaskRepo;
-}, settings: Settings) => Promise<void>;
-export { payByTask, payTask2payActionAttributes };
+}
+/**
+ * 決済確定
+ */
+declare function payByTask(payActionAttributes: factory.action.trade.pay.IAttributes): (repos: IPayByTaskRepos, settings: Settings) => Promise<void>;
+export { IPayTask2payActionAttributesRepos, IPayByTaskRepos, payByTask, payTask2payActionAttributes };

package/lib/chevre/service/task/payment/payByTask.js

@@ -125,7 +125,7 @@ function payTask2payActionAttributes(params) {
             let checkResult;
             const checkedActionId = transaction.object.checkedAction?.id;
             if (typeof checkedActionId === 'string' && checkedActionId !== '') {
-                const recipe = await repos.action.findRecipeByAction({
+                const recipe = await repos.checkMovieTicketAction.findRecipeByAction({
                     project: { id: transaction.project.id },
                     recipeFor: { id: checkedActionId }
                 });
@@ -177,7 +177,7 @@ payActionAttributes) {
             case factory.service.paymentService.PaymentServiceType.CreditCard:
                 await CreditCardPaymentService.payCreditCard(payActionAttributes)(repos, settings);
                 break;
-            case factory.service.paymentService.PaymentServiceType.MovieTicket:
+            case factory.service.paymentService.PaymentServiceType.MovieTicket: {
                 // check purpose(2025-02-12~)
                 const purpose = payActionAttributes.purpose;
                 if (purpose?.typeOf !== factory.order.OrderType.Order) {
@@ -188,6 +188,7 @@ payActionAttributes) {
                     purpose
                 }, { callOnPayActionCompleted: true })(repos, settings);
                 break;
+            }
             default:
                 throw new factory.errors.NotImplemented(`Payment service '${paymentServiceType}' not implemented`);
         }

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

@@ -1,5 +1,7 @@
 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 { AssetTransactionRepo } from '../../../repo/assetTransaction';
 import type { CredentialsRepo } from '../../../repo/credentials';
 import type { PaymentServiceRepo } from '../../../repo/paymentService';
@@ -17,6 +19,10 @@ declare function refundByTask(params: factory.task.refund.IData & {
     };
 }): (repos: {
     action: ActionRepo;
+    actions: {
+        pay: PayActionRepo;
+        refund: RefundActionRepo;
+    };
     accountingReport: AccountingReportRepo;
     credentials: CredentialsRepo;
     paymentAccepted: SellerPaymentAcceptedRepo;

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

@@ -1,5 +1,8 @@
 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';
 import type { CredentialsRepo } from '../../../repo/credentials';
 import type { PaymentServiceRepo } from '../../../repo/paymentService';
 import type { PaymentServiceProviderRepo } from '../../../repo/paymentServiceProvider';
@@ -11,6 +14,11 @@ import * as factory from '../../../factory';
 import { Settings } from '../../../settings';
 declare function voidPaymentByTask(params: factory.task.voidPayment.IData): (repos: {
     action: ActionRepo;
+    actions: {
+        pay: PayActionRepo;
+        refund: RefundActionRepo;
+    };
+    authorizeInvoiceAction: AuthorizeInvoiceActionRepo;
     accountingReport: AccountingReportRepo;
     credentials: CredentialsRepo;
     paymentAccepted: SellerPaymentAcceptedRepo;

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

@@ -4,29 +4,35 @@ exports.call = call;
 const acceptedOffer_1 = require("../../repo/acceptedOffer");
 const accountingReport_1 = require("../../repo/accountingReport");
 const action_1 = require("../../repo/action");
+const authorizeOffer_1 = require("../../repo/action/authorizeOffer");
+const authorizePaymentMethod_1 = require("../../repo/action/authorizePaymentMethod");
 const order_1 = require("../../repo/order");
 const orderInTransaction_1 = require("../../repo/orderInTransaction");
 const setting_1 = require("../../repo/setting");
 const task_1 = require("../../repo/task");
-const transaction_1 = require("../../repo/transaction");
-const placeOrder_1 = require("../order/placeOrder");
+// import { TransactionRepo } from '../../repo/transaction';
+const placeOrder_1 = require("../../repo/transaction/placeOrder");
+const placeOrder_2 = require("../order/placeOrder");
 /**
  * タスク実行関数
  */
 function call(data) {
     return async ({ connection, settings }) => {
-        await (0, placeOrder_1.placeOrder)({
+        await (0, placeOrder_2.placeOrder)({
             ...data,
             useOnOrderStatusChanged: true
         })({
             acceptedOffer: new acceptedOffer_1.AcceptedOfferRepo(connection),
             accountingReport: new accountingReport_1.AccountingReportRepo(connection),
             action: new action_1.ActionRepo(connection),
+            authorizeOfferAction: new authorizeOffer_1.AuthorizeOfferActionRepo(connection),
+            authorizePaymentMethodAction: new authorizePaymentMethod_1.AuthorizePaymentMethodActionRepo(connection),
             order: new order_1.OrderRepo(connection),
             orderInTransaction: new orderInTransaction_1.OrderInTransactionRepo(connection),
             setting: new setting_1.SettingRepo(connection),
             task: new task_1.TaskRepo(connection),
-            transaction: new transaction_1.TransactionRepo(connection)
+            // transaction: new TransactionRepo(connection),
+            placeOrder: new placeOrder_1.PlaceOrderRepo(connection)
         }, settings);
     };
 }

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

@@ -26,7 +26,9 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.call = call;
 const factory = __importStar(require("../../factory"));
 const acceptedPaymentMethod_1 = require("../../repo/acceptedPaymentMethod");
-const action_1 = require("../../repo/action");
+// import { ActionRepo } from '../../repo/action';
+const acceptPay_1 = require("../../repo/action/acceptPay");
+const authorizeInvoice_1 = require("../../repo/action/authorizeInvoice");
 const assetTransaction_1 = require("../../repo/assetTransaction");
 const authorization_1 = require("../../repo/authorization");
 const event_1 = require("../../repo/event");
@@ -37,7 +39,8 @@ const paymentServiceProvider_1 = require("../../repo/paymentServiceProvider");
 const project_1 = require("../../repo/project");
 const sellerPaymentAccepted_1 = require("../../repo/sellerPaymentAccepted");
 const ticket_1 = require("../../repo/ticket");
-const transaction_1 = require("../../repo/transaction");
+// import { TransactionRepo } from '../../repo/transaction';
+const placeOrder_1 = require("../../repo/transaction/placeOrder");
 const transactionNumber_1 = require("../../repo/transactionNumber");
 // import { TransactionProcessRepo } from '../../repo/transactionProcess';
 const any_1 = require("../payment/any");
@@ -53,7 +56,7 @@ function call(params) {
         if (!options.executeById) {
             return;
         }
-        const actionRepo = new action_1.ActionRepo(connection);
+        const actionRepo = new acceptPay_1.AcceptPayActionRepo(connection);
         // const transactionProcessRepo = new TransactionProcessRepo(redisClient, { lockExpiresInSeconds: 120 });
         try {
             await (0, any_1.publishPaymentUrl)({
@@ -62,7 +65,9 @@ function call(params) {
                 sameAs: { id: params.id }
             })({
                 acceptedPaymentMethod: new acceptedPaymentMethod_1.AcceptedPaymentMethodRepo(connection),
-                action: actionRepo,
+                // action: new ActionRepo(connection),
+                acceptPayAction: actionRepo,
+                authorizeInvoiceAction: new authorizeInvoice_1.AuthorizeInvoiceActionRepo(connection),
                 assetTransaction: new assetTransaction_1.AssetTransactionRepo(connection),
                 authorization: new authorization_1.AuthorizationRepo(connection),
                 event: new event_1.EventRepo(connection),
@@ -73,7 +78,8 @@ function call(params) {
                 paymentServiceProvider: new paymentServiceProvider_1.PaymentServiceProviderRepo(connection),
                 project: new project_1.ProjectRepo(connection),
                 ticket: new ticket_1.TicketRepo(connection),
-                transaction: new transaction_1.TransactionRepo(connection),
+                placeOrder: new placeOrder_1.PlaceOrderRepo(connection),
+                // transaction: new TransactionRepo(connection),
                 transactionNumber: new transactionNumber_1.TransactionNumberRepo({ connection })
             }, settings);
         }

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

@@ -27,6 +27,8 @@ exports.call = call;
 const factory = __importStar(require("../../factory"));
 const accountingReport_1 = require("../../repo/accountingReport");
 const action_1 = require("../../repo/action");
+const pay_1 = require("../../repo/action/pay");
+const refund_1 = require("../../repo/action/refund");
 const assetTransaction_1 = require("../../repo/assetTransaction");
 const credentials_1 = require("../../repo/credentials");
 const paymentService_1 = require("../../repo/paymentService");
@@ -62,6 +64,10 @@ function call(params) {
         await (0, refundByTask_1.refundByTask)(data)({
             accountingReport: new accountingReport_1.AccountingReportRepo(connection),
             action: new action_1.ActionRepo(connection),
+            actions: {
+                pay: new pay_1.PayActionRepo(connection),
+                refund: new refund_1.RefundActionRepo(connection),
+            },
             credentials: new credentials_1.CredentialsRepo(redisClient, {
                 scope: `${factory.service.paymentService.PaymentServiceType.MovieTicket}:${paymentServiceId}`,
                 expireInSeconds: (useCredentialsRepo) ? credentialsExpireInSeconds : 0

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

@@ -7,14 +7,14 @@ const order_1 = require("../../repo/order");
 const ownershipInfo_1 = require("../../repo/ownershipInfo");
 const setting_1 = require("../../repo/setting");
 const task_1 = require("../../repo/task");
-const transaction_1 = require("../../repo/transaction");
-const returnOrder_1 = require("../order/returnOrder");
+const returnOrder_1 = require("../../repo/transaction/returnOrder");
+const returnOrder_2 = require("../order/returnOrder");
 /**
  * タスク実行関数
  */
 function call(data) {
     return async ({ connection }) => {
-        await (0, returnOrder_1.returnOrder)({
+        await (0, returnOrder_2.returnOrder)({
             ...data,
             useOnOrderStatusChanged: true
         })({
@@ -24,7 +24,7 @@ function call(data) {
             ownershipInfo: new ownershipInfo_1.OwnershipInfoRepo(connection),
             setting: new setting_1.SettingRepo(connection),
             task: new task_1.TaskRepo(connection),
-            transaction: new transaction_1.TransactionRepo(connection)
+            returnOrder: new returnOrder_1.ReturnOrderRepo(connection)
         }
         // settings
         );

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

@@ -36,7 +36,8 @@ const paymentService_1 = require("../../repo/paymentService");
 const potentialAction_1 = require("../../repo/potentialAction");
 const product_1 = require("../../repo/product");
 const task_1 = require("../../repo/task");
-const transaction_1 = require("../../repo/transaction");
+// import { TransactionRepo } from '../../repo/transaction';
+const returnOrder_1 = require("../../repo/transaction/returnOrder");
 const transactionNumber_1 = require("../../repo/transactionNumber");
 const RefundTransactionService = __importStar(require("../assetTransaction/refund"));
 /**
@@ -58,7 +59,7 @@ function call(params) {
             potentialAction: new potentialAction_1.PotentialActionRepo(connection),
             product: new product_1.ProductRepo(connection),
             task: new task_1.TaskRepo(connection),
-            transaction: new transaction_1.TransactionRepo(connection),
+            returnOrder: new returnOrder_1.ReturnOrderRepo(connection),
             transactionNumber: new transactionNumber_1.TransactionNumberRepo({ connection })
         });
     };
@@ -104,7 +105,7 @@ function fixOrderAndTransaction(params) {
         }
         // const orderNumber = params.purpose.orderNumber;
         const orderNumber = orderByPaymentMethodId.orderNumber;
-        const returnOrderTransaction = (await repos.transaction.projectFields({
+        const returnOrderTransaction = (await repos.returnOrder.findReturnOrderTransactions({
             limit: 1,
             page: 1,
             typeOf: factory.transactionType.ReturnOrder,

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

@@ -101,7 +101,7 @@ function returnReserve(params) {
         });
         try {
             switch (params.object.typeOf) {
-                case factory.assetTransactionType.COAReserveTransaction:
+                case factory.assetTransactionType.COAReserveTransaction: {
                     const processReturnCOAReserveResult = await CancelReservationCOAService.confirm({ object: params.object })({
                         reserveService: repos.reserveService
                     });
@@ -110,6 +110,7 @@ function returnReserve(params) {
                         project: { id: project.id }
                     });
                     break;
+                }
                 default:
                     await processCancelReservation4chevre(params, {
                         id: action.id,