@chevre/domain 24.0.0-alpha.8 → 24.0.0-alpha.80

package/lib/chevre/service/assetTransaction/pay/exportTasksById.js

@@ -1,46 +1,23 @@
 "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;
-};
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.exportTasksById = exportTasksById;
 const moment_1 = __importDefault(require("moment"));
-const factory = __importStar(require("../../../factory"));
+const factory_1 = require("../../../factory");
 /**
  * 取引のタスク出力
  */
 function exportTasksById(params) {
     return async (repos) => {
         const transaction = await repos.assetTransaction.findById({
-            typeOf: factory.assetTransactionType.Pay,
+            typeOf: factory_1.factory.assetTransactionType.Pay,
             id: params.id
         });
         const potentialActions = transaction.potentialActions;
-        if (transaction.status === factory.transactionStatusType.InProgress) {
-            throw new factory.errors.NotImplemented(`Transaction status "${transaction.status}" not implemented.`);
+        if (transaction.status === factory_1.factory.transactionStatusType.InProgress) {
+            throw new factory_1.factory.errors.NotImplemented(`Transaction status "${transaction.status}" not implemented.`);
         }
         const taskAttributes = [];
         // タスク実行日時バッファの指定があれば調整
@@ -60,8 +37,8 @@ function exportTasksById(params) {
         };
         const voidPaymentTasks = {
             project: transaction.project,
-            name: factory.taskName.VoidPayment,
-            status: factory.taskStatus.Ready,
+            name: factory_1.factory.taskName.VoidPayment,
+            status: factory_1.factory.taskStatus.Ready,
             runsAt: taskRunsAt,
             remainingNumberOfTries: 10,
             numberOfTried: 0,
@@ -72,21 +49,21 @@ function exportTasksById(params) {
         const onAssetTransactionStatusChangedTaskData = {
             project: transaction.project,
             object: {
-                typeOf: factory.assetTransactionType.Pay,
+                typeOf: factory_1.factory.assetTransactionType.Pay,
                 transactionNumber: transaction.transactionNumber,
                 status: transaction.status
             },
             purpose: {
                 confirmationNumber: '',
                 orderNumber: '',
-                typeOf: factory.order.OrderType.Order
+                typeOf: factory_1.factory.order.OrderType.Order
             },
             useOnOrderStatusChanged: true
         };
         const onAssetTransactionStatusChangedTask = {
             project: transaction.project,
-            name: factory.taskName.OnAssetTransactionStatusChanged,
-            status: factory.taskStatus.Ready,
+            name: factory_1.factory.taskName.OnAssetTransactionStatusChanged,
+            status: factory_1.factory.taskStatus.Ready,
             runsAt: taskRunsAt,
             remainingNumberOfTries: 10,
             numberOfTried: 0,
@@ -94,15 +71,15 @@ function exportTasksById(params) {
             data: onAssetTransactionStatusChangedTaskData
         };
         switch (transaction.status) {
-            case factory.transactionStatusType.Confirmed:
+            case factory_1.factory.transactionStatusType.Confirmed: {
                 const payActions = potentialActions?.pay;
                 if (Array.isArray(payActions) && payActions.length > 0) {
                     const payTasks = payActions.map(({ object, purpose }) => {
                         const data = { object, purpose };
                         return {
                             project: transaction.project,
-                            name: factory.taskName.Pay,
-                            status: factory.taskStatus.Ready,
+                            name: factory_1.factory.taskName.Pay,
+                            status: factory_1.factory.taskStatus.Ready,
                             runsAt: taskRunsAt,
                             remainingNumberOfTries: 10,
                             numberOfTried: 0,
@@ -113,14 +90,15 @@ function exportTasksById(params) {
                     taskAttributes.push(...payTasks);
                 }
                 break;
-            case factory.transactionStatusType.Canceled:
+            }
+            case factory_1.factory.transactionStatusType.Canceled:
                 taskAttributes.push(voidPaymentTasks, onAssetTransactionStatusChangedTask);
                 break;
-            case factory.transactionStatusType.Expired:
+            case factory_1.factory.transactionStatusType.Expired:
                 taskAttributes.push(voidPaymentTasks, onAssetTransactionStatusChangedTask);
                 break;
             default:
-                throw new factory.errors.NotImplemented(`Transaction status "${transaction.status}" not implemented.`);
+                throw new factory_1.factory.errors.NotImplemented(`Transaction status "${transaction.status}" not implemented.`);
         }
         return repos.task.saveMany(taskAttributes, { emitImmediately: true });
     };

package/lib/chevre/service/assetTransaction/pay/publishPaymentUrl.d.ts

@@ -1,22 +1,25 @@
-import * as factory from '../../../factory';
+import { factory } from '../../../factory';
 import { Settings } from '../../../settings';
-import type { AcceptedPaymentMethodRepo } from '../../../repo/acceptedPaymentMethod';
-import type { ActionRepo } from '../../../repo/action';
+import type { AcceptPayActionRepo } from '../../../repo/action/acceptPay';
+import type { AuthorizeInvoiceActionRepo } from '../../../repo/action/authorizeInvoice';
 import type { EventRepo } from '../../../repo/event';
 import type { EventSeriesRepo } from '../../../repo/eventSeries';
+import type { IssuerRepo } from '../../../repo/issuer';
 import type { PaymentServiceRepo } from '../../../repo/paymentService';
 import type { PaymentServiceProviderRepo } from '../../../repo/paymentServiceProvider';
 import type { SellerPaymentAcceptedRepo } from '../../../repo/sellerPaymentAccepted';
 import * as CreditCardPayment from '../../payment/creditCard';
-export type IPublishPaymentUrlOperation<T> = (repos: {
-    acceptedPaymentMethod: AcceptedPaymentMethodRepo;
-    action: ActionRepo;
+export interface IPublishPaymentUrlRepos {
+    authorizeInvoiceAction: AuthorizeInvoiceActionRepo;
+    acceptPayAction: AcceptPayActionRepo;
     event: EventRepo;
     eventSeries: EventSeriesRepo;
+    issuer: IssuerRepo;
     paymentAccepted: SellerPaymentAcceptedRepo;
     paymentService: PaymentServiceRepo;
     paymentServiceProvider: PaymentServiceProviderRepo;
-}, settings: Settings) => Promise<T>;
+}
+export type IPublishPaymentUrlOperation<T> = (repos: IPublishPaymentUrlRepos, settings: Settings) => Promise<T>;
 export type IPublishPaymentUrlResult = CreditCardPayment.IPaymentAgencyTransaction & {
     paymentMethodId: string;
     paymentUrl: string;

package/lib/chevre/service/assetTransaction/pay/publishPaymentUrl.js

@@ -15,31 +15,41 @@ var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (
 }) : 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;
-};
+var __importStar = (this && this.__importStar) || (function () {
+    var ownKeys = function(o) {
+        ownKeys = Object.getOwnPropertyNames || function (o) {
+            var ar = [];
+            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
+            return ar;
+        };
+        return ownKeys(o);
+    };
+    return function (mod) {
+        if (mod && mod.__esModule) return mod;
+        var result = {};
+        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
+        __setModuleDefault(result, mod);
+        return result;
+    };
+})();
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.publishPaymentUrl = publishPaymentUrl;
-const factory = __importStar(require("../../../factory"));
+const factory_1 = require("../../../factory");
 const CreditCardPayment = __importStar(require("../../payment/creditCard"));
 const validateAcceptedPaymentMethodIfNeeded_1 = require("./start/preStart/validateAcceptedPaymentMethodIfNeeded");
 const validateSeller_1 = require("./start/preStart/validateSeller");
 function publishPaymentUrlResult2recipe(params) {
     const { project, result } = 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.publishPaymentUrl,
+        recipeCategory: factory_1.factory.recipe.RecipeCategory.publishPaymentUrl,
         step: [{
                 typeOf: 'HowToSection',
                 itemListElement: [
                     {
                         typeOf: 'HowToStep',
-                        identifier: factory.recipe.StepIdentifier.entryTran,
+                        identifier: factory_1.factory.recipe.StepIdentifier.entryTran,
                         itemListElement: [{
                                 typeOf: 'HowToDirection',
                                 beforeMedia: result.entryTranArgs,
@@ -49,7 +59,7 @@ function publishPaymentUrlResult2recipe(params) {
                     },
                     {
                         typeOf: 'HowToStep',
-                        identifier: factory.recipe.StepIdentifier.execTran,
+                        identifier: factory_1.factory.recipe.StepIdentifier.execTran,
                         itemListElement: [{
                                 typeOf: 'HowToDirection',
                                 beforeMedia: result.execTranArgs,
@@ -70,11 +80,11 @@ function publishPaymentUrl(params, options) {
         // 金額をfix
         const amount = params.object.paymentMethod?.amount;
         if (typeof amount !== 'number') {
-            throw new factory.errors.ArgumentNull('object.paymentMethod.amount');
+            throw new factory_1.factory.errors.ArgumentNull('object.paymentMethod.amount');
         }
         const transactionNumber = params.transactionNumber;
         if (typeof transactionNumber !== 'string' || transactionNumber.length === 0) {
-            throw new factory.errors.ArgumentNull('transactionNumber');
+            throw new factory_1.factory.errors.ArgumentNull('transactionNumber');
         }
         await (0, validateSeller_1.validateSeller)(params)(repos);
         // リソースの対応決済方法検証(2025-12-02~)
@@ -85,14 +95,14 @@ function publishPaymentUrl(params, options) {
         const taskId = options?.executor?.id;
         const actionAttributes = {
             project: params.project,
-            typeOf: factory.actionType.AcceptAction,
+            typeOf: factory_1.factory.actionType.AcceptAction,
             agent: params.agent,
             object: {
                 object: params.object,
                 transactionNumber,
                 typeOf: params.typeOf
             },
-            purpose: { typeOf: factory.transactionType.PlaceOrder, id: options.purposeAsTransaction.id },
+            purpose: { typeOf: factory_1.factory.transactionType.PlaceOrder, id: options.purposeAsTransaction.id },
             instrument: (Array.isArray(params.instrument)) ? params.instrument : [],
             ...(typeof taskId === 'string')
                 ? { sameAs: { id: taskId, typeOf: 'Task' } } // タスク関連付け(2024-05-22~)
@@ -102,12 +112,12 @@ function publishPaymentUrl(params, options) {
                 : undefined,
             ...(typeof params.identifier === 'string') ? { identifier: params.identifier } : undefined
         };
-        const action = await repos.action.start(actionAttributes);
+        const action = await repos.acceptPayAction.start(actionAttributes);
         let result;
         let recipe;
         try {
             switch (paymentServiceType) {
-                case factory.service.paymentService.PaymentServiceType.CreditCard:
+                case factory_1.factory.service.paymentService.PaymentServiceType.CreditCard: {
                     const authorizeResult = await CreditCardPayment.authorize({
                         ...params,
                         id: '' // 決済URL発行プロセスにおいては決済取引IDは使用しないので空文字でok
@@ -125,7 +135,7 @@ function publishPaymentUrl(params, options) {
                         paymentUrl = authorizeResult.execTranResult.acsUrl;
                     }
                     if (typeof paymentUrl !== 'string' || paymentUrl.length === 0) {
-                        throw new factory.errors.Internal(`Payment URL unable to publish. [retUrl: ${retUrl}]`);
+                        throw new factory_1.factory.errors.Internal(`Payment URL unable to publish. [retUrl: ${retUrl}]`);
                     }
                     result = {
                         paymentMethodId: transactionNumber,
@@ -141,13 +151,14 @@ function publishPaymentUrl(params, options) {
                         result
                     });
                     break;
+                }
                 default:
-                    throw new factory.errors.NotImplemented(`Payment service '${paymentServiceType}' not implemented`);
+                    throw new factory_1.factory.errors.NotImplemented(`Payment service '${paymentServiceType}' not implemented`);
             }
         }
         catch (error) {
             try {
-                await repos.action.giveUp({ typeOf: actionAttributes.typeOf, id: action.id, error });
+                await repos.acceptPayAction.giveUp({ typeOf: actionAttributes.typeOf, id: action.id, error });
             }
             catch (__) {
                 // 失敗したら仕方ない
@@ -158,7 +169,7 @@ function publishPaymentUrl(params, options) {
             paymentMethodId: result.paymentMethodId,
             paymentUrl: result.paymentUrl
         };
-        await repos.action.completeWithVoid({ typeOf: actionAttributes.typeOf, id: action.id, result: actionResult, recipe });
+        await repos.acceptPayAction.completeWithVoid({ typeOf: actionAttributes.typeOf, id: action.id, result: actionResult, recipe });
         return result;
     };
 }
@@ -170,16 +181,16 @@ function getPaymentServiceId(params) {
     }
     else {
         switch (paymentServiceType) {
-            case factory.service.paymentService.PaymentServiceType.FaceToFace:
+            case factory_1.factory.service.paymentService.PaymentServiceType.FaceToFace:
                 // 対面決済は特に何もしない
                 break;
-            case factory.service.paymentService.PaymentServiceType.PaymentCard:
-            case factory.service.paymentService.PaymentServiceType.CreditCard:
-            case factory.service.paymentService.PaymentServiceType.MovieTicket:
+            // case factory.service.paymentService.PaymentServiceType.PaymentCard:
+            case factory_1.factory.service.paymentService.PaymentServiceType.CreditCard:
+            case factory_1.factory.service.paymentService.PaymentServiceType.MovieTicket:
                 // リクエストでの指定を必須化(2022-04-12~)
-                throw new factory.errors.ArgumentNull('object.id');
+                throw new factory_1.factory.errors.ArgumentNull('object.id');
             default:
-                throw new factory.errors.NotImplemented(`Payment service '${paymentServiceType}' not implemented`);
+                throw new factory_1.factory.errors.NotImplemented(`Payment service '${paymentServiceType}' not implemented`);
         }
     }
     return paymentServiceId;

package/lib/chevre/service/assetTransaction/pay/searchGMOTrade.d.ts

@@ -1,7 +1,7 @@
 /**
  * 決済取引サービス
  */
-import type * as GMO from '@motionpicture/gmo-service';
+import type { GMO } from '@motionpicture/gmo-service';
 import { Settings } from '../../../settings';
 import type { AssetTransactionRepo } from '../../../repo/assetTransaction';
 import type { PaymentServiceRepo } from '../../../repo/paymentService';
@@ -17,4 +17,4 @@ export declare function searchGMOTrade(params: {
     paymentService: PaymentServiceRepo;
     paymentServiceProvider: PaymentServiceProviderRepo;
     assetTransaction: AssetTransactionRepo;
-}, settings: Settings) => Promise<GMO.factory.credit.ISearchTradeResult>;
+}, settings: Settings) => Promise<GMO.factory.service.credit.ISearchTradeResult>;

package/lib/chevre/service/assetTransaction/pay/searchGMOTrade.js

@@ -15,16 +15,26 @@ var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (
 }) : 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;
-};
+var __importStar = (this && this.__importStar) || (function () {
+    var ownKeys = function(o) {
+        ownKeys = Object.getOwnPropertyNames || function (o) {
+            var ar = [];
+            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
+            return ar;
+        };
+        return ownKeys(o);
+    };
+    return function (mod) {
+        if (mod && mod.__esModule) return mod;
+        var result = {};
+        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
+        __setModuleDefault(result, mod);
+        return result;
+    };
+})();
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.searchGMOTrade = searchGMOTrade;
-const factory = __importStar(require("../../../factory"));
+const factory_1 = require("../../../factory");
 const CreditCardPayment = __importStar(require("../../payment/creditCard"));
 /**
  * 決済代行取引参照
@@ -32,11 +42,11 @@ const CreditCardPayment = __importStar(require("../../payment/creditCard"));
 function searchGMOTrade(params) {
     return async (repos, settings) => {
         const assetTransaction = await repos.assetTransaction.findByTransactionNumber({
-            typeOf: factory.assetTransactionType.Pay,
+            typeOf: factory_1.factory.assetTransactionType.Pay,
             transactionNumber: params.transactionNumber
         });
-        if (assetTransaction.object.typeOf !== factory.service.paymentService.PaymentServiceType.CreditCard) {
-            throw new factory.errors.Argument('transactionNumber', 'must be CreditCard payment service');
+        if (assetTransaction.object.typeOf !== factory_1.factory.service.paymentService.PaymentServiceType.CreditCard) {
+            throw new factory_1.factory.errors.Argument('transactionNumber', 'must be CreditCard payment service');
         }
         // if (assetTransaction.status !== factory.transactionStatusType.Confirmed) {
         //     throw new factory.errors.Argument('transactionNumber', 'must be confirmed');
@@ -44,7 +54,7 @@ function searchGMOTrade(params) {
         // CreditCard系統の決済方法タイプは動的
         const paymentMethodType = assetTransaction.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 paymentServiceId = String(assetTransaction.object.id);
         const availableChannel = await repos.paymentService.findAvailableChannelCreditCard({
@@ -54,7 +64,7 @@ function searchGMOTrade(params) {
         });
         const sellerId = assetTransaction.recipient?.id;
         if (typeof sellerId !== 'string') {
-            throw new factory.errors.ArgumentNull('recipient.id');
+            throw new factory_1.factory.errors.ArgumentNull('recipient.id');
         }
         const { shopId, shopPass } = await CreditCardPayment.getGMOInfoFromSeller({
             paymentMethodType,

package/lib/chevre/service/assetTransaction/pay/start/factory.d.ts

@@ -1,7 +1,7 @@
 /**
  * 決済取引ファクトリー
  */
-import * as factory from '../../../../factory';
+import { factory } from '../../../../factory';
 import type { IPaymentAgencyTransaction } from '../../../payment/creditCard';
 /**
  * 決済取引開始パラメータ生成

package/lib/chevre/service/assetTransaction/pay/start/factory.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.createStartParams = createStartParams;
 exports.createAuthorizeCreditCardOptions = createAuthorizeCreditCardOptions;
@@ -29,14 +6,14 @@ exports.createAuthorizeMovieTicketOptions = createAuthorizeMovieTicketOptions;
 /**
  * 決済取引ファクトリー
  */
-const factory = __importStar(require("../../../../factory"));
+const factory_1 = require("../../../../factory");
 function createServiceOutputAsPayTransactionObject(params) {
     return {
         serviceOutput: (params.object.serviceOutput?.typeOf === 'Invoice')
             ? params.object.serviceOutput
             : {
                 typeOf: 'Invoice',
-                referencesOrder: { typeOf: factory.order.OrderType.Order }
+                referencesOrder: { typeOf: factory_1.factory.order.OrderType.Order }
             }
     };
 }
@@ -47,11 +24,11 @@ function createStartParams(params, options) {
     // 金額をfix
     const amount = params.object.paymentMethod?.amount;
     if (typeof amount !== 'number') {
-        throw new factory.errors.ArgumentNull('object.paymentMethod.amount');
+        throw new factory_1.factory.errors.ArgumentNull('object.paymentMethod.amount');
     }
     const transactionNumber = params.transactionNumber;
     if (typeof transactionNumber !== 'string' || transactionNumber.length === 0) {
-        throw new factory.errors.ArgumentNull('transactionNumber');
+        throw new factory_1.factory.errors.ArgumentNull('transactionNumber');
     }
     const { instrument } = params;
     const paymentServiceId = (params.paymentService !== undefined)
@@ -62,32 +39,32 @@ function createStartParams(params, options) {
         ? params.paymentService.serviceType?.codeValue
         : params.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');
     }
     let totalPaymentDue;
     let accountId = params.object.paymentMethod?.accountId;
     switch (params.paymentServiceType) {
-        case factory.service.paymentService.PaymentServiceType.FaceToFace:
+        case factory_1.factory.service.paymentService.PaymentServiceType.FaceToFace:
             // 対面決済ではとりあえず問答無用にJPY
             totalPaymentDue = {
                 typeOf: 'MonetaryAmount',
-                currency: factory.priceCurrency.JPY,
+                currency: factory_1.factory.priceCurrency.JPY,
                 value: amount
             };
             break;
-        case factory.service.paymentService.PaymentServiceType.CreditCard:
+        case factory_1.factory.service.paymentService.PaymentServiceType.CreditCard:
             totalPaymentDue = {
                 typeOf: 'MonetaryAmount',
-                currency: factory.priceCurrency.JPY,
+                currency: factory_1.factory.priceCurrency.JPY,
                 value: amount
             };
             accountId = ''; // 強制的に空文字化(2024-06-14~)
             break;
-        case factory.service.paymentService.PaymentServiceType.MovieTicket:
+        case factory_1.factory.service.paymentService.PaymentServiceType.MovieTicket: {
             const specifiedMovieTickets = params.object.paymentMethod?.movieTickets;
             totalPaymentDue = {
                 typeOf: 'MonetaryAmount',
-                currency: factory.unitCode.C62,
+                currency: factory_1.factory.unitCode.C62,
                 value: (Array.isArray(specifiedMovieTickets)) ? specifiedMovieTickets.length : 0
             };
             // MovieTicketIFの決済取引において最大同時着券数を設定可能にする(2023-03-27~)
@@ -95,7 +72,7 @@ function createStartParams(params, options) {
             const totalPaymentDueValue = totalPaymentDue.value;
             if (typeof totalPaymentDueValue === 'number' && typeof totalPaymentDueMaxValue === 'number') {
                 if (totalPaymentDueValue > totalPaymentDueMaxValue) {
-                    throw new factory.errors.Argument('paymentMethod.movieTickets', `Number of movieTickets must be less than or equal to ${totalPaymentDueMaxValue}`);
+                    throw new factory_1.factory.errors.Argument('paymentMethod.movieTickets', `Number of movieTickets must be less than or equal to ${totalPaymentDueMaxValue}`);
                 }
             }
             // 強制的にidentifierで上書き(2024-06-14~)
@@ -103,6 +80,7 @@ function createStartParams(params, options) {
                 ? specifiedMovieTickets[0].identifier // 決済カードidentifierは1つのみ許可の前提
                 : '';
             break;
+        }
         default:
         // no op
     }
@@ -110,14 +88,14 @@ function createStartParams(params, options) {
     //     paymentService: <factory.service.paymentService.IService | undefined>params.paymentService
     // });
     // currencyはデフォルトでJPY
-    let paymentMethodCurrency = factory.priceCurrency.JPY;
-    if (params.paymentServiceType === factory.service.paymentService.PaymentServiceType.PaymentCard) {
-        const paymentCardServiceOutputCurrency = params.paymentService?.serviceOutput?.amount?.currency;
-        if (typeof paymentCardServiceOutputCurrency === 'string') {
-            paymentMethodCurrency = paymentCardServiceOutputCurrency;
-        }
-    }
-    else if (params.paymentServiceType === factory.service.paymentService.PaymentServiceType.CreditCard) {
+    let paymentMethodCurrency = factory_1.factory.priceCurrency.JPY;
+    // if (params.paymentServiceType === factory.service.paymentService.PaymentServiceType.PaymentCard) {
+    //     const paymentCardServiceOutputCurrency = (params.paymentService as factory.product.IProduct)?.serviceOutput?.amount?.currency;
+    //     if (typeof paymentCardServiceOutputCurrency === 'string') {
+    //         paymentMethodCurrency = paymentCardServiceOutputCurrency;
+    //     }
+    // } else
+    if (params.paymentServiceType === factory_1.factory.service.paymentService.PaymentServiceType.CreditCard) {
         const creditCardPaymentServiceOutput = params.paymentService?.serviceOutput;
         const invoiceAsServiceOutput = (Array.isArray(creditCardPaymentServiceOutput))
             ? creditCardPaymentServiceOutput.find((output) => output?.typeOf === 'Invoice')
@@ -160,7 +138,7 @@ function createStartParams(params, options) {
         ...(Array.isArray(params.object.paymentMethod?.movieTickets))
             ? { movieTickets: params.object.paymentMethod?.movieTickets }
             : undefined,
-        ...(params.paymentServiceType === factory.service.paymentService.PaymentServiceType.CreditCard)
+        ...(params.paymentServiceType === factory_1.factory.service.paymentService.PaymentServiceType.CreditCard)
             ? { paymentMethodId: params.transactionNumber } // 必要ないはずだが互換性維持対応(2024-06-14~)
             : undefined
     };
@@ -172,20 +150,20 @@ function createStartParams(params, options) {
         id: paymentServiceId,
         paymentMethod,
         serviceOutput, // support serviceOutput(2025-11-24~)
-        ...(params.paymentServiceType === factory.service.paymentService.PaymentServiceType.MovieTicket)
+        ...(params.paymentServiceType === factory_1.factory.service.paymentService.PaymentServiceType.MovieTicket)
             ? { checkedAction: { id: options.checkedAction.id } } // add checkedAction(2024-12-13~)
             : undefined
     };
     const potentialAction = [];
     params.informActions.forEach((informAction) => {
         if (typeof informAction.id === 'string' && informAction.id !== '') {
-            potentialAction.push({ id: informAction.id, typeOf: factory.actionType.InformAction });
+            potentialAction.push({ id: informAction.id, typeOf: factory_1.factory.actionType.InformAction });
         }
     });
     return {
-        project: { typeOf: factory.organizationType.Project, id: params.project.id },
+        project: { typeOf: factory_1.factory.organizationType.Project, id: params.project.id },
         transactionNumber: params.transactionNumber,
-        typeOf: factory.assetTransactionType.Pay,
+        typeOf: factory_1.factory.assetTransactionType.Pay,
         agent: params.agent,
         recipient: params.recipient,
         object,

package/lib/chevre/service/assetTransaction/pay/start/preStart/fixPaymentService.d.ts

@@ -1,4 +1,4 @@
-import * as factory from '../../../../../factory';
+import { factory } from '../../../../../factory';
 import type { PaymentServiceRepo } from '../../../../../repo/paymentService';
 import type { ProductRepo } from '../../../../../repo/product';
 export declare function fixPaymentService(params: factory.assetTransaction.pay.IStartParamsWithoutDetail): (repos: {