@chevre/domain 24.0.0-alpha.41 → 24.0.0-alpha.43

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

@@ -1,5 +1,4 @@
 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';
@@ -11,7 +10,7 @@ import type { TaskRepo } from '../../../repo/task';
 import * as factory from '../../../factory';
 import { Settings } from '../../../settings';
 interface IPayOperationRepos {
-    action: ActionRepo;
+    action?: never;
     actions: {
         pay: PayActionRepo;
         refund: RefundActionRepo;

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

@@ -44,15 +44,15 @@ function payMovieTicket(params, options) {
             processSeatInfoSyncResult: { seatInfoSyncIn },
             project: { id: params.project.id }
         });
-        const action = await repos.action.start(startingAction, { recipe });
+        const action = await repos.actions.pay.start(startingAction, { recipe });
         let processSeatInfoSyncResult;
         try {
             // 着券済に対する冪等性を確保する必要はあるが、
             // その他のアクションとしての振る舞いは実行される必要もある
-            const completedPayAction = await repos.action.findPayAction({ project: { id: params.project.id }, paymentMethodId });
+            const completedPayAction = await repos.actions.pay.findPayActionByPaymentMethodId({ project: { id: params.project.id }, paymentMethodId });
             let payRecipe;
             if (completedPayAction !== undefined) {
-                payRecipe = await repos.action.findRecipeByAction({
+                payRecipe = await repos.actions.pay.findRecipeByAction({
                     project: { id: params.project.id },
                     recipeFor: { id: completedPayAction.id }
                 });
@@ -89,7 +89,7 @@ function payMovieTicket(params, options) {
             // アクション保管用のエラーと両方保管(2024-05-22~)
             const errors = [(0, errorHandler_1.handleMvtkReserveError)(error), error];
             try {
-                await repos.action.giveUp({ typeOf: action.typeOf, id: action.id, error: errors });
+                await repos.actions.pay.giveUp({ typeOf: action.typeOf, id: action.id, error: errors });
             }
             catch (__) {
                 // 失敗したら仕方ない
@@ -104,7 +104,7 @@ function payMovieTicket(params, options) {
         //     ? { seatInfoSyncResult: <factory.action.trade.pay.ISeatInfoSyncResult>seatInfoSyncResult }
         //     : undefined
         };
-        await repos.action.completeWithVoid({ typeOf: action.typeOf, id: action.id, result, recipe });
+        await repos.actions.pay.completeWithVoid({ typeOf: action.typeOf, id: action.id, result, recipe });
         if (callOnPayActionCompleted) {
             await (0, onPayActionCompleted_1.onPayActionCompleted)({
                 // actionStatus: factory.actionStatusType.CompletedActionStatus,
@@ -114,7 +114,11 @@ function payMovieTicket(params, options) {
                 project: startingAction.project,
                 purpose: startingAction.purpose,
                 typeOf: action.typeOf
-            })(repos);
+            })({
+                actions: repos.actions,
+                accountingReport: repos.accountingReport,
+                task: repos.task
+            });
         }
     };
 }

package/lib/chevre/service/payment/movieTicket/refundMovieTicket/createSeatInfoSyncCancelInOnRefund.d.ts

@@ -0,0 +1,14 @@
+import * as surfrock from '@surfrock/sdk';
+import type { PayActionRepo } from '../../../../repo/action/pay';
+import * as factory from '../../../../factory';
+export declare function createSeatInfoSyncCancelInOnRefund(params: {
+    project: {
+        id: string;
+    };
+    paymentMethodId: string;
+    payAction: Pick<factory.action.trade.pay.IAction, 'id'>;
+}): (repos: {
+    actions: {
+        pay: PayActionRepo;
+    };
+}) => Promise<surfrock.service.seat.factory.seatInfoSyncCancel.ISeatInfoSyncCancelIn>;

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

@@ -0,0 +1,49 @@
+"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.createSeatInfoSyncCancelInOnRefund = createSeatInfoSyncCancelInOnRefund;
+const surfrock = __importStar(require("@surfrock/sdk"));
+const factory = __importStar(require("../../../../factory"));
+function createSeatInfoSyncCancelInOnRefund(params) {
+    return async (repos) => {
+        const recipe = await repos.actions.pay.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;
+    };
+}

package/lib/chevre/service/payment/movieTicket/refundMovieTicket/createSeatInfoSyncInOnRefund.d.ts

@@ -0,0 +1,14 @@
+import * as surfrock from '@surfrock/sdk';
+import type { PayActionRepo } from '../../../../repo/action/pay';
+import * as factory from '../../../../factory';
+export declare function createSeatInfoSyncInOnRefund(params: {
+    project: {
+        id: string;
+    };
+    paymentMethodId: string;
+    payAction: Pick<factory.action.trade.pay.IAction, 'id'>;
+}): (repos: {
+    actions: {
+        pay: PayActionRepo;
+    };
+}) => Promise<surfrock.factory.service.seat.seatInfoSync.ISeatInfoSyncIn>;

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

@@ -0,0 +1,46 @@
+"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.createSeatInfoSyncInOnRefund = createSeatInfoSyncInOnRefund;
+const surfrock = __importStar(require("@surfrock/sdk"));
+const factory = __importStar(require("../../../../factory"));
+function createSeatInfoSyncInOnRefund(params) {
+    return async (repos) => {
+        const recipe = await repos.actions.pay.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;
+    };
+}

package/lib/chevre/service/payment/movieTicket/refundMovieTicket/processSeatInfoSync.d.ts

@@ -0,0 +1,12 @@
+import * as surfrock from '@surfrock/sdk';
+import * as factory from '../../../../factory';
+import { IProcessSeatInfoSyncResult } from '../factory';
+export declare function processSeatInfoSync(params: {
+    seatInfoSyncIn: factory.action.trade.refund.ISeatInfoSyncIn;
+    paymentMethodId: string;
+    purpose: factory.action.trade.refund.IPurposeAsReturnAction | factory.action.trade.refund.IOrderAsPayPurpose;
+}): (repos: {
+    seatService: surfrock.service.seat.SeatService;
+}) => Promise<IProcessSeatInfoSyncResult & {
+    seatInfoSyncResultAsError?: factory.action.trade.refund.ISeatInfoSyncResultAsError;
+}>;

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

@@ -0,0 +1,72 @@
+"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.processSeatInfoSync = processSeatInfoSync;
+const http_status_1 = require("http-status");
+const errorHandler_1 = require("../../../../errorHandler");
+const factory = __importStar(require("../../../../factory"));
+const factory_1 = require("../factory");
+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;
+            }
+        }
+        return { seatInfoSyncIn, seatInfoSyncResult, seatInfoSyncResultAsError };
+    };
+}

