@chevre/domain 24.0.0-alpha.40 → 24.0.0-alpha.42

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

@@ -28,12 +28,15 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.refundMovieTicket = refundMovieTicket;
 const surfrock = __importStar(require("@surfrock/sdk"));
-const http_status_1 = require("http-status");
 const moment_1 = __importDefault(require("moment"));
 const errorHandler_1 = require("../../../errorHandler");
 const factory = __importStar(require("../../../factory"));
 const onRefundActionCompletedOrFailed_1 = require("../any/onRefundActionCompletedOrFailed");
 const factory_1 = require("./factory");
+const createSeatInfoSyncCancelInOnRefund_1 = require("./refundMovieTicket/createSeatInfoSyncCancelInOnRefund");
+const createSeatInfoSyncInOnRefund_1 = require("./refundMovieTicket/createSeatInfoSyncInOnRefund");
+const processSeatInfoSync_1 = require("./refundMovieTicket/processSeatInfoSync");
+const processSeatInfoSyncCancel_1 = require("./refundMovieTicket/processSeatInfoSyncCancel");
 function wait4payActionDelayIfNeeded(params) {
     return async (settings) => {
         const { payAction } = params;
@@ -66,7 +69,7 @@ function refundMovieTicket(params, options) {
         const paymentServiceId = params.object[0]?.id;
         // 本アクションに対応するPayActionを取り出す
         // 例えばtimeoutが原因でCompletedActionStatusでない場合、外部サービス側では着券済の可能性もあるので、そこを考慮する
-        const payAction = await repos.action.findPayAction({
+        const payAction = await repos.actions.pay.findPayActionByPaymentMethodId({
             project: { id: params.project.id },
             paymentMethodId,
             actionStatus: {
@@ -99,18 +102,18 @@ function refundMovieTicket(params, options) {
         let seatInfoSyncIn;
         const useSeatInfoSyncCancel = availableChannel.credentials?.useSeatInfoSyncCancel === true;
         if (useSeatInfoSyncCancel) {
-            seatInfoSyncCancelIn = await createSeatInfoSyncCancelInOnRefund({
+            seatInfoSyncCancelIn = await (0, createSeatInfoSyncCancelInOnRefund_1.createSeatInfoSyncCancelInOnRefund)({
                 project: { id: params.project.id },
                 paymentMethodId,
                 payAction: { id: payAction.id }
-            })({ action: repos.action });
+            })({ actions: repos.actions });
         }
         else {
-            seatInfoSyncIn = await createSeatInfoSyncInOnRefund({
+            seatInfoSyncIn = await (0, createSeatInfoSyncInOnRefund_1.createSeatInfoSyncInOnRefund)({
                 project: { id: params.project.id },
                 paymentMethodId,
                 payAction: { id: payAction.id }
-            })({ action: repos.action });
+            })({ actions: repos.actions });
         }
         let recipe = (0, factory_1.processSeatInfoSyncResult2refundRecipe)({
             project: { id: params.project.id },
@@ -123,7 +126,7 @@ function refundMovieTicket(params, options) {
             instrument: (Array.isArray(instrument)) ? instrument : [], // add(2025-02-18~)
             ...(typeof sameAs?.id === 'string') ? { sameAs: { id: sameAs.id, typeOf: 'Task' } } : undefined
         };
-        const action = await repos.action.start(refundActionAttributes, { recipe });
+        const action = await repos.actions.refund.start(refundActionAttributes, { recipe });
         let processSeatInfoSyncCancelResult;
         let processSeatInfoSyncResult;
         try {
@@ -131,13 +134,13 @@ function refundMovieTicket(params, options) {
                 if (seatInfoSyncCancelIn === undefined) {
                     throw new factory.errors.Internal('seatInfoSyncCancelIn must be set');
                 }
-                processSeatInfoSyncCancelResult = await processSeatInfoSyncCancel({ seatInfoSyncCancelIn })({ seatService });
+                processSeatInfoSyncCancelResult = await (0, processSeatInfoSyncCancel_1.processSeatInfoSyncCancel)({ seatInfoSyncCancelIn })({ seatService });
             }
             else {
                 if (seatInfoSyncIn === undefined) {
                     throw new factory.errors.Internal('seatInfoSyncIn must be set');
                 }
-                processSeatInfoSyncResult = await processSeatInfoSync({
+                processSeatInfoSyncResult = await (0, processSeatInfoSync_1.processSeatInfoSync)({
                     seatInfoSyncIn, paymentMethodId, purpose: params.purpose
                 })({ seatService });
             }
@@ -147,7 +150,7 @@ function refundMovieTicket(params, options) {
             message += `決済ID:${paymentMethodId}`; // エラー通知先で情報を読み取りやすくするために、messageに情報付加
             try {
                 const actionError = { ...error, message: message, name: error.name };
-                await repos.action.giveUp({ typeOf: action.typeOf, id: action.id, error: actionError });
+                await repos.actions.refund.giveUp({ typeOf: action.typeOf, id: action.id, error: actionError });
             }
             catch (__) {
                 // 失敗したら仕方ない
@@ -159,7 +162,7 @@ function refundMovieTicket(params, options) {
         const seatInfoSyncResultAsError = processSeatInfoSyncResult?.seatInfoSyncResultAsError;
         let actionStatus;
         if (seatInfoSyncResultAsError !== undefined) {
-            await repos.action.giveUp({ typeOf: action.typeOf, id: action.id, error: seatInfoSyncResultAsError });
+            await repos.actions.refund.giveUp({ typeOf: action.typeOf, id: action.id, error: seatInfoSyncResultAsError });
             actionStatus = factory.actionStatusType.FailedActionStatus;
         }
         else {
@@ -170,7 +173,7 @@ function refundMovieTicket(params, options) {
                 ...(processSeatInfoSyncCancelResult !== undefined) ? { processSeatInfoSyncCancelResult } : undefined
             });
             const actionResult = {};
-            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 });
             actionStatus = factory.actionStatusType.CompletedActionStatus;
         }
         if (callOnPayActionCompleted) {
@@ -182,119 +185,11 @@ function refundMovieTicket(params, options) {
                 project: refundActionAttributes.project,
                 purpose: refundActionAttributes.purpose,
                 typeOf: action.typeOf
-            })(repos);
-        }
-    };
-}
-function createSeatInfoSyncInOnRefund(params) {
-    return async (repos) => {
-        const recipe = await repos.action.findRecipeByAction({
-            project: { id: params.project.id },
-            recipeFor: { id: params.payAction.id }
-        });
-        const seatInfoSyncInOnPay = recipe?.step[0]?.itemListElement[0]?.itemListElement[0]?.beforeMedia;
-        if (seatInfoSyncInOnPay === undefined) {
-            throw new factory.errors.NotFound('PayAction.recipe.step.itemListElement.itemListElement.beforeMedia');
-        }
-        // 着券時のseatInfoSyncInに対してtrkshFlgだけ変更してリクエストする
-        const seatInfoSyncIn = {
-            ...seatInfoSyncInOnPay,
-            trkshFlg: surfrock.factory.service.seat.seatInfoSync.DeleteFlag.True // 取消フラグ
-        };
-        return seatInfoSyncIn;
-    };
-}
-function createSeatInfoSyncCancelInOnRefund(params) {
-    return async (repos) => {
-        const recipe = await repos.action.findRecipeByAction({
-            project: { id: params.project.id },
-            recipeFor: { id: params.payAction.id }
-        });
-        const seatInfoSyncInOnPay = recipe?.step[0]?.itemListElement[0]?.itemListElement[0]?.beforeMedia;
-        if (seatInfoSyncInOnPay === undefined) {
-            throw new factory.errors.NotFound('PayAction.recipe.step.itemListElement.itemListElement.beforeMedia');
-        }
-        const seatInfoSyncCancelIn = {
-            kgygishCd: seatInfoSyncInOnPay.kgygishCd,
-            kgysystmzskyykNo: seatInfoSyncInOnPay.kgygishSstmZskyykNo,
-            kgysystmzskyykNoIkktsCnclFlg: '1',
-            jyuTyp: surfrock.service.seat.factory.seatInfoSyncCancel.JyuTyp.JyuTyp05,
-            jyuTypRmk: ''
-            // knyknrNoInfoIn: [],
-        };
-        return seatInfoSyncCancelIn;
-    };
-}
-function processSeatInfoSyncCancel(params) {
-    return async (repos) => {
-        let seatInfoSyncCancelResult;
-        const { seatInfoSyncCancelIn } = params;
-        try {
-            seatInfoSyncCancelResult = await repos.seatService.seatInfoSyncCancel(seatInfoSyncCancelIn);
-        }
-        catch (error) {
-            let throwsError = true;
-            if (error.name === errorHandler_1.MOVIE_TICKET_RESERVE_REQUEST_ERROR_NAME) {
-                if (error.code === http_status_1.BAD_REQUEST) {
-                    if (Array.isArray(error.errors) && error.errors.length > 0) {
-                        const mvtkReserveServiceError = error.errors[0];
-                        // 興行会社システム座席予約番号存在無の場合、取消済なのでok
-                        if (mvtkReserveServiceError.status === surfrock.factory.ResultStatus.Success) {
-                            const cnclResult = mvtkReserveServiceError.rawResult?.cnclResult;
-                            if (cnclResult === surfrock.service.seat.factory.seatInfoSyncCancel.CancelResult.CancelResult02) {
-                                seatInfoSyncCancelResult = error;
-                                throwsError = false;
-                            }
-                        }
-                    }
-                }
-            }
-            if (throwsError) {
-                throw error;
-            }
-        }
-        return { seatInfoSyncCancelIn, seatInfoSyncCancelResult };
-    };
-}
-function processSeatInfoSync(params) {
-    return async (repos) => {
-        let seatInfoSyncResult;
-        let seatInfoSyncResultAsError;
-        const { seatInfoSyncIn, paymentMethodId, purpose } = params;
-        try {
-            seatInfoSyncResult = await repos.seatService.seatInfoSync(seatInfoSyncIn);
-        }
-        catch (error) {
-            let throwsError = true;
-            // 「存在しない興行会社システム座席予約番号が入力されました」の場合、取消済なのでok
-            if (error.name === errorHandler_1.MOVIE_TICKET_RESERVE_REQUEST_ERROR_NAME) {
-                if (error.code === http_status_1.BAD_REQUEST && error.message === factory_1.MovieticketReserveRequestErrorMessage.NotFound) {
-                    seatInfoSyncResult = error;
-                    throwsError = false;
-                }
-                // ReservationResult 19の内容が不明だがリトライする意味はおそらくないパターン
-                if (error.code === http_status_1.BAD_REQUEST && error.message === factory_1.MovieticketReserveRequestErrorMessage.ReservationResult19) {
-                    seatInfoSyncResult = error;
-                    throwsError = false;
-                }
-                // surfrock: bookingNoが存在しないケースをハンドル(2024-03-13~)
-                const expectedMessage4surfrockNotFound = JSON.stringify({ message: `bookingNo:"${paymentMethodId}" が見つかりません。` });
-                if (error.code === http_status_1.BAD_REQUEST && error.message === expectedMessage4surfrockNotFound) {
-                    seatInfoSyncResult = error;
-                    throwsError = false;
-                }
-                // 着券取消可能期間超過を認識した上でのあえての返金の場合(注文からしばらく経って返品など)(2024-03-19~)
-                if (error.code === http_status_1.BAD_REQUEST && error.message === factory_1.MovieticketReserveRequestErrorMessage.CancellationPeriodPassed) {
-                    if (purpose.typeOf === factory.actionType.ReturnAction) {
-                        seatInfoSyncResultAsError = error;
-                        throwsError = false;
-                    }
-                }
-            }
-            if (throwsError) {
-                throw error;
-            }
+            })({
+                actions: repos.actions,
+                accountingReport: repos.accountingReport,
+                task: repos.task
+            });
         }
-        return { seatInfoSyncIn, seatInfoSyncResult, seatInfoSyncResultAsError };
     };
 }

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

@@ -6,7 +6,6 @@ import type { PaymentServiceProviderRepo } from '../../../repo/paymentServicePro
 import type { SellerPaymentAcceptedRepo } from '../../../repo/sellerPaymentAccepted';
 import type { TaskRepo } from '../../../repo/task';
 import * as factory from '../../../factory';
-import { Settings } from '../../../settings';
 export interface IValidateMovieTicketRepos {
     checkMovieTicketAction: CheckMovieTicketActionRepo;
     credentials: CredentialsRepo;
@@ -23,6 +22,6 @@ export declare function validateMovieTicket(params: factory.assetTransaction.pay
      * placeOrder ID
      */
     id?: string;
-}): (repos: IValidateMovieTicketRepos, settings: Settings) => Promise<{
+}): (repos: IValidateMovieTicketRepos) => Promise<{
     accountsReceivablesByServiceType: factory.assetTransaction.pay.IAccountsReceivableByServiceType[];
 }>;

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

@@ -29,12 +29,11 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.validateMovieTicket = validateMovieTicket;
 const debug_1 = __importDefault(require("debug"));
 const factory = __importStar(require("../../../factory"));
-const processPurchaseNumberAuth_1 = require("./processPurchaseNumberAuth");
 const debug = (0, debug_1.default)('chevre-domain:service:payment');
 function validateMovieTicket(params, paymentServiceId, 
 // useCheckByIdentifierIfNotYet: boolean,
 checkedAction, purpose) {
-    return async (repos, settings) => {
+    return async (repos) => {
         const movieTickets = params.object.paymentMethod?.movieTickets;
         if (!Array.isArray(movieTickets)) {
             throw new factory.errors.Argument('movieTickets', 'object.paymentMethod.movieTickets must be an array');
@@ -100,7 +99,7 @@ checkedAction, purpose) {
             // useCheckByIdentifierIfNotYet,
             checkedAction,
             purpose
-        })(repos, settings);
+        })(repos);
         const accountsReceivablesByServiceType = [];
         // 券種ごとに枚数が足りているか
         const serviceTypes = [...new Set(movieTickets.map((t) => t.serviceType))];
@@ -130,7 +129,7 @@ checkedAction, purpose) {
     };
 }
 function checkByIdentifierIfNotYet(params) {
-    return async (repos, settings) => {
+    return async (repos) => {
         let checkResult;
         let alreadyCheckedAction; // すでにCheckActionが存在すれば認証しない(2023-06-06~)
         const placeOrderId = params.purpose.id;
@@ -138,8 +137,10 @@ function checkByIdentifierIfNotYet(params) {
             // no op
         }
         else {
-            // 注文取引IDの未指定ケースがあるかどうか確認するためにlog
-            console.log('checkByIdentifierIfNotYet: placeOrderId undefined. params:', JSON.stringify(params));
+            // 注文取引IDの未指定ケースは廃止(2026-03-21~)
+            throw new factory.errors.ArgumentNull('purpose.id');
+            // // 注文取引IDの未指定ケースがあるかどうか確認するためにlog
+            // console.log('checkByIdentifierIfNotYet: placeOrderId undefined. params:', JSON.stringify(params));
         }
         const specifiedCheckedActionId = params.checkedAction?.id;
         if (typeof specifiedCheckedActionId === 'string' && specifiedCheckedActionId !== '') {
@@ -157,27 +158,31 @@ function checkByIdentifierIfNotYet(params) {
             }
         }
         else {
-            // 認証IDの未指定ケースがあるかどうか確認するためにlog
-            console.log('checkByIdentifierIfNotYet: specifiedCheckedActionId undefined. params:', JSON.stringify(params));
-            alreadyCheckedAction = (await repos.checkMovieTicketAction.findCompletedCheckActions({
-                // limit: 1,
-                // page: 1,
-                sort: { startDate: factory.sortType.Descending },
-                // typeOf: { $eq: factory.actionType.CheckAction },
-                // actionStatus: { $in: [factory.actionStatusType.CompletedActionStatus] },
-                object: {
-                    typeOf: { $eq: factory.service.paymentService.PaymentServiceType.MovieTicket },
-                    id: { $eq: params.paymentServiceId }, // 指定の決済サービスにおいて
-                    movieTickets: {
-                        identifier: { $eq: params.movieTicketIdentifier }, // 指定の決済カードコードを
-                        serviceOutput: {
-                            reservationFor: { id: { $eq: params.screeningEvent.id } } // 指定のイベントにおいて
-                        }
-                    }
-                },
-                // ...(typeof placeOrderId === 'string') ? { purpose: { id: { $in: [placeOrderId] } } } : undefined
-                ...(typeof placeOrderId === 'string') ? { purpose: { id: placeOrderId } } : undefined
-            })).shift();
+            // 認証IDの未指定ケースは廃止(2026-03-21~)
+            throw new factory.errors.ArgumentNull('checkedAction.id');
+            // // 認証IDの未指定ケースがあるかどうか確認するためにlog
+            // console.log('checkByIdentifierIfNotYet: specifiedCheckedActionId undefined. params:', JSON.stringify(params));
+            // alreadyCheckedAction = (await repos.checkMovieTicketAction.findCompletedCheckActions(
+            //     {
+            //         // limit: 1,
+            //         // page: 1,
+            //         sort: { startDate: factory.sortType.Descending },
+            //         // typeOf: { $eq: factory.actionType.CheckAction },
+            //         // actionStatus: { $in: [factory.actionStatusType.CompletedActionStatus] },
+            //         object: {
+            //             typeOf: { $eq: factory.service.paymentService.PaymentServiceType.MovieTicket },
+            //             id: { $eq: params.paymentServiceId }, // 指定の決済サービスにおいて
+            //             movieTickets: {
+            //                 identifier: { $eq: params.movieTicketIdentifier }, // 指定の決済カードコードを
+            //                 serviceOutput: {
+            //                     reservationFor: { id: { $eq: params.screeningEvent.id } } // 指定のイベントにおいて
+            //                 }
+            //             }
+            //         },
+            //         // ...(typeof placeOrderId === 'string') ? { purpose: { id: { $in: [placeOrderId] } } } : undefined
+            //         ...(typeof placeOrderId === 'string') ? { purpose: { id: placeOrderId } } : undefined
+            //     }
+            // )).shift();
         }
         debug('checkByIdentifierIfNotYet: alreadyCheckedAction:', JSON.stringify(alreadyCheckedAction), 'params:', JSON.stringify(params));
         if (alreadyCheckedAction !== undefined) {
@@ -194,8 +199,11 @@ function checkByIdentifierIfNotYet(params) {
             }
         }
         if (checkResult === undefined) {
-            debug('checkByIdentifier processing because movieTickets not checked yet...', checkResult);
-            checkResult = await (0, processPurchaseNumberAuth_1.processPurchaseNumberAuth)(params)(repos, settings);
+            // 認証IDの未指定ケースは廃止(2026-03-21~)
+            console.error('checkByIdentifierIfNotYet: checkResult undefined. params:', JSON.stringify(params));
+            throw new factory.errors.NotFound('checkResult');
+            // debug('checkByIdentifier processing because movieTickets not checked yet...', checkResult);
+            // checkResult = await processPurchaseNumberAuth(params)(repos, settings);
         }
         return checkResult;
     };

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

@@ -1,12 +1,16 @@
 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 { CredentialsRepo } from '../../../repo/credentials';
 import type { PaymentServiceRepo } from '../../../repo/paymentService';
 import type { TaskRepo } from '../../../repo/task';
 import * as factory from '../../../factory';
 import { Settings } from '../../../settings';
 declare function voidTransaction(params: factory.task.voidPayment.IData): (repos: {
-    action: ActionRepo;
+    actions: {
+        pay: PayActionRepo;
+        refund: RefundActionRepo;
+    };
     accountingReport: AccountingReportRepo;
     credentials: CredentialsRepo;
     paymentService: PaymentServiceRepo;

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

@@ -40,7 +40,7 @@ function voidTransaction(params) {
         }
         // 決済開始時に着券していれば、取消
         // 例えばtimeoutが原因でCompletedActionStatusでない場合、外部サービス側では着券済の可能性もあるので、そこを考慮する
-        const payAction = await repos.action.findPayAction({
+        const payAction = await repos.actions.pay.findPayActionByPaymentMethodId({
             project: { id: transaction.project.id },
             paymentMethodId,
             actionStatus: {

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

@@ -1,6 +1,7 @@
 import * as 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 { AssetTransactionRepo } from '../../repo/assetTransaction';
 import type { ProductRepo } from '../../repo/product';
 import type { TaskRepo } from '../../repo/task';
@@ -17,13 +18,21 @@ declare function voidTransaction(params: factory.task.voidPayment.IData): (repos
     product: ProductRepo;
 }) => Promise<void>;
 declare function payPaymentCard(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 refundPaymentCard(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/paymentCard.js

@@ -250,7 +250,7 @@ function payPaymentCard(params) {
     return async (repos) => {
         const payObject = params.object;
         const paymentServiceId = payObject[0].id;
-        const action = await repos.action.start(params);
+        const action = await repos.actions.pay.start(params);
         try {
             const transactionNumber = payObject[0].paymentMethod.paymentMethodId;
             const availableChannel = await repos.product.findAvailableChannel({
@@ -272,7 +272,7 @@ function payPaymentCard(params) {
         }
         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 (__) {
                 // no op
@@ -280,7 +280,7 @@ function payPaymentCard(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,
@@ -289,7 +289,11 @@ function payPaymentCard(params) {
             project: params.project,
             purpose: params.purpose,
             typeOf: action.typeOf
-        })(repos);
+        })({
+            actions: repos.actions,
+            accountingReport: repos.accountingReport,
+            task: repos.task
+        });
         // return action;
     };
 }
@@ -306,7 +310,7 @@ function refundPaymentCard(params) {
         if (typeof accountNumber !== 'string') {
             throw new factory.errors.ArgumentNull('serviceOutput.paymentAccount.accountNumber');
         }
-        const action = await repos.action.start(params);
+        const action = await repos.actions.refund.start(params);
         let accountTransactionNumber4refund;
         try {
             const availableChannel = await repos.product.findAvailableChannel({
@@ -388,7 +392,7 @@ function refundPaymentCard(params) {
         }
         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
@@ -398,7 +402,7 @@ function refundPaymentCard(params) {
         const result = {
             accountTransaction: { transactionNumber: accountTransactionNumber4refund }
         };
-        await repos.action.completeWithVoid({ typeOf: action.typeOf, id: action.id, result });
+        await repos.actions.refund.completeWithVoid({ typeOf: action.typeOf, id: action.id, result });
         await (0, onRefundActionCompletedOrFailed_1.onRefundActionCompletedOrFailed)({
             actionStatus: factory.actionStatusType.CompletedActionStatus,
             id: action.id,
@@ -407,7 +411,11 @@ function refundPaymentCard(params) {
             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/permit.js

@@ -37,7 +37,7 @@ const AccountService = __importStar(require("./account"));
 function issue(params) {
     return async (repos) => {
         switch (params.issuedThrough.typeOf) {
-            case factory.product.ProductType.PaymentCard:
+            case factory.product.ProductType.PaymentCard: {
                 // 口座開設
                 const openAccountParams = params.serviceOutputs.map((serviceOutput) => {
                     const accountTypeOf = serviceOutput?.paymentAccount?.typeOf;
@@ -76,6 +76,7 @@ function issue(params) {
                     account: repos.account
                 });
                 break;
+            }
             default:
             // no op
         }
@@ -105,7 +106,7 @@ function search(project, params, projection) {
         };
         const productType = params.issuedThrough?.typeOf?.$eq;
         switch (productType) {
-            case factory.product.ProductType.PaymentCard:
+            case factory.product.ProductType.PaymentCard: {
                 const permits = await repos.serviceOutput.search(searchConditions, projection);
                 permitsWithAccountDetail = permits;
                 // 口座詳細取得
@@ -138,6 +139,7 @@ function search(project, params, projection) {
                     });
                 }
                 break;
+            }
             default:
                 permitsWithAccountDetail = await repos.serviceOutput.search(searchConditions, projection);
         }

package/lib/chevre/service/reserve/factory.d.ts

@@ -3,7 +3,7 @@ export declare function optimizeUnderName4inform(params: {
     underName: factory.reservation.IUnderName<factory.reservationType.EventReservation>;
 }): factory.notification.reservation.IMaskedUnderName;
 export type IPotentialInformReservationAction = factory.task.triggerWebhook.IPotentialInformReservationAction;
-export declare const NUM_TRY_INFORM_RESERVATION: number;
+export declare const NUM_TRY_INFORM_RESERVATION = 10;
 export declare function createMoneyTransferActions(params: {
     acceptedOffer?: factory.assetTransaction.reserve.IAcceptedOffer4object;
     reservation: Pick<factory.assetTransaction.reserve.IObjectSubReservation, 'reservedTicket'>;

package/lib/chevre/service/reserve/findByCode.js

@@ -39,7 +39,7 @@ function findByCode(params) {
             code: params.code
         });
         switch (authorization.object.typeOf) {
-            case factory.order.OrderType.Order:
+            case factory.order.OrderType.Order: {
                 const { orderNumber } = authorization.object;
                 if (typeof orderNumber === 'string' && orderNumber.length > 0) {
                     // reservationIdを含む注文の存在を確認するだけでよい
@@ -51,6 +51,7 @@ function findByCode(params) {
                     });
                 }
                 break;
+            }
             default:
                 throw new factory.errors.NotImplemented(`authorization object typeOf: ${authorization.object.typeOf} not implemented`);
         }

package/lib/chevre/service/reserve/searchByOrder.js

@@ -52,7 +52,7 @@ function searchByOrder(params) {
         if (reservationIds.length > 0) {
             switch (offeredThroughIdentifier) {
                 // COA対応
-                case factory.service.webAPI.Identifier.COA:
+                case factory.service.webAPI.Identifier.COA: {
                     const order = (await repos.order.projectFields({
                         limit: 1,
                         page: 1,
@@ -102,6 +102,7 @@ function searchByOrder(params) {
                         });
                     }
                     break;
+                }
                 default:
                     reservations = await repos.reservation.projectFields({
                         project: { id: { $eq: params.project.id } },

package/lib/chevre/service/reserve/verifyToken4reservation.js

@@ -44,7 +44,7 @@ function verifyToken4reservation(params) {
             throw new factory.errors.ArgumentNull('ticket.token or ticket.ticketToken');
         }
         switch (payload.typeOf) {
-            case factory.order.OrderType.Order:
+            case factory.order.OrderType.Order: {
                 orderNumber = payload.orderNumber;
                 if (typeof orderNumber !== 'string' || orderNumber.length === 0) {
                     throw new factory.errors.NotFound('payload.orderNumber');
@@ -66,6 +66,7 @@ function verifyToken4reservation(params) {
                         throw new factory.errors.Argument('token', `invalid orderStatus '${order.orderStatus}'`);
                 }
                 break;
+            }
             default:
                 throw new factory.errors.NotImplemented(`Payload type ${payload.typeOf} not implemented`);
         }

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

@@ -27,7 +27,9 @@ exports.call = call;
 const factory = __importStar(require("../../factory"));
 const acceptedPaymentMethod_1 = require("../../repo/acceptedPaymentMethod");
 const accountingReport_1 = require("../../repo/accountingReport");
-const action_1 = require("../../repo/action");
+// import { ActionRepo } from '../../repo/action';
+const pay_1 = require("../../repo/action/pay");
+const refund_1 = require("../../repo/action/refund");
 const checkMovieTicket_1 = require("../../repo/action/checkMovieTicket");
 const acceptPay_1 = require("../../repo/action/acceptPay");
 const authorizeInvoice_1 = require("../../repo/action/authorizeInvoice");
@@ -80,7 +82,11 @@ function call(params) {
             })({
                 acceptedPaymentMethod: new acceptedPaymentMethod_1.AcceptedPaymentMethodRepo(connection),
                 accountingReport: new accountingReport_1.AccountingReportRepo(connection),
-                action: new action_1.ActionRepo(connection),
+                // action: new ActionRepo(connection),
+                actions: {
+                    pay: new pay_1.PayActionRepo(connection),
+                    refund: new refund_1.RefundActionRepo(connection),
+                },
                 checkMovieTicketAction: new checkMovieTicket_1.CheckMovieTicketActionRepo(connection),
                 acceptPayAction: new acceptPay_1.AcceptPayActionRepo(connection),
                 authorizeInvoiceAction: new authorizeInvoice_1.AuthorizeInvoiceActionRepo(connection),

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

@@ -176,7 +176,7 @@ function confirmReserveTransaction(params, options) {
         // let updReserveResult: COA.factory.reserve.IUpdReserveResult | undefined;
         let recipe;
         switch (params.object.typeOf) {
-            case factory.assetTransactionType.COAReserveTransaction:
+            case factory.assetTransactionType.COAReserveTransaction: {
                 // 最適化されたタスクに対応するため、ここでIObject4COAを注文から生成する(2024-01-24~)
                 const order = await fixOrderAsPurpose({
                     project: { id: params.project.id },
@@ -194,6 +194,7 @@ function confirmReserveTransaction(params, options) {
                     project: { id: params.project.id }
                 });
                 break;
+            }
             default:
                 confirmActionObject = params.object;
         }
@@ -210,7 +211,7 @@ function confirmReserveTransaction(params, options) {
         try {
             const object = confirmActionAttributes.object;
             switch (object.typeOf) {
-                case factory.assetTransactionType.COAReserveTransaction:
+                case factory.assetTransactionType.COAReserveTransaction: {
                     // COA本予約
                     const processConfirmCOAReserveResult = await (0, reserveCOA_1.confirm)({
                         project: { id: confirmActionAttributes.project.id },
@@ -223,6 +224,7 @@ function confirmReserveTransaction(params, options) {
                         project: { id: confirmActionAttributes.project.id }
                     });
                     break;
+                }
                 default:
                     // 予約取引確定
                     await (0, confirm_1.confirm)({