@chevre/domain 24.0.0-alpha.9 → 24.0.0

package/lib/chevre/service/payment/creditCard/refundCreditCard.js

@@ -1,33 +1,10 @@
 "use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || function (mod) {
-    if (mod && mod.__esModule) return mod;
-    var result = {};
-    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
-    __setModuleDefault(result, mod);
-    return result;
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.refundCreditCard = refundCreditCard;
-const GMO = __importStar(require("@motionpicture/gmo-service"));
-const factory = __importStar(require("../../../factory"));
+const gmo_service_1 = require("@motionpicture/gmo-service");
+const factory_1 = require("../../../factory");
 const onRefundActionCompletedOrFailed_1 = require("../any/onRefundActionCompletedOrFailed");
-const factory_1 = require("./factory");
+const factory_2 = require("./factory");
 const getGMOInfoFromSeller_1 = require("./getGMOInfoFromSeller");
 const gmoError_1 = require("./gmoError");
 /**
@@ -45,7 +22,7 @@ function refundCreditCard(params
         const paymentServiceId = params.object[0]?.id;
         let requirePayAction = false;
         const requirePaymentAccepted = false;
-        if (purpose.typeOf === factory.actionType.ReturnAction) {
+        if (purpose.typeOf === factory_1.factory.actionType.ReturnAction) {
             requirePayAction = true;
             // requirePaymentAccepted = true;
         }
@@ -53,11 +30,11 @@ function refundCreditCard(params
         let payAction;
         let alterTranResultByPayAction;
         if (requirePayAction) {
-            payAction = await repos.action.findPayAction({ project: { id: params.project.id }, paymentMethodId });
+            payAction = await repos.actions.pay.findPayActionByPaymentMethodId({ project: { id: params.project.id }, paymentMethodId });
             if (payAction === undefined) {
-                throw new factory.errors.NotFound(factory.actionType.PayAction);
+                throw new factory_1.factory.errors.NotFound(factory_1.factory.actionType.PayAction);
             }
-            const payRecipe = await repos.action.findRecipeByAction({
+            const payRecipe = await repos.actions.pay.findRecipeByAction({
                 project: { id: params.project.id },
                 recipeFor: { id: payAction.id }
             });
@@ -72,17 +49,16 @@ function refundCreditCard(params
             project: params.project,
             id: paymentServiceId
         });
-        const { sameAs, ...startingActionParams } = params;
-        const action = await repos.action.start({
+        const { sameAs, ...startingActionParams } = params; // eslint-disable-line @typescript-eslint/no-unused-vars
+        const action = await repos.actions.refund.start({
             ...startingActionParams,
             ...(typeof params.sameAs?.id === 'string') ? { sameAs: { id: params.sameAs.id, typeOf: 'Task' } } : undefined
         });
         let processAlterTranResult;
         let recipe;
         try {
-            const creditService = new GMO.service.Credit({
-                endpoint: String(availableChannel.serviceUrl),
-                useFetch: settings.gmo.useFetch
+            const creditService = new gmo_service_1.GMO.service.Credit({
+                endpoint: String(availableChannel.serviceUrl)
             }, { timeout: settings.gmo.timeout });
             processAlterTranResult = await processAlterTran({
                 availableChannel,
@@ -93,7 +69,7 @@ function refundCreditCard(params
                 refundFee: params.object[0]?.refundFee,
                 purpose
             })({ creditService });
-            recipe = (0, factory_1.processAlterTranResult2refundRecipe)({ processAlterTranResult, project: { id: params.project.id } });
+            recipe = (0, factory_2.processAlterTranResult2refundRecipe)({ processAlterTranResult, project: { id: params.project.id } });
             if (processAlterTranResult.processAlterTranError === undefined) {
                 if (processAlterTranResult.alterTranResult !== undefined) {
                     // no op
@@ -106,7 +82,7 @@ function refundCreditCard(params
         }
         catch (error) {
             try {
-                await repos.action.giveUp({
+                await repos.actions.refund.giveUp({
                     typeOf: action.typeOf, id: action.id, error,
                     ...(recipe !== undefined) ? { recipe } : undefined
                 });
@@ -118,16 +94,20 @@ function refundCreditCard(params
         }
         const actionResult = {}; // optimize(2024-06-10~)
         // add recipe(2024-06-04~)
-        await repos.action.completeWithVoid({ typeOf: action.typeOf, id: action.id, result: actionResult, recipe });
+        await repos.actions.refund.completeWithVoid({ typeOf: action.typeOf, id: action.id, result: actionResult, recipe });
         await (0, onRefundActionCompletedOrFailed_1.onRefundActionCompletedOrFailed)({
-            actionStatus: factory.actionStatusType.CompletedActionStatus,
+            actionStatus: factory_1.factory.actionStatusType.CompletedActionStatus,
             id: action.id,
             object: startingActionParams.object,
             potentialActions: startingActionParams.potentialActions,
             project: startingActionParams.project,
             purpose: startingActionParams.purpose,
             typeOf: action.typeOf
-        })(repos);
+        })({
+            actions: repos.actions,
+            accountingReport: repos.accountingReport,
+            task: repos.task
+        });
     };
 }
 function processAlterTran(params) {
@@ -151,9 +131,9 @@ function processAlterTran(params) {
         }
         catch (error) {
             let throwsError = true;
-            if (purpose.typeOf === factory.transactionType.PlaceOrder) {
+            if (purpose.typeOf === factory_1.factory.transactionType.PlaceOrder) {
                 // handle notFoundError as searchTradeResult(2025-02-20~)
-                if (error.name === 'GMOServiceBadRequestError') {
+                if (error instanceof gmo_service_1.GMO.error.badRequest.GMOBadRequestError) {
                     if (Array.isArray(error.errors) && error.errors.length > 0) {
                         const gmoErrors = error.errors;
                         // 指定されたIDとパスワードの取引が存在しません。
@@ -178,7 +158,7 @@ function processAlterTran(params) {
                     creditCardSalesBefore = params.alterTranResultByPayAction;
                 }
                 let alreadyRefunded = false;
-                if (purpose.typeOf === factory.actionType.ReturnAction) {
+                if (purpose.typeOf === factory_1.factory.actionType.ReturnAction) {
                     // 決済時のGMO取引を確認できれば、既に返金済かどうかを判定
                     if (typeof creditCardSalesBefore?.tranId === 'string') {
                         if (tranId !== creditCardSalesBefore.tranId) {
@@ -186,23 +166,23 @@ function processAlterTran(params) {
                         }
                         // tranIdが空文字のケース(SPSwrapperで発生)に対応(Voidに対してVoidを実行してしまうので)(2024-04-20~)
                         if (tranId === '' && creditCardSalesBefore.tranId === '') {
-                            if (status === GMO.utils.util.Status.Void) {
+                            if (status === gmo_service_1.GMO.factory.util.Status.Void) {
                                 alreadyRefunded = true;
                             }
                         }
                     }
                 }
-                else if (purpose.typeOf === factory.transactionType.PlaceOrder) {
+                else if (purpose.typeOf === factory_1.factory.transactionType.PlaceOrder) {
                     // 決済時のGMO取引を確認できれば、既に返金済かどうかを判定
                     // tranIdが空文字のケース(SPSwrapperで発生)に対応(Voidに対してVoidを実行してしまうので)(2024-04-20~)
                     if (tranId === '' && creditCardSalesBefore === undefined) {
-                        if (status === GMO.utils.util.Status.Void) {
+                        if (status === gmo_service_1.GMO.factory.util.Status.Void) {
                             alreadyRefunded = true;
                         }
                     }
                 }
                 else {
-                    throw new factory.errors.Internal('unexpected purpose.typeOf');
+                    throw new factory_1.factory.errors.Internal('unexpected purpose.typeOf');
                 }
                 if (alreadyRefunded) {
                     alterTranResult = { accessId, accessPass, forward, approve, tranId, tranDate: '' };
@@ -212,7 +192,7 @@ function processAlterTran(params) {
                     try {
                         alterTranArgs = {
                             shopId, shopPass, accessId, accessPass,
-                            jobCd: GMO.utils.util.JobCd.Void,
+                            jobCd: gmo_service_1.GMO.factory.util.JobCd.Void,
                             siteId: params.availableChannel.credentials?.siteId,
                             sitePass: params.availableChannel.credentials?.sitePass
                         };
@@ -221,12 +201,12 @@ function processAlterTran(params) {
                     catch (error) {
                         let throwsError = true;
                         // 未決済(3D 登録済)->取消をトライするとE01050004エラーとなるが、この場合何もする必要はない(2024-01-09~)
-                        if (error.name === 'GMOServiceBadRequestError') {
+                        if (error instanceof gmo_service_1.GMO.error.badRequest.GMOBadRequestError) {
                             if (Array.isArray(error.errors) && error.errors.length === 1
                                 && error.errors[0].info === gmoError_1.GMOErrorInfo.JobCodeNotAcceptable) {
-                                if (status === GMO.utils.util.Status.Authenticated
-                                    || status === GMO.utils.util.Status.Void
-                                    || status === GMO.utils.util.Status.Unprocessed // handle UNPROCESSED(2025-02-26~)
+                                if (status === gmo_service_1.GMO.factory.util.Status.Authenticated
+                                    || status === gmo_service_1.GMO.factory.util.Status.Void
+                                    || status === gmo_service_1.GMO.factory.util.Status.Unprocessed // handle UNPROCESSED(2025-02-26~)
                                 ) {
                                     caughtAlterTranError = error;
                                     throwsError = false;
@@ -242,7 +222,7 @@ function processAlterTran(params) {
                     }
                     if (alterTranResult === undefined) {
                         // impossible path
-                        throw new factory.errors.NotImplemented('alterTranResult undefined not implemented');
+                        throw new factory_1.factory.errors.NotImplemented('alterTranResult undefined not implemented');
                     }
                 }
             }

package/lib/chevre/service/payment/creditCard/searchGMOTrade.d.ts

@@ -1,5 +1,5 @@
-import * as GMO from '@motionpicture/gmo-service';
-import * as factory from '../../../factory';
+import { GMO } from '@motionpicture/gmo-service';
+import { factory } from '../../../factory';
 import { Settings } from '../../../settings';
 /**
  * 決済代行側の取引状態参照
@@ -10,5 +10,5 @@ declare function searchGMOTrade(params: {
     paymentMethodId: string;
     shopId: string;
     shopPass: string;
-}, settings: Settings): Promise<GMO.factory.credit.ISearchTradeResult>;
+}, settings: Settings): Promise<GMO.factory.service.credit.ISearchTradeResult>;
 export { searchGMOTrade };

package/lib/chevre/service/payment/creditCard/searchGMOTrade.js

@@ -1,40 +1,16 @@
 "use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || function (mod) {
-    if (mod && mod.__esModule) return mod;
-    var result = {};
-    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
-    __setModuleDefault(result, mod);
-    return result;
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.searchGMOTrade = searchGMOTrade;
-const GMO = __importStar(require("@motionpicture/gmo-service"));
-const factory = __importStar(require("../../../factory"));
+const gmo_service_1 = require("@motionpicture/gmo-service");
+const factory_1 = require("../../../factory");
 const gmoError_1 = require("./gmoError");
 /**
  * 決済代行側の取引状態参照
  * 存在しない場合NotFoundエラー
  */
 async function searchGMOTrade(params, settings) {
-    const creditCardService = new GMO.service.Credit({
-        endpoint: String(params.availableChannel.serviceUrl),
-        useFetch: settings.gmo.useFetch
+    const creditCardService = new gmo_service_1.GMO.service.Credit({
+        endpoint: String(params.availableChannel.serviceUrl)
     }, { timeout: settings.gmo.timeout });
     // 取引状態参照
     let searchTradeResult;
@@ -50,7 +26,7 @@ async function searchGMOTrade(params, settings) {
     catch (error) {
         // searchTradeでのエラーをハンドリング(2024-04-08~)
         let throwsError = true;
-        if (error.name === 'GMOServiceBadRequestError') {
+        if (error instanceof gmo_service_1.GMO.error.badRequest.GMOBadRequestError) {
             if (Array.isArray(error.errors) && error.errors.length > 0) {
                 const gmoErrors = error.errors;
                 // 指定されたIDとパスワードの取引が存在しません。
@@ -65,7 +41,7 @@ async function searchGMOTrade(params, settings) {
         }
     }
     if (searchTradeResult === undefined) {
-        throw new factory.errors.NotFound('searchTradeResult');
+        throw new factory_1.factory.errors.NotFound('searchTradeResult');
     }
     return searchTradeResult;
 }

package/lib/chevre/service/payment/creditCard/voidTransaction.d.ts

@@ -1,16 +1,17 @@
-import * as factory from '../../../factory';
+import { factory } from '../../../factory';
 import { Settings } from '../../../settings';
-import type { ActionRepo } from '../../../repo/action';
+import type { AuthorizeInvoiceActionRepo } from '../../../repo/action/authorizeInvoice';
 import type { PaymentServiceRepo } from '../../../repo/paymentService';
 import type { PaymentServiceProviderRepo } from '../../../repo/paymentServiceProvider';
 import type { SellerPaymentAcceptedRepo } from '../../../repo/sellerPaymentAccepted';
-/**
- * クレジットカード決済中止
- */
-declare function voidTransaction(params: factory.task.voidPayment.IData): (repos: {
-    action: ActionRepo;
+interface IVoidTransactionRepos {
+    authorizeInvoiceAction: AuthorizeInvoiceActionRepo;
     paymentAccepted: SellerPaymentAcceptedRepo;
     paymentService: PaymentServiceRepo;
     paymentServiceProvider: PaymentServiceProviderRepo;
-}, settings: Settings) => Promise<void>;
-export { voidTransaction };
+}
+/**
+ * クレジットカード決済中止
+ */
+declare function voidTransaction(params: factory.task.voidPayment.IData): (repos: IVoidTransactionRepos, settings: Settings) => Promise<void>;
+export { IVoidTransactionRepos, voidTransaction };

package/lib/chevre/service/payment/creditCard/voidTransaction.js

@@ -1,31 +1,8 @@
 "use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || function (mod) {
-    if (mod && mod.__esModule) return mod;
-    var result = {};
-    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
-    __setModuleDefault(result, mod);
-    return result;
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.voidTransaction = voidTransaction;
-const GMO = __importStar(require("@motionpicture/gmo-service"));
-const factory = __importStar(require("../../../factory"));
+const gmo_service_1 = require("@motionpicture/gmo-service");
+const factory_1 = require("../../../factory");
 const getGMOInfoFromSeller_1 = require("./getGMOInfoFromSeller");
 const gmoError_1 = require("./gmoError");
 /**
@@ -37,11 +14,11 @@ function voidTransaction(params) {
         // CreditCard系統の決済方法タイプは動的
         const paymentMethodType = transaction.object.paymentMethod?.identifier;
         if (typeof paymentMethodType !== 'string') {
-            throw new factory.errors.ArgumentNull('object.paymentMethod.identifier');
+            throw new factory_1.factory.errors.ArgumentNull('object.paymentMethod.identifier');
         }
         const paymentMethodId = transaction.object.paymentMethodId;
         if (typeof paymentMethodId !== 'string') {
-            throw new factory.errors.ArgumentNull('object.paymentMethodId');
+            throw new factory_1.factory.errors.ArgumentNull('object.paymentMethodId');
         }
         const paymentServiceId = String(transaction.object.id);
         const availableChannel = await repos.paymentService.findAvailableChannelCreditCard({
@@ -50,31 +27,38 @@ function voidTransaction(params) {
         });
         const sellerId = transaction.recipient?.id;
         if (typeof sellerId !== 'string') {
-            throw new factory.errors.ArgumentNull('object.recipient.id');
+            throw new factory_1.factory.errors.ArgumentNull('object.recipient.id');
         }
         const { shopId, shopPass } = await (0, getGMOInfoFromSeller_1.getGMOInfoFromSeller)({
             paymentMethodType, seller: { id: sellerId }, paymentServiceId,
             requirePaymentAccepted: false
         })(repos);
         // authorizeInvoiceActionが存在すれば取消(2024-06-13~)
-        const authorizeInvoiceAction = (await repos.action.search({
-            limit: 1,
-            page: 1,
-            typeOf: { $eq: factory.actionType.AuthorizeAction },
-            object: { paymentMethodId: { $eq: paymentMethodId } },
-            sameAs: { id: { $eq: transaction.id } }
+        // const authorizeInvoiceAction = (<Pick<factory.action.authorize.invoice.IAction, 'id' | 'typeOf' | 'project'>[]>
+        //     await repos.action.search(
+        //         {
+        //             limit: 1,
+        //             page: 1,
+        //             typeOf: { $eq: factory.actionType.AuthorizeAction },
+        //             object: { paymentMethodId: { $eq: paymentMethodId } },
+        //             sameAs: { id: { $eq: transaction.id } }
+        //         },
+        //         ['id', 'typeOf', 'project']
+        //     )).shift();
+        const authorizeInvoiceAction = (await repos.authorizeInvoiceAction.findAuthorizeInvoiceActionsByPayTransaction({
+            paymentMethodId,
+            payTransactionId: transaction.id
         }, ['id', 'typeOf', 'project'])).shift();
         if (authorizeInvoiceAction !== undefined) {
             const cancelAction = {
                 startTime: new Date(),
-                agent: { id: authorizeInvoiceAction.project.id, typeOf: factory.organizationType.Project }
+                agent: { id: authorizeInvoiceAction.project.id, typeOf: factory_1.factory.organizationType.Project }
                 // ...(typeof params.sameAs?.id === 'string') ? { sameAs: { id: params.sameAs.id, typeOf: 'Task' } } : undefined
             };
-            await repos.action.cancelWithVoid({ typeOf: authorizeInvoiceAction.typeOf, id: authorizeInvoiceAction.id, cancelAction });
+            await repos.authorizeInvoiceAction.cancelWithVoid({ typeOf: authorizeInvoiceAction.typeOf, id: authorizeInvoiceAction.id, cancelAction });
         }
-        const creditCardService = new GMO.service.Credit({
-            endpoint: String(availableChannel.serviceUrl),
-            useFetch: settings.gmo.useFetch
+        const creditCardService = new gmo_service_1.GMO.service.Credit({
+            endpoint: String(availableChannel.serviceUrl)
         }, { timeout: settings.gmo.timeout });
         let searchTradeResult;
         try {
@@ -89,7 +73,7 @@ function voidTransaction(params) {
         catch (error) {
             // searchTradeでのエラーをハンドリング(2024-01-27~)
             let throwsError = true;
-            if (error.name === 'GMOServiceBadRequestError') {
+            if (error instanceof gmo_service_1.GMO.error.badRequest.GMOBadRequestError) {
                 if (Array.isArray(error.errors) && error.errors.length > 0) {
                     const gmoErrors = error.errors;
                     // 指定されたIDとパスワードの取引が存在しません。
@@ -104,13 +88,13 @@ function voidTransaction(params) {
             }
         }
         // 仮売上であれば取消
-        if (searchTradeResult?.status === GMO.utils.util.JobCd.Auth) {
+        if (searchTradeResult?.status === gmo_service_1.GMO.factory.util.JobCd.Auth) {
             await creditCardService.alterTran({
                 shopId: shopId,
                 shopPass: shopPass,
                 accessId: searchTradeResult.accessId,
                 accessPass: searchTradeResult.accessPass,
-                jobCd: GMO.utils.util.JobCd.Void,
+                jobCd: gmo_service_1.GMO.factory.util.JobCd.Void,
                 siteId: availableChannel.credentials?.siteId,
                 sitePass: availableChannel.credentials?.sitePass
             });

package/lib/chevre/service/payment/faceToFace.d.ts

@@ -1,22 +1,31 @@
 /**
  * 対面決済サービス
  */
-import * as factory from '../../factory';
+import { factory } from '../../factory';
 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 { ProductRepo } from '../../repo/product';
 import type { TaskRepo } from '../../repo/task';
 declare function voidTransaction(__: factory.task.voidPayment.IData): (___: {
     product: ProductRepo;
 }) => Promise<void>;
 declare function payFaceToFace(params: factory.action.trade.pay.IAttributes): (repos: {
-    action: ActionRepo;
+    action?: never;
+    actions: {
+        pay: PayActionRepo;
+        refund: RefundActionRepo;
+    };
     accountingReport: AccountingReportRepo;
     product: ProductRepo;
     task: TaskRepo;
 }) => Promise<void>;
 declare function refundFaceToFace(params: factory.task.refund.IData): (repos: {
-    action: ActionRepo;
+    action?: never;
+    actions: {
+        pay: PayActionRepo;
+        refund: RefundActionRepo;
+    };
     accountingReport: AccountingReportRepo;
     product: ProductRepo;
     task: TaskRepo;

package/lib/chevre/service/payment/faceToFace.js

@@ -1,27 +1,4 @@
 "use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || function (mod) {
-    if (mod && mod.__esModule) return mod;
-    var result = {};
-    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
-    __setModuleDefault(result, mod);
-    return result;
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.payFaceToFace = payFaceToFace;
 exports.refundFaceToFace = refundFaceToFace;
@@ -29,7 +6,7 @@ exports.voidTransaction = voidTransaction;
 /**
  * 対面決済サービス
  */
-const factory = __importStar(require("../../factory"));
+const factory_1 = require("../../factory");
 const onPayActionCompleted_1 = require("./any/onPayActionCompleted");
 const onRefundActionCompletedOrFailed_1 = require("./any/onRefundActionCompletedOrFailed");
 function voidTransaction(__) {
@@ -39,13 +16,13 @@ function voidTransaction(__) {
 }
 function payFaceToFace(params) {
     return async (repos) => {
-        const action = await repos.action.start(params);
+        const action = await repos.actions.pay.start(params);
         try {
             // no op
         }
         catch (error) {
             try {
-                await repos.action.giveUp({ typeOf: action.typeOf, id: action.id, error });
+                await repos.actions.pay.giveUp({ typeOf: action.typeOf, id: action.id, error });
             }
             catch (__) {
                 // 失敗したら仕方ない
@@ -53,7 +30,7 @@ function payFaceToFace(params) {
             throw error;
         }
         const actionResult = {};
-        await repos.action.completeWithVoid({ typeOf: action.typeOf, id: action.id, result: actionResult });
+        await repos.actions.pay.completeWithVoid({ typeOf: action.typeOf, id: action.id, result: actionResult });
         await (0, onPayActionCompleted_1.onPayActionCompleted)({
             // actionStatus: factory.actionStatusType.CompletedActionStatus,
             id: action.id,
@@ -62,19 +39,23 @@ function payFaceToFace(params) {
             project: params.project,
             purpose: params.purpose,
             typeOf: action.typeOf
-        })(repos);
+        })({
+            actions: repos.actions,
+            accountingReport: repos.accountingReport,
+            task: repos.task
+        });
         // return action;
     };
 }
 function refundFaceToFace(params) {
     return async (repos) => {
-        const action = await repos.action.start(params);
+        const action = await repos.actions.refund.start(params);
         try {
             // no op
         }
         catch (error) {
             try {
-                await repos.action.giveUp({ typeOf: action.typeOf, id: action.id, error });
+                await repos.actions.refund.giveUp({ typeOf: action.typeOf, id: action.id, error });
             }
             catch (__) {
                 // no op
@@ -82,16 +63,20 @@ function refundFaceToFace(params) {
             throw error;
         }
         const actionResult = {};
-        await repos.action.completeWithVoid({ typeOf: action.typeOf, id: action.id, result: actionResult });
+        await repos.actions.refund.completeWithVoid({ typeOf: action.typeOf, id: action.id, result: actionResult });
         await (0, onRefundActionCompletedOrFailed_1.onRefundActionCompletedOrFailed)({
-            actionStatus: factory.actionStatusType.CompletedActionStatus,
+            actionStatus: factory_1.factory.actionStatusType.CompletedActionStatus,
             id: action.id,
             object: params.object,
             potentialActions: params.potentialActions,
             project: params.project,
             purpose: params.purpose,
             typeOf: action.typeOf
-        })(repos);
+        })({
+            actions: repos.actions,
+            accountingReport: repos.accountingReport,
+            task: repos.task
+        });
         // return action;
     };
 }

package/lib/chevre/service/payment/factory/createPayObjectServiceOutput.d.ts

@@ -1,4 +1,4 @@
-import * as factory from '../../../factory';
+import { factory } from '../../../factory';
 /**
  * PayAction.object.serviceOutputを作成する
  * 決済カード決済の場合のみ、対象予約情報をserviceOutputに持つ決済カード情報として存在する
@@ -12,5 +12,5 @@ declare function createPayObjectServiceOutput(params: {
         purchaseNumberAuthResult: factory.action.check.paymentMethod.movieTicket.IPurchaseNumberAuthResult;
     };
 }): factory.invoice.IPaymentServiceOutput | undefined;
-type IAcceptedOfferMovieTicketUsed = Pick<factory.order.IAcceptedOffer<factory.order.IReservation>, 'itemOffered' | 'priceSpecification'>;
+type IAcceptedOfferMovieTicketUsed = Pick<factory.order.IAcceptedOffer, 'itemOffered' | 'priceSpecification'>;
 export { createPayObjectServiceOutput, IAcceptedOfferMovieTicketUsed };