@chevre/domain 24.0.0-alpha.6 → 24.0.0-alpha.61

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

@@ -25,19 +25,22 @@ var __importStar = (this && this.__importStar) || function (mod) {
 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");
 const eventSeries_1 = require("../../repo/eventSeries");
+const issuer_1 = require("../../repo/issuer");
 const orderNumber_1 = require("../../repo/orderNumber");
 const paymentService_1 = require("../../repo/paymentService");
 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)({
@@ -61,19 +64,22 @@ function call(params) {
                 instrument: (Array.isArray(params.data.instrument)) ? params.data.instrument : [],
                 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),
                 eventSeries: new eventSeries_1.EventSeriesRepo(connection),
+                issuer: new issuer_1.IssuerRepo(connection),
                 orderNumber: new orderNumber_1.OrderNumberRepo({ connection }),
                 paymentAccepted: new sellerPaymentAccepted_1.SellerPaymentAcceptedRepo(connection),
                 paymentService: new paymentService_1.PaymentServiceRepo(connection),
                 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

@@ -26,7 +26,9 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.call = call;
 const factory = __importStar(require("../../factory"));
 const accountingReport_1 = require("../../repo/accountingReport");
-const action_1 = require("../../repo/action");
+// 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");
 const credentials_1 = require("../../repo/credentials");
 const paymentService_1 = require("../../repo/paymentService");
@@ -61,7 +63,11 @@ function call(params) {
             && typeof credentialsExpireInSeconds === 'number' && credentialsExpireInSeconds > 0;
         await (0, refundByTask_1.refundByTask)(data)({
             accountingReport: new accountingReport_1.AccountingReportRepo(connection),
-            action: new action_1.ActionRepo(connection),
+            // action: new 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

@@ -30,13 +30,14 @@ exports.call = call;
 const moment_1 = __importDefault(require("moment"));
 const factory = __importStar(require("../../factory"));
 const action_1 = require("../../repo/action");
+const pay_1 = require("../../repo/action/pay");
 const assetTransaction_1 = require("../../repo/assetTransaction");
 const order_1 = require("../../repo/order");
 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");
+const returnOrder_1 = require("../../repo/transaction/returnOrder");
 const transactionNumber_1 = require("../../repo/transactionNumber");
 const RefundTransactionService = __importStar(require("../assetTransaction/refund"));
 /**
@@ -52,13 +53,16 @@ function call(params) {
             sameAs: { id: params.id }
         })({
             action: new action_1.ActionRepo(connection),
+            actions: {
+                pay: new pay_1.PayActionRepo(connection),
+            },
             assetTransaction: new assetTransaction_1.AssetTransactionRepo(connection),
             order: new order_1.OrderRepo(connection),
             paymentService: new paymentService_1.PaymentServiceRepo(connection),
             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 +108,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,
@@ -157,7 +161,7 @@ function returnPayTransaction(taskData) {
                 });
                 const refundPurpose = createRefundPurpose(refundActionAttributes, order);
                 await RefundTransactionService.start(startRefundTransactionParams)({
-                    action: repos.action,
+                    actions: repos.actions,
                     paymentService: repos.paymentService,
                     potentialAction: repos.potentialAction,
                     product: repos.product,

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,

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

@@ -31,13 +31,13 @@ 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 placeOrder_1 = require("../../repo/transaction/placeOrder");
 const sendOrder_1 = require("../order/sendOrder");
 /**
  * タスク実行関数
  */
 function call(data) {
-    return async ({ connection, settings }) => {
+    return async ({ connection }) => {
         await (0, sendOrder_1.sendOrder)({
             ...data,
             object: {
@@ -57,7 +57,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)
-        }, settings);
+            placeOrder: new placeOrder_1.PlaceOrderRepo(connection)
+        });
     };
 }

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

@@ -144,6 +144,7 @@ function syncEventSeries(params) {
             project: { typeOf: factory.organizationType.Project, id: params.project.id },
             typeOf: factory.actionType.ReplaceAction,
             agent: params.agent,
+            // eslint-disable-next-line no-warning-comments
             // TODO define object
             object: {
                 ...params.object,
@@ -212,6 +213,7 @@ function syncEvents(params) {
             project: { typeOf: factory.organizationType.Project, id: params.project.id },
             typeOf: factory.actionType.ReplaceAction,
             agent: params.agent,
+            // eslint-disable-next-line no-warning-comments
             // TODO define object
             object: {
                 ...params.object,

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

@@ -2,13 +2,16 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.call = call;
 const accountingReport_1 = require("../../repo/accountingReport");
-const action_1 = require("../../repo/action");
+// import { ActionRepo } from '../../repo/action';
+const acceptPay_1 = require("../../repo/action/acceptPay");
+const authorizePaymentMethod_1 = require("../../repo/action/authorizePaymentMethod");
 const assetTransaction_1 = require("../../repo/assetTransaction");
 const paymentService_1 = require("../../repo/paymentService");
 const paymentServiceProvider_1 = require("../../repo/paymentServiceProvider");
 const sellerPaymentAccepted_1 = require("../../repo/sellerPaymentAccepted");
 const task_1 = require("../../repo/task");
-const transaction_1 = require("../../repo/transaction");
+const placeOrder_1 = require("../../repo/transaction/placeOrder");
+// import { TransactionRepo } from '../../repo/transaction';
 const any_1 = require("../payment/any");
 /**
  * タスク実行関数
@@ -21,13 +24,16 @@ function call(params) {
             sameAs: { id: params.id }
         })({
             accountingReport: new accountingReport_1.AccountingReportRepo(connection),
-            action: new action_1.ActionRepo(connection),
+            // action: new ActionRepo(connection),
+            acceptPayAction: new acceptPay_1.AcceptPayActionRepo(connection),
+            authorizePaymentMethodAction: new authorizePaymentMethod_1.AuthorizePaymentMethodActionRepo(connection),
             assetTransaction: new assetTransaction_1.AssetTransactionRepo(connection),
             paymentAccepted: new sellerPaymentAccepted_1.SellerPaymentAcceptedRepo(connection),
             paymentService: new paymentService_1.PaymentServiceRepo(connection),
             paymentServiceProvider: new paymentServiceProvider_1.PaymentServiceProviderRepo(connection),
             task: new task_1.TaskRepo(connection),
-            transaction: new transaction_1.TransactionRepo(connection)
+            placeOrder: new placeOrder_1.PlaceOrderRepo(connection)
+            // transaction: new TransactionRepo(connection)
         }
         // settings
         );

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

@@ -27,6 +27,9 @@ 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 authorizeInvoice_1 = require("../../repo/action/authorizeInvoice");
 const credentials_1 = require("../../repo/credentials");
 const paymentService_1 = require("../../repo/paymentService");
 const paymentServiceProvider_1 = require("../../repo/paymentServiceProvider");
@@ -50,6 +53,11 @@ function call(data) {
         await (0, voidPaymentByTask_1.voidPaymentByTask)(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),
+            },
+            authorizeInvoiceAction: new authorizeInvoice_1.AuthorizeInvoiceActionRepo(connection),
             credentials: new credentials_1.CredentialsRepo(redisClient, {
                 scope: `${factory.service.paymentService.PaymentServiceType.MovieTicket}:${paymentServiceId}`,
                 expireInSeconds: (useCredentialsRepo) ? credentialsExpireInSeconds : 0

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

@@ -1,22 +1,23 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.call = call;
-const action_1 = require("../../repo/action");
+// import { ActionRepo } from '../../repo/action';
+const authorizeProductOffer_1 = require("../../repo/action/authorizeProductOffer");
 const assetTransaction_1 = require("../../repo/assetTransaction");
-const transaction_1 = require("../../repo/transaction");
+const placeOrder_1 = require("../../repo/transaction/placeOrder");
 const product_1 = require("../offer/product");
 /**
  * タスク実行関数
  */
 function call(data) {
     return async ({ connection }) => {
-        const actionRepo = new action_1.ActionRepo(connection);
+        // const actionRepo = new ActionRepo(connection);
         const assetTransactionRepo = new assetTransaction_1.AssetTransactionRepo(connection);
-        const transactionRepo = new transaction_1.TransactionRepo(connection);
+        const placeOrderRepo = new placeOrder_1.PlaceOrderRepo(connection);
         await (0, product_1.voidTransaction)(data)({
-            action: actionRepo,
+            authorizeProductOfferAction: new authorizeProductOffer_1.AuthorizeProductOfferActionRepo(connection),
             assetTransaction: assetTransactionRepo,
-            transaction: transactionRepo
+            placeOrder: placeOrderRepo
         });
     };
 }

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

@@ -28,6 +28,8 @@ const COA = __importStar(require("@motionpicture/coa-service"));
 const factory = __importStar(require("../../factory"));
 const voidTransaction_1 = require("../offer/event/voidTransaction");
 const action_1 = require("../../repo/action");
+const acceptCOAOffer_1 = require("../../repo/action/acceptCOAOffer");
+const authorizeOffer_1 = require("../../repo/action/authorizeOffer");
 const assetTransaction_1 = require("../../repo/assetTransaction");
 const orderInTransaction_1 = require("../../repo/orderInTransaction");
 const offer_1 = require("../../repo/rateLimit/offer");
@@ -36,8 +38,8 @@ const reserveInterface_1 = require("../../repo/reserveInterface");
 const setting_1 = require("../../repo/setting");
 const stockHolder_1 = require("../../repo/stockHolder");
 const task_1 = require("../../repo/task");
-const transaction_1 = require("../../repo/transaction");
-// import { TransactionProcessRepo } from '../../repo/transactionProcess';
+// import { TransactionRepo } from '../../repo/transaction';
+const placeOrder_1 = require("../../repo/transaction/placeOrder");
 let coaAuthClientCreated = false;
 let coaAuthClient = new COA.auth.RefreshToken({
     endpoint: '', // 使用されないので空文字でok
@@ -80,6 +82,8 @@ function call(params) {
                 sameAs: { id: params.id }
             })({
                 action: new action_1.ActionRepo(connection),
+                acceptCOAOfferAction: new acceptCOAOffer_1.AcceptCOAOfferActionRepo(connection),
+                authorizeOfferAction: new authorizeOffer_1.AuthorizeOfferActionRepo(connection),
                 assetTransaction: new assetTransaction_1.AssetTransactionRepo(connection),
                 stockHolder: new stockHolder_1.StockHolderRepo({ connection }),
                 offerRateLimit: new offer_1.OfferRateLimitRepo(redisClient),
@@ -87,7 +91,8 @@ function call(params) {
                 reservation: new reservation_1.ReservationRepo(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),
+                // transaction: new TransactionRepo(connection),
                 reserveService
             }, settings);
         }

package/lib/chevre/service/transaction/deleteTransaction.d.ts

@@ -12,6 +12,8 @@ import type { ReservationRepo } from '../../repo/reservation';
 import type { SettingRepo } from '../../repo/setting';
 import type { TaskRepo } from '../../repo/task';
 import type { TransactionRepo } from '../../repo/transaction';
+import type { PlaceOrderRepo } from '../../repo/transaction/placeOrder';
+import type { ReturnOrderRepo } from '../../repo/transaction/returnOrder';
 /**
  * 取引に関わるリソースを削除する
  * 冪等性を確保すること
@@ -30,4 +32,6 @@ export declare function deleteTransaction(params: factory.task.IData<factory.tas
     setting: SettingRepo;
     task: TaskRepo;
     transaction: TransactionRepo;
+    placeOrder: PlaceOrderRepo;
+    returnOrder: ReturnOrderRepo;
 }) => Promise<void>;

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

@@ -50,15 +50,32 @@ function createDeleteTransactionTasksByAgentId(params) {
         // agentIdによる全取引についてDeleteTransactionタスクを作成する
         if (typeof agentIdSpecified === 'string' && agentIdSpecified.length > 0) {
             const transactionTypeOf = params.object.typeOf;
-            const transactions = await repos.transaction.projectFields({
-                project: { id: { $eq: params.object.project.id } },
-                agent: {
-                    ids: [agentIdSpecified],
-                    typeOf: factory.personType.Person
-                },
-                typeOf: transactionTypeOf,
-                inclusion: ['typeOf', 'startDate', 'endDate', 'object', 'project']
-            });
+            let transactions;
+            if (transactionTypeOf === factory.transactionType.PlaceOrder) {
+                transactions = await repos.placeOrder.findPlaceOrderTransactions({
+                    project: { id: { $eq: params.object.project.id } },
+                    agent: {
+                        ids: [agentIdSpecified],
+                        typeOf: factory.personType.Person
+                    },
+                    typeOf: transactionTypeOf,
+                    inclusion: ['typeOf', 'startDate', 'endDate', 'object', 'project']
+                });
+            }
+            else if (transactionTypeOf === factory.transactionType.ReturnOrder) {
+                transactions = await repos.returnOrder.findReturnOrderTransactions({
+                    project: { id: { $eq: params.object.project.id } },
+                    agent: {
+                        ids: [agentIdSpecified],
+                        typeOf: factory.personType.Person
+                    },
+                    typeOf: transactionTypeOf,
+                    inclusion: ['typeOf', 'startDate', 'endDate', 'object', 'project']
+                });
+            }
+            else {
+                throw new factory.errors.NotImplemented(`${transactionTypeOf} not implemented`);
+            }
             const deleteAt = new Date();
             let deleteTransactionTasks;
             switch (transactionTypeOf) {
@@ -119,34 +136,6 @@ function createDeleteTransactionTasksByAgentId(params) {
                         };
                     });
                     break;
-                case factory.transactionType.MoneyTransfer:
-                    deleteTransactionTasks = transactions.map((transaction) => {
-                        return {
-                            project: transaction.project,
-                            name: factory.taskName.DeleteTransaction,
-                            status: factory.taskStatus.Ready,
-                            runsAt: deleteAt,
-                            remainingNumberOfTries: 3,
-                            numberOfTried: 0,
-                            executionResults: [],
-                            data: {
-                                object: {
-                                    specifyingMethod: factory.action.update.deleteAction.ObjectAsTransactionSpecifyingMethod.Id,
-                                    id: transaction.id,
-                                    object: {
-                                        ...(transaction.object.pendingTransaction !== undefined)
-                                            ? { pendingTransaction: transaction.object.pendingTransaction }
-                                            : undefined
-                                    },
-                                    project: transaction.project,
-                                    startDate: transaction.startDate,
-                                    typeOf: transaction.typeOf,
-                                    ...(transaction.endDate !== undefined) ? { endDate: transaction.endDate } : undefined
-                                }
-                            }
-                        };
-                    });
-                    break;
                 default:
                     throw new factory.errors.NotImplemented(`${transactionTypeOf} not implemented`);
             }
@@ -166,11 +155,24 @@ function deleteTransactionById(params) {
         if (typeof deletingTransactionId !== 'string' || deletingTransactionId.length === 0) {
             throw new factory.errors.ArgumentNull('object.id');
         }
-        const transaction = (await repos.transaction.projectFields({
-            ids: [deletingTransactionId],
-            typeOf: params.object.typeOf,
-            inclusion: ['typeOf', 'project', 'status', 'result']
-        })).shift();
+        let transaction;
+        if (params.object.typeOf === factory.transactionType.PlaceOrder) {
+            transaction = (await repos.placeOrder.findPlaceOrderTransactions({
+                ids: [deletingTransactionId],
+                typeOf: params.object.typeOf,
+                inclusion: ['typeOf', 'project', 'status', 'result']
+            })).shift();
+        }
+        else if (params.object.typeOf === factory.transactionType.ReturnOrder) {
+            transaction = (await repos.returnOrder.findReturnOrderTransactions({
+                ids: [deletingTransactionId],
+                typeOf: params.object.typeOf,
+                inclusion: ['typeOf', 'project', 'status', 'result']
+            })).shift();
+        }
+        else {
+            throw new factory.errors.NotImplemented(`object not implemented. typeOf:${params.object.typeOf}`);
+        }
         if (transaction === undefined) {
             // すでに削除済
             return;
@@ -195,7 +197,7 @@ function deleteTransactionById(params) {
         try {
             const transactionTypeOf = transaction.typeOf;
             switch (transactionTypeOf) {
-                case factory.transactionType.PlaceOrder:
+                case factory.transactionType.PlaceOrder: {
                     // 取引に対する全ての承認アクションを検索
                     const authorizeActions = await repos.action.searchByPurpose({
                         typeOf: factory.actionType.AuthorizeAction,
@@ -208,7 +210,7 @@ function deleteTransactionById(params) {
                         case factory.transactionStatusType.Canceled:
                         case factory.transactionStatusType.Expired:
                             break;
-                        case factory.transactionStatusType.Confirmed:
+                        case factory.transactionStatusType.Confirmed: {
                             const deletingOrder = transaction.result?.order;
                             if (typeof deletingOrder?.orderNumber === 'string') {
                                 await (0, deleteOrder_1.deleteOrder)({
@@ -216,9 +218,11 @@ function deleteTransactionById(params) {
                                 })(repos);
                             }
                             break;
+                        }
                         default:
                             throw new factory.errors.NotImplemented(`${transaction.status} not implemented`);
                     }
+                    // eslint-disable-next-line no-warning-comments
                     // TODO サービス登録取引を削除
                     // 決済取引を削除
                     const deletePayTransactionsByPlaceOrderResult = await deletePayTransactionsByPlaceOrder({ authorizeActions, transaction })(repos);
@@ -253,16 +257,12 @@ function deleteTransactionById(params) {
                     // 取引削除
                     await repos.transaction.findByIdAndDelete({ id: transaction.id });
                     break;
+                }
                 // implemented(2022-06-09~)
                 case factory.transactionType.ReturnOrder:
                     // 取引削除
                     await repos.transaction.findByIdAndDelete({ id: transaction.id });
                     break;
-                // implemented(2022-06-09~)
-                case factory.transactionType.MoneyTransfer:
-                    // 取引削除
-                    await repos.transaction.findByIdAndDelete({ id: transaction.id });
-                    break;
                 default:
                     throw new factory.errors.NotImplemented(`${transactionTypeOf} not implemented`);
             }

package/lib/chevre/service/transaction/placeOrder/confirm/validation/factory.d.ts

@@ -2,8 +2,8 @@ import * as factory from '../../../../../factory';
 export type IAcceptPayAction = Pick<factory.action.accept.pay.IAction, 'object' | 'result' | 'endDate'>;
 export type IAuthorizeEventServiceOffer = factory.action.authorize.offer.eventService.IAction;
 export type IAuthorizeProductOffer = factory.action.authorize.offer.product.IAction;
-export type IAuthorizeMoneyTransferOffer = factory.action.authorize.offer.moneyTransfer.IAction;
 export type IAuthorizePaymentAction = Pick<factory.action.authorize.paymentMethod.any.IAction, 'id' | 'result' | 'endDate'> & {
     object: Pick<factory.action.authorize.paymentMethod.any.IObject, 'typeOf' | 'paymentMethodId'>;
+    instrument?: never;
 };
 export type IPayTransaction = Pick<factory.assetTransaction.pay.ITransaction, 'object'>;

package/lib/chevre/service/transaction/placeOrder/confirm/validation/validatePrice.d.ts

@@ -1,3 +1,3 @@
-import { IAuthorizeEventServiceOffer, IAuthorizeMoneyTransferOffer, IAuthorizePaymentAction, IAuthorizeProductOffer } from './factory';
-declare function validatePrice(authorizePaymentActions: IAuthorizePaymentAction[], authorizeEventServiceOfferActions: Pick<IAuthorizeEventServiceOffer, 'id' | 'result'>[], authorizeProductOfferActions: Pick<IAuthorizeProductOffer, 'id' | 'result'>[], authorizeMoneyTansferActions: Pick<IAuthorizeMoneyTransferOffer, 'id' | 'result'>[]): void;
+import { IAuthorizeEventServiceOffer, IAuthorizePaymentAction, IAuthorizeProductOffer } from './factory';
+declare function validatePrice(authorizePaymentActions: IAuthorizePaymentAction[], authorizeEventServiceOfferActions: Pick<IAuthorizeEventServiceOffer, 'id' | 'result'>[], authorizeProductOfferActions: Pick<IAuthorizeProductOffer, 'id' | 'result'>[]): void;
 export { validatePrice };

package/lib/chevre/service/transaction/placeOrder/confirm/validation/validatePrice.js

@@ -25,7 +25,7 @@ var __importStar = (this && this.__importStar) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.validatePrice = validatePrice;
 const factory = __importStar(require("../../../../../factory"));
-function validatePrice(authorizePaymentActions, authorizeEventServiceOfferActions, authorizeProductOfferActions, authorizeMoneyTansferActions) {
+function validatePrice(authorizePaymentActions, authorizeEventServiceOfferActions, authorizeProductOfferActions) {
     let priceByAgent = 0;
     let priceBySeller = 0;
     // 決済承認を確認
@@ -42,8 +42,7 @@ function validatePrice(authorizePaymentActions, authorizeEventServiceOfferAction
     // 販売者が提供するアイテムの発生金額
     [
         ...authorizeEventServiceOfferActions,
-        ...authorizeProductOfferActions,
-        ...authorizeMoneyTansferActions
+        ...authorizeProductOfferActions
     ].forEach(({ id, result }) => {
         const priceByAction = result?.price;
         if (typeof priceByAction === 'number' && priceByAction >= 0) {

package/lib/chevre/service/transaction/placeOrder/confirm/validation.d.ts

@@ -1,11 +1,11 @@
 import * as factory from '../../../../factory';
 import { placeOrder as PlaceOrderFactory } from '../../../../factory/transaction';
-import { IAcceptPayAction, IAuthorizeEventServiceOffer, IAuthorizeMoneyTransferOffer, IAuthorizePaymentAction, IAuthorizeProductOffer, IPayTransaction } from './validation/factory';
-export { IAcceptPayAction, IAuthorizeEventServiceOffer, IAuthorizeMoneyTransferOffer, IAuthorizePaymentAction, IAuthorizeProductOffer, IPayTransaction };
+import { IAcceptPayAction, IAuthorizeEventServiceOffer, IAuthorizePaymentAction, IAuthorizeProductOffer, IPayTransaction } from './validation/factory';
+export { IAcceptPayAction, IAuthorizeEventServiceOffer, IAuthorizePaymentAction, IAuthorizeProductOffer, IPayTransaction };
 /**
  * 取引が確定可能な状態かどうかをチェックする
  */
-export declare function validateTransaction(transaction: Pick<factory.transaction.placeOrder.ITransaction, 'id' | 'object'>, acceptPayActions: IAcceptPayAction[], authorizePaymentActions: IAuthorizePaymentAction[], authorizeEventServiceOfferActions: Pick<IAuthorizeEventServiceOffer, 'id' | 'result'>[], authorizeMoneyTansferActions: Pick<IAuthorizeMoneyTransferOffer, 'id' | 'result'>[], authorizeProductOfferActions: Pick<IAuthorizeProductOffer, 'id' | 'result'>[], eventReservationAcceptedOffers: factory.order.IAcceptedOffer<factory.order.IReservation>[], payTransactions: IPayTransaction[], customer: factory.order.ICustomer): void;
+export declare function validateTransaction(transaction: Pick<factory.transaction.placeOrder.ITransaction, 'id' | 'object'>, acceptPayActions: IAcceptPayAction[], authorizePaymentActions: IAuthorizePaymentAction[], authorizeEventServiceOfferActions: Pick<IAuthorizeEventServiceOffer, 'id' | 'result'>[], authorizeProductOfferActions: Pick<IAuthorizeProductOffer, 'id' | 'result'>[], eventReservationAcceptedOffers: factory.order.IAcceptedOffer<factory.order.IReservation>[], payTransactions: IPayTransaction[], customer: factory.order.ICustomer): void;
 export type IOrderURLGenerator = (order: factory.order.IOrder) => string;
 /**
  * 注文オファー数検証