@chevre/domain 24.0.0-alpha.2 → 24.0.0-alpha.21

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

@@ -1,5 +1,6 @@
 import type { AccountingReportRepo } from '../../../repo/accountingReport';
 import type { ActionRepo } from '../../../repo/action';
+import type { CheckMovieTicketActionRepo } from '../../../repo/action/checkMovieTicket';
 import type { CredentialsRepo } from '../../../repo/credentials';
 import type { EventRepo } from '../../../repo/event';
 import type { PaymentServiceRepo } from '../../../repo/paymentService';
@@ -38,6 +39,7 @@ declare function authorize(params: factory.assetTransaction.pay.IStartParamsWith
     };
 }): (repos: {
     action: ActionRepo;
+    checkMovieTicketAction: CheckMovieTicketActionRepo;
     accountingReport: AccountingReportRepo;
     credentials: CredentialsRepo;
     event: EventRepo;

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

@@ -1,4 +1,4 @@
-import type { ActionRepo } from '../../../repo/action';
+import type { CheckMovieTicketActionRepo } from '../../../repo/action/checkMovieTicket';
 import type { CredentialsRepo } from '../../../repo/credentials';
 import type { EventRepo } from '../../../repo/event';
 import type { PaymentServiceRepo } from '../../../repo/paymentService';
@@ -8,7 +8,7 @@ import * as factory from '../../../factory';
 import { Settings } from '../../../settings';
 import { ICheckResult } from './processPurchaseNumberAuth';
 interface ICheckOperationRepos {
-    action: ActionRepo;
+    checkMovieTicketAction: CheckMovieTicketActionRepo;
     credentials: CredentialsRepo;
     event: EventRepo;
     paymentAccepted: SellerPaymentAcceptedRepo;
@@ -22,4 +22,4 @@ type ICheckOperation<T> = (repos: ICheckOperationRepos, settings: Settings) => P
 declare function checkMovieTicket(params: factory.action.check.paymentMethod.movieTicket.IAttributes): ICheckOperation<{
     result: ICheckResult;
 }>;
-export { checkMovieTicket };
+export { ICheckOperationRepos, checkMovieTicket };

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

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

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

@@ -1,4 +1,4 @@
-import type { ActionRepo } from '../../../repo/action';
+import type { CheckMovieTicketActionRepo } from '../../../repo/action/checkMovieTicket';
 import type { CredentialsRepo } from '../../../repo/credentials';
 import type { EventRepo } from '../../../repo/event';
 import type { PaymentServiceRepo } from '../../../repo/paymentService';
@@ -7,6 +7,15 @@ import type { SellerPaymentAcceptedRepo } from '../../../repo/sellerPaymentAccep
 import type { TaskRepo } from '../../../repo/task';
 import * as factory from '../../../factory';
 import { Settings } from '../../../settings';
+export interface IValidateMovieTicketRepos {
+    checkMovieTicketAction: CheckMovieTicketActionRepo;
+    credentials: CredentialsRepo;
+    event: EventRepo;
+    paymentAccepted: SellerPaymentAcceptedRepo;
+    paymentService: PaymentServiceRepo;
+    paymentServiceProvider: PaymentServiceProviderRepo;
+    task: TaskRepo;
+}
 export declare function validateMovieTicket(params: factory.assetTransaction.pay.IStartParamsWithoutDetail, paymentServiceId: string, checkedAction: {
     id: string;
 }, purpose: {
@@ -14,14 +23,6 @@ export declare function validateMovieTicket(params: factory.assetTransaction.pay
      * placeOrder ID
      */
     id?: string;
-}): (repos: {
-    action: ActionRepo;
-    credentials: CredentialsRepo;
-    event: EventRepo;
-    paymentAccepted: SellerPaymentAcceptedRepo;
-    paymentService: PaymentServiceRepo;
-    paymentServiceProvider: PaymentServiceProviderRepo;
-    task: TaskRepo;
-}, settings: Settings) => Promise<{
+}): (repos: IValidateMovieTicketRepos, settings: Settings) => Promise<{
     accountsReceivablesByServiceType: factory.assetTransaction.pay.IAccountsReceivableByServiceType[];
 }>;

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

@@ -139,24 +139,26 @@ function checkByIdentifierIfNotYet(params) {
         }
         const specifiedCheckedActionId = params.checkedAction?.id;
         if (typeof specifiedCheckedActionId === 'string' && specifiedCheckedActionId !== '') {
-            alreadyCheckedAction = (await repos.action.search({
-                limit: 1,
-                page: 1,
-                id: { $in: [specifiedCheckedActionId] },
-                actionStatus: { $in: [factory.actionStatusType.CompletedActionStatus] },
-                ...(typeof placeOrderId === 'string') ? { purpose: { id: { $in: [placeOrderId] } } } : undefined
-            }, ['id'])).shift();
+            alreadyCheckedAction = (await repos.checkMovieTicketAction.findCompletedCheckActions({
+                // limit: 1,
+                // page: 1,
+                // id: { $in: [specifiedCheckedActionId] },
+                id: specifiedCheckedActionId,
+                // actionStatus: { $in: [factory.actionStatusType.CompletedActionStatus] },
+                // ...(typeof placeOrderId === 'string') ? { purpose: { id: { $in: [placeOrderId] } } } : undefined
+                ...(typeof placeOrderId === 'string') ? { purpose: { id: placeOrderId } } : undefined
+            })).shift();
             if (alreadyCheckedAction === undefined) {
                 throw new factory.errors.NotFound(factory.actionType.CheckAction);
             }
         }
         else {
-            alreadyCheckedAction = (await repos.action.search({
-                limit: 1,
-                page: 1,
+            alreadyCheckedAction = (await repos.checkMovieTicketAction.findCompletedCheckActions({
+                // limit: 1,
+                // page: 1,
                 sort: { startDate: factory.sortType.Descending },
-                typeOf: { $eq: factory.actionType.CheckAction },
-                actionStatus: { $in: [factory.actionStatusType.CompletedActionStatus] },
+                // typeOf: { $eq: factory.actionType.CheckAction },
+                // actionStatus: { $in: [factory.actionStatusType.CompletedActionStatus] },
                 object: {
                     typeOf: { $eq: factory.service.paymentService.PaymentServiceType.MovieTicket },
                     id: { $eq: params.paymentServiceId }, // 指定の決済サービスにおいて
@@ -167,11 +169,13 @@ function checkByIdentifierIfNotYet(params) {
                         }
                     }
                 },
-                ...(typeof placeOrderId === 'string') ? { purpose: { id: { $in: [placeOrderId] } } } : undefined
-            }, ['id'])).shift();
+                // ...(typeof placeOrderId === 'string') ? { purpose: { id: { $in: [placeOrderId] } } } : undefined
+                ...(typeof placeOrderId === 'string') ? { purpose: { id: placeOrderId } } : undefined
+            })).shift();
         }
+        debug('checkByIdentifierIfNotYet: alreadyCheckedAction:', JSON.stringify(alreadyCheckedAction), 'params:', JSON.stringify(params));
         if (alreadyCheckedAction !== undefined) {
-            const recipe = await repos.action.findRecipeByAction({
+            const recipe = await repos.checkMovieTicketAction.findRecipeByAction({
                 project: { id: params.screeningEvent.project.id },
                 recipeFor: { id: alreadyCheckedAction.id }
             });

package/lib/chevre/service/report/telemetry.d.ts

@@ -6,6 +6,7 @@ import type { ActionRepo } from '../../repo/action';
 import type { TaskRepo } from '../../repo/task';
 import type { TelemetryRepo } from '../../repo/telemetry';
 import type { TransactionRepo } from '../../repo/transaction';
+import type { PlaceOrderRepo } from '../../repo/transaction/placeOrder';
 import * as factory from '../../factory';
 export type TelemetryOperation<T> = (repos: {
     telemetry: TelemetryRepo;
@@ -15,6 +16,7 @@ export type TaskOperation<T> = (repos: {
 }) => Promise<T>;
 export type TransactionOperation<T> = (repos: {
     transaction: TransactionRepo;
+    placeOrder: PlaceOrderRepo;
 }) => Promise<T>;
 export type TaskAndTransactionOperation<T> = (repos: {
     task: TaskRepo;
@@ -27,12 +29,14 @@ export type TaskAndTransactionAndActionOperation<T> = (repos: {
 }) => Promise<T>;
 export type TransactionAndActionOperation<T> = (repos: {
     transaction: TransactionRepo;
+    placeOrder: PlaceOrderRepo;
     action: ActionRepo;
 }) => Promise<T>;
 export type TaskAndTelemetryAndTransactionOperation<T> = (repos: {
     task: TaskRepo;
     telemetry: TelemetryRepo;
     transaction: TransactionRepo;
+    placeOrder: PlaceOrderRepo;
     action: ActionRepo;
 }) => Promise<T>;
 export interface IGlobalFlowTaskResultByName {

package/lib/chevre/service/report/telemetry.js

@@ -100,10 +100,7 @@ function createFlow(target) {
             .add(-TELEMETRY_UNIT_OF_MEASUREMENT_IN_SECONDS, 'seconds');
         let telemetry;
         if (target.sellerId !== undefined) {
-            const flowData = await createSellerFlow(measuredFrom.toDate(), measuredThrough.toDate(), target.sellerId)({
-                transaction: repos.transaction,
-                action: repos.action
-            });
+            const flowData = await createSellerFlow(measuredFrom.toDate(), measuredThrough.toDate(), target.sellerId)(repos);
             debug('flowData created.');
             telemetry = {
                 purpose: { typeOf: TelemetryPurposeType.Flow },
@@ -146,9 +143,7 @@ function createStock(target) {
         const startDate = new Date();
         let telemetry;
         if (target.sellerId !== undefined) {
-            const stockData = await createSellerStock(target.measuredAt, target.sellerId)({
-                transaction: repos.transaction
-            });
+            const stockData = await createSellerStock(target.measuredAt, target.sellerId)(repos);
             debug('stockData created.');
             telemetry = {
                 purpose: { typeOf: TelemetryPurposeType.Stock },
@@ -224,7 +219,7 @@ function createSellerFlow(measuredFrom, measuredThrough, sellerId) {
 function createSellerFlowTransactionResult(measuredFrom, measuredThrough, sellerId) {
     return async (repos) => {
         // 計測期間内に開始された取引数を算出する
-        const { count } = await repos.transaction.count({
+        const { count } = await repos.placeOrder.countPlaceOrder({
             typeOf: factory.transactionType.PlaceOrder,
             seller: { ids: [sellerId] },
             startFrom: measuredFrom,
@@ -232,7 +227,7 @@ function createSellerFlowTransactionResult(measuredFrom, measuredThrough, seller
         });
         const numberOfTransactionsStarted = count;
         // 計測期間内に開始され、かつ、すでに終了している取引を検索
-        const startedAndEndedTransactions = await repos.transaction.projectFields({
+        const startedAndEndedTransactions = await repos.placeOrder.findPlaceOrderTransactions({
             typeOf: factory.transactionType.PlaceOrder,
             seller: { ids: [sellerId] },
             startFrom: measuredFrom,
@@ -242,7 +237,7 @@ function createSellerFlowTransactionResult(measuredFrom, measuredThrough, seller
         });
         const numberOfStartedAndConfirmed = startedAndEndedTransactions.filter((transaction) => transaction.status === factory.transactionStatusType.Confirmed).length;
         const numberOfStartedAndExpired = startedAndEndedTransactions.filter((transaction) => transaction.status === factory.transactionStatusType.Expired).length;
-        const endedTransactions = await repos.transaction.projectFields({
+        const endedTransactions = await repos.placeOrder.findPlaceOrderTransactions({
             typeOf: factory.transactionType.PlaceOrder,
             seller: { ids: [sellerId] },
             endFrom: measuredFrom,
@@ -323,7 +318,7 @@ function createSellerFlowTransactionResult(measuredFrom, measuredThrough, seller
 function createSellerStock(measuredAt, sellerId) {
     return async (repos) => {
         // {measuredAt}以前に開始し、{measuredAt}以後に成立あるいは期限切れした取引
-        const { count } = await repos.transaction.count({
+        const { count } = await repos.placeOrder.countPlaceOrder({
             typeOf: factory.transactionType.PlaceOrder,
             seller: { ids: [sellerId] },
             startThrough: measuredAt,
@@ -331,7 +326,7 @@ function createSellerStock(measuredAt, sellerId) {
         });
         const numTransactionsUnderway1 = count;
         // {measuredAt}以前に開始し、いまだに進行中の取引
-        const count2Result = await repos.transaction.count({
+        const count2Result = await repos.placeOrder.countPlaceOrder({
             typeOf: factory.transactionType.PlaceOrder,
             seller: { ids: [sellerId] },
             startThrough: measuredAt,

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

@@ -26,14 +26,16 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.call = call;
 const COA = __importStar(require("@motionpicture/coa-service"));
 const factory = __importStar(require("../../factory"));
-const action_1 = require("../../repo/action");
+// import { ActionRepo } from '../../repo/action';
+const acceptCOAOffer_1 = require("../../repo/action/acceptCOAOffer");
+const authorizeOffer_1 = require("../../repo/action/authorizeOffer");
 const credentials_1 = require("../../repo/credentials");
 const event_1 = require("../../repo/event");
 const orderNumber_1 = require("../../repo/orderNumber");
 const project_1 = require("../../repo/project");
 const reserveInterface_1 = require("../../repo/reserveInterface");
-const transaction_1 = require("../../repo/transaction");
-// import { TransactionProcessRepo } from '../../repo/transactionProcess';
+// import { TransactionRepo } from '../../repo/transaction';
+const placeOrder_1 = require("../../repo/transaction/placeOrder");
 const acceptOffer_1 = require("../offer/eventServiceByCOA/acceptOffer");
 let coaAuthClient;
 /**
@@ -76,7 +78,7 @@ function call(params) {
                 ...(credentialsRepo !== undefined) ? { credentialsRepo } : undefined
             });
         }
-        const actionRepo = new action_1.ActionRepo(connection);
+        const actionRepo = new acceptCOAOffer_1.AcceptCOAOfferActionRepo(connection);
         // const transactionProcessRepo = new TransactionProcessRepo(redisClient, { lockExpiresInSeconds: 120 });
         try {
             const reserveService = new COA.service.Reserve({
@@ -103,10 +105,12 @@ function call(params) {
                     isMember
                 })({
                     action: actionRepo,
+                    authorizeOfferAction: new authorizeOffer_1.AuthorizeOfferActionRepo(connection),
                     event: new event_1.EventRepo(connection),
                     orderNumber: new orderNumber_1.OrderNumberRepo({ connection }),
                     project: new project_1.ProjectRepo(connection),
-                    transaction: new transaction_1.TransactionRepo(connection),
+                    placeOrder: new placeOrder_1.PlaceOrderRepo(connection),
+                    // transaction: new TransactionRepo(connection),
                     reserveService,
                     masterService
                 });
@@ -124,7 +128,8 @@ function call(params) {
                     event: new event_1.EventRepo(connection),
                     orderNumber: new orderNumber_1.OrderNumberRepo({ connection }),
                     project: new project_1.ProjectRepo(connection),
-                    transaction: new transaction_1.TransactionRepo(connection),
+                    placeOrder: new placeOrder_1.PlaceOrderRepo(connection),
+                    // transaction: new TransactionRepo(connection),
                     reserveService,
                     masterService
                 });

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

@@ -28,6 +28,7 @@ const factory = __importStar(require("../../factory"));
 const acceptedPaymentMethod_1 = require("../../repo/acceptedPaymentMethod");
 const accountingReport_1 = require("../../repo/accountingReport");
 const action_1 = require("../../repo/action");
+const checkMovieTicket_1 = require("../../repo/action/checkMovieTicket");
 const assetTransaction_1 = require("../../repo/assetTransaction");
 const authorization_1 = require("../../repo/authorization");
 const confirmationNumber_1 = require("../../repo/confirmationNumber");
@@ -43,7 +44,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");
@@ -75,6 +77,7 @@ function call(params) {
                 acceptedPaymentMethod: new acceptedPaymentMethod_1.AcceptedPaymentMethodRepo(connection),
                 accountingReport: new accountingReport_1.AccountingReportRepo(connection),
                 action: actionRepo,
+                checkMovieTicketAction: new checkMovieTicket_1.CheckMovieTicketActionRepo(connection),
                 assetTransaction: new assetTransaction_1.AssetTransactionRepo(connection),
                 authorization: new authorization_1.AuthorizationRepo(connection),
                 confirmationNumber: new confirmationNumber_1.ConfirmationNumberRepo({ connection }),
@@ -93,7 +96,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);

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/deleteTransaction.js

@@ -37,6 +37,9 @@ 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 moneyTransfer_1 = require("../../repo/transaction/moneyTransfer");
 const TransactionService = __importStar(require("../transaction"));
 /**
  * タスク実行関数
@@ -56,7 +59,10 @@ 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),
+            moneyTransfer: new moneyTransfer_1.MoneyTransferRepo(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/payment/payByTask.d.ts

@@ -13,6 +13,12 @@ import type { SellerPaymentAcceptedRepo } from '../../../repo/sellerPaymentAccep
 import type { TaskRepo } from '../../../repo/task';
 import * as factory from '../../../factory';
 import { Settings } from '../../../settings';
+interface IPayTask2payActionAttributesRepos {
+    action: ActionRepo;
+    acceptedOffer: AcceptedOfferRepo;
+    assetTransaction: AssetTransactionRepo;
+    order: OrderRepo;
+}
 declare function payTask2payActionAttributes(params: factory.task.pay.IData & {
     sameAs?: {
         /**
@@ -21,16 +27,8 @@ 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;
     accountingReport: AccountingReportRepo;
@@ -44,5 +42,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/placeOrder.js

@@ -8,14 +8,15 @@ 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
         })({
@@ -26,7 +27,8 @@ function call(data) {
             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

@@ -27,6 +27,7 @@ exports.call = call;
 const factory = __importStar(require("../../factory"));
 const acceptedPaymentMethod_1 = require("../../repo/acceptedPaymentMethod");
 const action_1 = require("../../repo/action");
+const acceptPay_1 = require("../../repo/action/acceptPay");
 const assetTransaction_1 = require("../../repo/assetTransaction");
 const authorization_1 = require("../../repo/authorization");
 const event_1 = require("../../repo/event");
@@ -37,7 +38,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 +55,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 +64,8 @@ function call(params) {
                 sameAs: { id: params.id }
             })({
                 acceptedPaymentMethod: new acceptedPaymentMethod_1.AcceptedPaymentMethodRepo(connection),
-                action: actionRepo,
+                action: new action_1.ActionRepo(connection),
+                acceptPayAction: actionRepo,
                 assetTransaction: new assetTransaction_1.AssetTransactionRepo(connection),
                 authorization: new authorization_1.AuthorizationRepo(connection),
                 event: new event_1.EventRepo(connection),
@@ -73,7 +76,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/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
         );