@chevre/domain 24.0.0-alpha.7 → 24.0.0-alpha.70

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

@@ -1,17 +1,17 @@
-import type * as GMO from '@motionpicture/gmo-service';
-import * as factory from '../../../factory';
+import type { GMO } from '@motionpicture/gmo-service';
+import { factory } from '../../../factory';
 interface IProcessAlterTranResult {
-    searchTradeArgs?: GMO.factory.credit.ISearchTradeArgs & GMO.factory.credit.IOptionalSiteArgs;
-    searchTradeResult?: GMO.factory.credit.ISearchTradeResult;
-    alterTranArgs?: GMO.factory.credit.IAlterTranArgs & GMO.factory.credit.IOptionalSiteArgs;
-    alterTranResult?: GMO.factory.credit.IAlterTranResult;
+    searchTradeArgs?: GMO.factory.service.credit.ISearchTradeArgs & GMO.factory.service.credit.IOptionalSiteArgs;
+    searchTradeResult?: GMO.factory.service.credit.ISearchTradeResult;
+    alterTranArgs?: GMO.factory.service.credit.IAlterTranArgs & GMO.factory.service.credit.IOptionalSiteArgs;
+    alterTranResult?: GMO.factory.service.credit.IAlterTranResult;
 }
 interface IProcessAlterTranResult4refund {
-    searchTradeArgs?: GMO.factory.credit.ISearchTradeArgs & GMO.factory.credit.IOptionalSiteArgs;
-    searchTradeResult?: GMO.factory.credit.ISearchTradeResult;
+    searchTradeArgs?: GMO.factory.service.credit.ISearchTradeArgs & GMO.factory.service.credit.IOptionalSiteArgs;
+    searchTradeResult?: GMO.factory.service.credit.ISearchTradeResult;
     searchTradeResultAsError?: factory.action.trade.refund.ISearchTradeResultAsError;
-    alterTranArgs?: GMO.factory.credit.IAlterTranArgs & GMO.factory.credit.IOptionalSiteArgs;
-    alterTranResult?: GMO.factory.credit.IAlterTranResult | factory.action.trade.refund.IAlterTranResultAsError;
+    alterTranArgs?: GMO.factory.service.credit.IAlterTranArgs & GMO.factory.service.credit.IOptionalSiteArgs;
+    alterTranResult?: GMO.factory.service.credit.IAlterTranResult | factory.action.trade.refund.IAlterTranResultAsError;
 }
 declare function processAlterTranResult2payRecipe(params: {
     processAlterTranResults: IProcessAlterTranResult[];

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

@@ -1,44 +1,21 @@
 "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.processAlterTranResult2payRecipe = processAlterTranResult2payRecipe;
 exports.processAlterTranResult2refundRecipe = processAlterTranResult2refundRecipe;
-const factory = __importStar(require("../../../factory"));
+const factory_1 = require("../../../factory");
 function processAlterTranResult2payRecipe(params) {
     const { processAlterTranResults, project } = params;
     return {
-        project: { id: project.id, typeOf: factory.organizationType.Project },
+        project: { id: project.id, typeOf: factory_1.factory.organizationType.Project },
         typeOf: 'Recipe',
-        recipeCategory: factory.recipe.RecipeCategory.payCreditCard,
+        recipeCategory: factory_1.factory.recipe.RecipeCategory.payCreditCard,
         step: processAlterTranResults.map(({ searchTradeArgs, searchTradeResult, alterTranArgs, alterTranResult }) => {
             return {
                 typeOf: 'HowToSection',
                 itemListElement: [
                     {
                         typeOf: 'HowToStep',
-                        identifier: factory.recipe.StepIdentifier.searchTrade,
+                        identifier: factory_1.factory.recipe.StepIdentifier.searchTrade,
                         itemListElement: [{
                                 typeOf: 'HowToDirection',
                                 ...(searchTradeArgs !== undefined) ? { beforeMedia: searchTradeArgs } : undefined,
@@ -47,7 +24,7 @@ function processAlterTranResult2payRecipe(params) {
                     },
                     {
                         typeOf: 'HowToStep',
-                        identifier: factory.recipe.StepIdentifier.alterTran,
+                        identifier: factory_1.factory.recipe.StepIdentifier.alterTran,
                         itemListElement: [{
                                 typeOf: 'HowToDirection',
                                 ...(alterTranArgs !== undefined) ? { beforeMedia: alterTranArgs } : undefined,
@@ -63,15 +40,15 @@ function processAlterTranResult2refundRecipe(params) {
     const { processAlterTranResult, project } = params;
     const { searchTradeArgs, searchTradeResult, searchTradeResultAsError, alterTranResult, alterTranArgs } = processAlterTranResult;
     return {
-        project: { id: project.id, typeOf: factory.organizationType.Project },
+        project: { id: project.id, typeOf: factory_1.factory.organizationType.Project },
         typeOf: 'Recipe',
-        recipeCategory: factory.recipe.RecipeCategory.refundCreditCard,
+        recipeCategory: factory_1.factory.recipe.RecipeCategory.refundCreditCard,
         step: [{
                 typeOf: 'HowToSection',
                 itemListElement: [
                     {
                         typeOf: 'HowToStep',
-                        identifier: factory.recipe.StepIdentifier.searchTrade,
+                        identifier: factory_1.factory.recipe.StepIdentifier.searchTrade,
                         itemListElement: [{
                                 typeOf: 'HowToDirection',
                                 ...(searchTradeArgs !== undefined) ? { beforeMedia: searchTradeArgs } : undefined,
@@ -82,7 +59,7 @@ function processAlterTranResult2refundRecipe(params) {
                     },
                     {
                         typeOf: 'HowToStep',
-                        identifier: factory.recipe.StepIdentifier.alterTran,
+                        identifier: factory_1.factory.recipe.StepIdentifier.alterTran,
                         itemListElement: [{
                                 typeOf: 'HowToDirection',
                                 ...(alterTranArgs !== undefined) ? { beforeMedia: alterTranArgs } : undefined,

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

@@ -1,4 +1,4 @@
-import * as factory from '../../../factory';
+import { factory } from '../../../factory';
 import type { PaymentServiceProviderRepo } from '../../../repo/paymentServiceProvider';
 import type { SellerPaymentAcceptedRepo } from '../../../repo/sellerPaymentAccepted';
 interface IGMOInfo {

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

@@ -1,30 +1,7 @@
 "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.getGMOInfoFromSeller = getGMOInfoFromSeller;
-const factory = __importStar(require("../../../factory"));
+const factory_1 = require("../../../factory");
 function getGMOInfoFromSeller(params) {
     return async (repos) => {
         if (params.requirePaymentAccepted) {
@@ -33,7 +10,7 @@ function getGMOInfoFromSeller(params) {
                 codeValue: params.paymentMethodType
             });
             if (paymentAccepted !== true) {
-                throw new factory.errors.Argument('transaction', `payment not accepted [${params.paymentMethodType}]`);
+                throw new factory_1.factory.errors.Argument('transaction', `payment not accepted [${params.paymentMethodType}]`);
             }
         }
         // 決済サービスからcredentialsを取得する
@@ -45,13 +22,13 @@ function getGMOInfoFromSeller(params) {
         });
         const paymentService = paymentServices.shift();
         if (paymentService === undefined) {
-            throw new factory.errors.NotFound('PaymentService');
+            throw new factory_1.factory.errors.NotFound('PaymentService');
         }
         const provider = paymentService.provider;
         const shopId = provider.credentials?.shopId;
         const shopPass = provider.credentials?.shopPass;
         if (typeof shopId !== 'string' || typeof shopPass !== 'string') {
-            throw new factory.errors.Argument('transaction', 'Provider credentials not enough');
+            throw new factory_1.factory.errors.Argument('transaction', 'Provider credentials not enough');
         }
         const returnUrls3dsSetting = provider.credentials?.returnUrls3ds;
         const returnUrls3ds = (Array.isArray(returnUrls3dsSetting)) ? returnUrls3dsSetting : [];

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

@@ -1,16 +1,21 @@
 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 { PaymentServiceRepo } from '../../../repo/paymentService';
 import type { PaymentServiceProviderRepo } from '../../../repo/paymentServiceProvider';
 import type { SellerPaymentAcceptedRepo } from '../../../repo/sellerPaymentAccepted';
 import type { TaskRepo } from '../../../repo/task';
-import * as factory from '../../../factory';
+import { factory } from '../../../factory';
 import { Settings } from '../../../settings';
 /**
  * クレジットカード決済
  */
 declare function payCreditCard(params: factory.action.trade.pay.IAttributes): (repos: {
-    action: ActionRepo;
+    action?: never;
+    actions: {
+        pay: PayActionRepo;
+        refund: RefundActionRepo;
+    };
     accountingReport: AccountingReportRepo;
     paymentAccepted: SellerPaymentAcceptedRepo;
     paymentService: PaymentServiceRepo;

package/lib/chevre/service/payment/creditCard/payCreditCard.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.payCreditCard = payCreditCard;
-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 onPayActionCompleted_1 = require("../any/onPayActionCompleted");
-const factory_1 = require("./factory");
+const factory_2 = require("./factory");
 const getGMOInfoFromSeller_1 = require("./getGMOInfoFromSeller");
 /**
  * クレジットカード決済
@@ -38,7 +15,7 @@ function payCreditCard(params) {
         // CreditCard系統の決済方法タイプは動的
         const paymentMethodType = payObject[0].paymentMethod.typeOf;
         if (typeof paymentMethodType !== 'string') {
-            throw new factory.errors.ArgumentNull('object.paymentMethod.typeOf');
+            throw new factory_1.factory.errors.ArgumentNull('object.paymentMethod.typeOf');
         }
         const paymentServiceId = payObject[0].id;
         const availableChannel = await repos.paymentService.findAvailableChannelCreditCard({
@@ -48,21 +25,20 @@ function payCreditCard(params) {
         });
         const sellerId = params.recipient?.id;
         if (typeof sellerId !== 'string') {
-            throw new factory.errors.ArgumentNull('recipient.id');
+            throw new factory_1.factory.errors.ArgumentNull('recipient.id');
         }
         const requirePaymentAccepted = false;
         const { shopId, shopPass } = await (0, getGMOInfoFromSeller_1.getGMOInfoFromSeller)({
             paymentMethodType, seller: { id: sellerId }, paymentServiceId,
             requirePaymentAccepted
         })(repos);
-        const action = await repos.action.start(params);
+        const action = await repos.actions.pay.start(params);
         const alterTranResults = [];
         const processAlterTranResults = [];
         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 });
             await Promise.all(payObject.map(async (paymentMethod) => {
                 const processAlterTranResult = await processAlterTran({
@@ -80,13 +56,13 @@ function payCreditCard(params) {
                 }
             }));
             // add recipe(2024-06-03~)
-            recipe = (0, factory_1.processAlterTranResult2payRecipe)({ processAlterTranResults, project: { id: params.project.id } });
+            recipe = (0, factory_2.processAlterTranResult2payRecipe)({ processAlterTranResults, project: { id: params.project.id } });
         }
         catch (error) {
             try {
                 // add recipe(2024-06-29~)
-                recipe = (0, factory_1.processAlterTranResult2payRecipe)({ processAlterTranResults, project: { id: params.project.id } });
-                await repos.action.giveUp({ typeOf: action.typeOf, id: action.id, error, recipe });
+                recipe = (0, factory_2.processAlterTranResult2payRecipe)({ processAlterTranResults, project: { id: params.project.id } });
+                await repos.actions.pay.giveUp({ typeOf: action.typeOf, id: action.id, error, recipe });
             }
             catch (__) {
                 // 失敗したら仕方ない
@@ -96,7 +72,7 @@ function payCreditCard(params) {
         const actionResult = {
         // creditCardSales: alterTranResults // discontinue(2024-06-10~)
         };
-        await repos.action.completeWithVoid({ typeOf: action.typeOf, id: action.id, result: actionResult, recipe });
+        await repos.actions.pay.completeWithVoid({ typeOf: action.typeOf, id: action.id, result: actionResult, recipe });
         await (0, onPayActionCompleted_1.onPayActionCompleted)({
             // actionStatus: factory.actionStatusType.CompletedActionStatus,
             id: action.id,
@@ -105,7 +81,11 @@ function payCreditCard(params) {
             project: params.project,
             purpose: params.purpose,
             typeOf: action.typeOf
-        })(repos);
+        })({
+            actions: repos.actions,
+            accountingReport: repos.accountingReport,
+            task: repos.task
+        });
         // return action;
     };
 }
@@ -130,31 +110,31 @@ function processAlterTran(params) {
             const { accessId, accessPass, forward, approve, tranId, jobCd } = searchTradeResult;
             const amount = paymentMethod.paymentMethod.totalPaymentDue?.value;
             if (typeof amount !== 'number') {
-                throw new factory.errors.ArgumentNull('object.paymentMethod.totalPaymentDue?.value');
+                throw new factory_1.factory.errors.ArgumentNull('object.paymentMethod.totalPaymentDue?.value');
             }
             switch (jobCd) {
-                case GMO.utils.util.JobCd.Capture:
-                case GMO.utils.util.JobCd.Sales:
+                case gmo_service_1.GMO.factory.util.JobCd.Capture:
+                case gmo_service_1.GMO.factory.util.JobCd.Sales:
                     // すでに即時売上済み
                     alterTranResult = { accessId, accessPass, forward, approve, tranId, tranDate: '' };
                     break;
-                case GMO.utils.util.JobCd.Void:
+                case gmo_service_1.GMO.factory.util.JobCd.Void:
                     // 返品手数料決済の場合を追加(状態が取消であれば即時売上)
                     alterTranArgs = {
                         shopId, shopPass, accessId, accessPass,
-                        jobCd: GMO.utils.util.JobCd.Capture,
+                        jobCd: gmo_service_1.GMO.factory.util.JobCd.Capture,
                         amount, // 手数料を指定
                         siteId: params.availableChannel.credentials?.siteId,
                         sitePass: params.availableChannel.credentials?.sitePass,
-                        method: GMO.utils.util.Method.Lump // 再オーソリの場合、支払方法指定は必須
+                        method: gmo_service_1.GMO.factory.util.Method.Lump // 再オーソリの場合、支払方法指定は必須
                     };
                     alterTranResult = await repos.creditService.alterTran(alterTranArgs);
                     break;
-                case GMO.utils.util.JobCd.Auth:
+                case gmo_service_1.GMO.factory.util.JobCd.Auth:
                     alterTranArgs = {
                         shopId, shopPass,
                         accessId, accessPass,
-                        jobCd: GMO.utils.util.JobCd.Sales,
+                        jobCd: gmo_service_1.GMO.factory.util.JobCd.Sales,
                         amount: amount,
                         siteId: params.availableChannel.credentials?.siteId,
                         sitePass: params.availableChannel.credentials?.sitePass
@@ -162,7 +142,7 @@ function processAlterTran(params) {
                     alterTranResult = await repos.creditService.alterTran(alterTranArgs);
                     break;
                 default:
-                    throw new factory.errors.NotImplemented(`jobCd '${jobCd}' not implemented`);
+                    throw new factory_1.factory.errors.NotImplemented(`jobCd '${jobCd}' not implemented`);
             }
         }
         catch (error) {

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

@@ -1,10 +1,11 @@
 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 { PaymentServiceRepo } from '../../../repo/paymentService';
 import type { PaymentServiceProviderRepo } from '../../../repo/paymentServiceProvider';
 import type { SellerPaymentAcceptedRepo } from '../../../repo/sellerPaymentAccepted';
 import type { TaskRepo } from '../../../repo/task';
-import * as factory from '../../../factory';
+import { factory } from '../../../factory';
 import { Settings } from '../../../settings';
 /**
  * refund CreditCard IF payment
@@ -15,7 +16,11 @@ declare function refundCreditCard(params: Pick<factory.action.trade.refund.IAttr
         id: string;
     };
 }): (repos: {
-    action: ActionRepo;
+    action?: never;
+    actions: {
+        pay: PayActionRepo;
+        refund: RefundActionRepo;
+    };
     accountingReport: AccountingReportRepo;
     paymentAccepted: SellerPaymentAcceptedRepo;
     paymentService: PaymentServiceRepo;

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,7 +131,7 @@ 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 (Array.isArray(error.errors) && error.errors.length > 0) {
@@ -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
                         };
@@ -224,9 +204,9 @@ function processAlterTran(params) {
                         if (error.name === 'GMOServiceBadRequestError') {
                             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 };