package/lib/chevre/service/payment/movieTicket/refundMovieTicket/processSeatInfoSyncCancel.d.ts

@@ -0,0 +1,8 @@
+import * as surfrock from '@surfrock/sdk';
+import * as factory from '../../../../factory';
+import { IProcessSeatInfoSyncCancelResult } from '../factory';
+export declare function processSeatInfoSyncCancel(params: {
+    seatInfoSyncCancelIn: factory.action.trade.refund.ISeatInfoSyncCancelIn;
+}): (repos: {
+    seatService: surfrock.service.seat.SeatService;
+}) => Promise<IProcessSeatInfoSyncCancelResult>;

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

@@ -0,0 +1,60 @@
+"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.processSeatInfoSyncCancel = processSeatInfoSyncCancel;
+const surfrock = __importStar(require("@surfrock/sdk"));
+const http_status_1 = require("http-status");
+const errorHandler_1 = require("../../../../errorHandler");
+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 };
+    };
+}

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

@@ -1,5 +1,4 @@
 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';
@@ -8,7 +7,7 @@ import type { TaskRepo } from '../../../repo/task';
 import * as factory from '../../../factory';
 import { Settings } from '../../../settings';
 interface IRefundOperationRepos {
-    action: ActionRepo;
+    action?: never;
     actions: {
         pay: PayActionRepo;
         refund: RefundActionRepo;
@@ -30,4 +29,4 @@ declare function refundMovieTicket(params: Pick<factory.action.trade.refund.IAtt
 }, options: {
     callOnPayActionCompleted: boolean;
 }): IRefundOperation<void>;
-export { refundMovieTicket };
+export { IRefundOperationRepos, refundMovieTicket };

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/voidTransaction.d.ts

@@ -1,5 +1,4 @@
 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';
@@ -8,7 +7,6 @@ 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;

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,5 @@
 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';
@@ -19,7 +18,7 @@ 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;
@@ -29,7 +28,7 @@ declare function payPaymentCard(params: factory.action.trade.pay.IAttributes): (
     task: TaskRepo;
 }) => Promise<void>;
 declare function refundPaymentCard(params: factory.task.refund.IData): (repos: {
-    action: ActionRepo;
+    action?: never;
     actions: {
         pay: PayActionRepo;
         refund: RefundActionRepo;