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

package/lib/chevre/repo/action/pay.d.ts

@@ -6,4 +6,20 @@ export type IActionRecipe = factory.action.trade.pay.IPayCreditCardRecipe | fact
  * 決済アクションリポジトリ
  */
 export declare class PayActionRepo extends ActionProcessRepo<IPayAction, IActionRecipe> {
+    /**
+     * 決済方法IDから決済アクションをひとつ参照する
+     * デフォルトでCompletedActionStatusのみ参照
+     */
+    findPayActionByPaymentMethodId(params: {
+        project: {
+            id: string;
+        };
+        paymentMethodId: string;
+        /**
+         * 未指定の場合CompletedActionStatusのみ
+         */
+        actionStatus?: {
+            $in?: factory.actionStatusType[];
+        };
+    }): Promise<factory.action.trade.pay.IAction | undefined>;
 }

package/lib/chevre/repo/action/pay.js

@@ -1,6 +1,30 @@
 "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.PayActionRepo = void 0;
+const factory = __importStar(require("../../factory"));
 // import { MONGO_MAX_TIME_MS } from '../settings';
 // import { createSchema, IModel as IActionModel, modelName } from './mongoose/schemas/action';
 // import { createSchema as createRecipeSchema, IModel as IActionRecipeModel, modelName as recipeModelName } from './mongoose/schemas/actionRecipe';
@@ -9,5 +33,22 @@ const actionProcess_1 = require("./actionProcess");
  * 決済アクションリポジトリ
  */
 class PayActionRepo extends actionProcess_1.ActionProcessRepo {
+    /**
+     * 決済方法IDから決済アクションをひとつ参照する
+     * デフォルトでCompletedActionStatusのみ参照
+     */
+    async findPayActionByPaymentMethodId(params) {
+        const payActions = await this.findAnyActions({
+            limit: 1,
+            page: 1,
+            actionStatus: (Array.isArray(params.actionStatus?.$in))
+                ? { $in: params.actionStatus?.$in }
+                : { $in: [factory.actionStatusType.CompletedActionStatus] },
+            project: { id: { $eq: params.project.id } },
+            typeOf: { $eq: factory.actionType.PayAction },
+            object: { paymentMethod: { paymentMethodId: { $eq: params.paymentMethodId } } }
+        }, []);
+        return payActions.shift();
+    }
 }
 exports.PayActionRepo = PayActionRepo;

package/lib/chevre/repo/action.d.ts

@@ -7,8 +7,8 @@ export { ICancelActionAction };
 /**
  * 汎用アクションリポジトリで開始可能なアクションタイプ
  */
-type StartableActionType = Exclude<factory.actionType, factory.actionType.AcceptAction | factory.actionType.CheckAction | factory.actionType.AuthorizeAction>;
-type IAvailableActionRecipe = IActionRecipe<Exclude<factory.recipe.RecipeCategory, factory.recipe.RecipeCategory.publishPaymentUrl | factory.recipe.RecipeCategory.checkMovieTicket | factory.recipe.RecipeCategory.acceptCOAOffer | factory.recipe.RecipeCategory.authorizeInvoice | factory.recipe.RecipeCategory.authorizeInvoice3ds>>;
+type StartableActionType = Exclude<factory.actionType, factory.actionType.AcceptAction | factory.actionType.CheckAction | factory.actionType.AuthorizeAction | factory.actionType.PayAction | factory.actionType.RefundAction>;
+type IAvailableActionRecipe = IActionRecipe<Exclude<factory.recipe.RecipeCategory, factory.recipe.RecipeCategory.publishPaymentUrl | factory.recipe.RecipeCategory.checkMovieTicket | factory.recipe.RecipeCategory.acceptCOAOffer | factory.recipe.RecipeCategory.authorizeInvoice | factory.recipe.RecipeCategory.authorizeInvoice3ds | factory.recipe.RecipeCategory.payCreditCard | factory.recipe.RecipeCategory.payMovieTicket | factory.recipe.RecipeCategory.refundCreditCard | factory.recipe.RecipeCategory.refundMovieTicket>>;
 /**
  * アクションリポジトリ
  */
@@ -21,15 +21,6 @@ export declare class ActionRepo extends ActionProcessRepo<IAction<StartableActio
             $eq?: T;
         };
     }, inclusion: IKeyOfProjection[]): Promise<IAction<T>[]>;
-    findPayAction(params: {
-        project: {
-            id: string;
-        };
-        paymentMethodId: string;
-        actionStatus?: {
-            $in?: factory.actionStatusType[];
-        };
-    }): Promise<factory.action.trade.pay.IAction | undefined>;
     /**
      * 取引に対するアクションを検索する
      */

package/lib/chevre/repo/action.js

@@ -280,19 +280,26 @@ class ActionRepo extends actionProcess_1.ActionProcessRepo {
     //     }
     //     return doc;
     // }
-    async findPayAction(params) {
-        const payActions = await this.findActionsByType({
-            limit: 1,
-            page: 1,
-            actionStatus: (Array.isArray(params.actionStatus?.$in))
-                ? { $in: params.actionStatus?.$in }
-                : { $in: [factory.actionStatusType.CompletedActionStatus] },
-            project: { id: { $eq: params.project.id } },
-            typeOf: { $eq: factory.actionType.PayAction },
-            object: { paymentMethod: { paymentMethodId: { $eq: params.paymentMethodId } } }
-        }, []);
-        return payActions.shift();
-    }
+    // public async findPayAction(params: {
+    //     project: { id: string };
+    //     paymentMethodId: string;
+    //     actionStatus?: { $in?: factory.actionStatusType[] };
+    // }): Promise<factory.action.trade.pay.IAction | undefined> {
+    //     const payActions = await this.findActionsByType<factory.actionType.PayAction>(
+    //         {
+    //             limit: 1,
+    //             page: 1,
+    //             actionStatus: (Array.isArray(params.actionStatus?.$in))
+    //                 ? { $in: params.actionStatus?.$in }
+    //                 : { $in: [factory.actionStatusType.CompletedActionStatus] },
+    //             project: { id: { $eq: params.project.id } },
+    //             typeOf: { $eq: factory.actionType.PayAction },
+    //             object: { paymentMethod: { paymentMethodId: { $eq: params.paymentMethodId } } }
+    //         },
+    //         []
+    //     ) as factory.action.trade.pay.IAction[];
+    //     return payActions.shift();
+    // }
     /**
      * 取引に対するアクションを検索する
      */

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

@@ -1,7 +1,6 @@
 import * as factory from '../../../../factory';
 import { Settings } from '../../../../settings';
 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 { CheckMovieTicketActionRepo } from '../../../../repo/action/checkMovieTicket';
@@ -17,7 +16,7 @@ import type { TaskRepo } from '../../../../repo/task';
 import { IPaymentAgencyTransaction } from '../../../payment/creditCard';
 export interface IProcessAuthorizeOperationRepos {
     accountingReport: AccountingReportRepo;
-    action: ActionRepo;
+    action?: never;
     actions: {
         pay: PayActionRepo;
         refund: RefundActionRepo;

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

@@ -1,7 +1,6 @@
 import * as factory from '../../../../factory';
 import { Settings } from '../../../../settings';
 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 { CheckMovieTicketActionRepo } from '../../../../repo/action/checkMovieTicket';
@@ -34,7 +33,7 @@ export declare function processAuthorizeMovieTicket(params: factory.assetTransac
     };
 }): (repos: {
     accountingReport: AccountingReportRepo;
-    action: ActionRepo;
+    action?: never;
     actions: {
         pay: PayActionRepo;
         refund: RefundActionRepo;

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

@@ -2,7 +2,6 @@ import * as factory from '../../../factory';
 import { Settings } from '../../../settings';
 import type { AcceptedPaymentMethodRepo } from '../../../repo/acceptedPaymentMethod';
 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 { CheckMovieTicketActionRepo } from '../../../repo/action/checkMovieTicket';
@@ -21,7 +20,7 @@ import { IPaymentAgencyTransaction } from '../../payment/creditCard';
 export interface IStartOperationRepos {
     acceptedPaymentMethod: AcceptedPaymentMethodRepo;
     accountingReport: AccountingReportRepo;
-    action: ActionRepo;
+    action?: never;
     actions: {
         pay: PayActionRepo;
         refund: RefundActionRepo;

package/lib/chevre/service/assetTransaction/refund.d.ts

@@ -1,12 +1,15 @@
 import * as factory from '../../factory';
-import type { ActionRepo } from '../../repo/action';
+import type { PayActionRepo } from '../../repo/action/pay';
 import type { AssetTransactionRepo } from '../../repo/assetTransaction';
 import type { PaymentServiceRepo } from '../../repo/paymentService';
 import type { PotentialActionRepo } from '../../repo/potentialAction';
 import type { ProductRepo } from '../../repo/product';
 import type { TaskRepo } from '../../repo/task';
 export interface IStartOperationRepos {
-    action: ActionRepo;
+    action?: never;
+    actions: {
+        pay: PayActionRepo;
+    };
     paymentService: PaymentServiceRepo;
     potentialAction: PotentialActionRepo;
     product: ProductRepo;

package/lib/chevre/service/assetTransaction/refund.js

@@ -54,7 +54,7 @@ function start(params) {
         });
         const paymentServiceType = payTransaction.object.typeOf;
         // PayActionを確認する
-        const payAction = await repos.action.findPayAction({ project: { id: params.project.id }, paymentMethodId });
+        const payAction = await repos.actions.pay.findPayActionByPaymentMethodId({ project: { id: params.project.id }, paymentMethodId });
         if (payAction === undefined) {
             throw new factory.errors.NotFound(factory.actionType.PayAction);
         }

package/lib/chevre/service/assetTransaction/reserve/start/factory/createStartParams.js

@@ -25,6 +25,7 @@ var __importStar = (this && this.__importStar) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.createStartParams = createStartParams;
 const factory = __importStar(require("../../../../../factory"));
+const USE_DEPRECATED_RESERVATION_AVAILABLE_CHANNEL = process.env.USE_DEPRECATED_RESERVATION_AVAILABLE_CHANNEL === '1';
 function createStartParams(params) {
     const { reservationNumber, acceptedOffers4transactionObject, objectSubReservations, agent, expires, project, instrument } = params;
     const provider = {
@@ -126,18 +127,23 @@ function createIssuedThrough(params) {
         }
         : undefined;
     const availableChannel = eventOffers.itemOffered.availableChannel;
-    if (availableChannel === undefined) {
+    // itemOffered.availableChannel: optional(20226-03-24~)
+    // if (availableChannel === undefined) {
+    //     // availableChannelは必ず存在するはず
+    //     throw new factory.errors.NotFound('reservationFor.offers.availableChannel');
+    // }
+    if (typeof eventOffers.itemOffered.id !== 'string') {
         // availableChannelは必ず存在するはず
-        throw new factory.errors.NotFound('reservationFor.offers.availableChannel');
+        throw new factory.errors.NotFound('reservationFor.offers.itemOffered.id');
     }
     if (params.reservationFor.typeOf === factory.eventType.ScreeningEvent) {
         const issuedThrough = {
             typeOf: factory.product.ProductType.EventService,
             // 興行IDを追加(2022-09-08~)
             id: eventOffers.itemOffered.id,
-            availableChannel,
             // issuedThrough.serviceTypeを連携
-            ...(typeof serviceTypeOfIssuedThrough?.typeOf === 'string') ? { serviceType: serviceTypeOfIssuedThrough } : undefined
+            ...(typeof serviceTypeOfIssuedThrough?.typeOf === 'string') ? { serviceType: serviceTypeOfIssuedThrough } : undefined,
+            ...(USE_DEPRECATED_RESERVATION_AVAILABLE_CHANNEL) && { availableChannel }
         };
         return {
             issuedThrough

package/lib/chevre/service/assetTransaction/reserve/start.js

@@ -244,8 +244,10 @@ function searchEventSeatOffers(params) {
         const eventOffers = params.event.offers;
         const reservedSeatsAvailable = eventOffers?.itemOffered.serviceOutput?.reservedTicket?.ticketedSeat !== undefined;
         if (reservedSeatsAvailable) {
-            const roomBranchCode = String(eventOffers.itemOffered?.availableChannel?.serviceLocation.branchCode);
-            const movieTheaterBranchCode = String(eventOffers.itemOffered?.availableChannel?.serviceLocation.containedInPlace.branchCode);
+            // const roomBranchCode = String(eventOffers.itemOffered?.availableChannel?.serviceLocation.branchCode);
+            // const movieTheaterBranchCode = String(eventOffers.itemOffered?.availableChannel?.serviceLocation.containedInPlace.branchCode);
+            const roomBranchCode = params.event.location.branchCode;
+            const movieTheaterBranchCode = params.event.superEvent.location.branchCode;
             // reimplement using projectSeatsByScreeningRoom
             const seats = await repos.seat.projectSeatsByScreeningRoom({
                 project: { id: { $eq: params.event.project.id } },

package/lib/chevre/service/offer/eventServiceByCOA/authorize/factory.js

@@ -32,6 +32,7 @@ exports.responseBody2acceptedOffers4result = responseBody2acceptedOffers4result;
 const moment_1 = __importDefault(require("moment"));
 const util = __importStar(require("util"));
 const factory = __importStar(require("../../../../factory"));
+const USE_DEPRECATED_RESERVATION_AVAILABLE_CHANNEL = process.env.USE_DEPRECATED_RESERVATION_AVAILABLE_CHANNEL === '1';
 function createAuthorizeSeatReservationActionAttributes(params) {
     const transaction = params.transaction;
     // 最適化(2022-06-07~)
@@ -206,17 +207,19 @@ function responseBody2acceptedOffers4result(params) {
         const issuedThrough = {
             typeOf: factory.product.ProductType.EventService,
             // id: '', // discontinue(2025-01-02~)
-            availableChannel: {
-                typeOf: 'ServiceChannel',
-                serviceLocation: {
-                    typeOf: reservationFor.location.typeOf,
-                    branchCode: reservationFor.location.branchCode,
-                    name: reservationFor.location.name,
-                    containedInPlace: {
-                        typeOf: reservationFor.superEvent.location.typeOf,
-                        id: reservationFor.superEvent.location.id,
-                        branchCode: reservationFor.superEvent.location.branchCode,
-                        name: reservationFor.superEvent.location.name
+            ...(USE_DEPRECATED_RESERVATION_AVAILABLE_CHANNEL) && {
+                availableChannel: {
+                    typeOf: 'ServiceChannel',
+                    serviceLocation: {
+                        typeOf: reservationFor.location.typeOf,
+                        branchCode: reservationFor.location.branchCode,
+                        name: reservationFor.location.name,
+                        containedInPlace: {
+                            typeOf: reservationFor.superEvent.location.typeOf,
+                            id: reservationFor.superEvent.location.id,
+                            branchCode: reservationFor.superEvent.location.branchCode,
+                            name: reservationFor.superEvent.location.name
+                        }
                     }
                 }
             }

package/lib/chevre/service/offer.js

@@ -45,13 +45,15 @@ function searchEventSeatOffersWithPaging(params) {
         const { includeSectionCodeOnlyFirstElement, useDefaultSection } = params.options;
         let offers = [];
         // optimize(2024-07-18~)
-        const event = await repos.event.projectEventFieldsById({ id: params.event.id }, ['project', 'startDate', 'offers.itemOffered', 'organizer']);
+        const event = await repos.event.projectEventFieldsById({ id: params.event.id }, ['project', 'startDate', 'offers.itemOffered', 'organizer', 'location', 'superEvent']);
         // 座席指定利用可能かどうか
         const eventOffers = event.offers;
         const reservedSeatsAvailable = eventOffers?.itemOffered.serviceOutput?.reservedTicket?.ticketedSeat !== undefined;
         if (reservedSeatsAvailable) {
-            const roomBranchCode = String(eventOffers.itemOffered?.availableChannel?.serviceLocation.branchCode);
-            const movieTheaterBranchCode = String(eventOffers.itemOffered?.availableChannel?.serviceLocation.containedInPlace.branchCode);
+            // const roomBranchCode = String(eventOffers.itemOffered?.availableChannel?.serviceLocation.branchCode);
+            // const movieTheaterBranchCode = String(eventOffers.itemOffered?.availableChannel?.serviceLocation.containedInPlace.branchCode);
+            const roomBranchCode = event.location.branchCode;
+            const movieTheaterBranchCode = event.superEvent.location.branchCode;
             let defaultSectionCode;
             if (useDefaultSection) {
                 const defaultSection = (await repos.section.findSectionsByRoom({
@@ -159,7 +161,7 @@ function findEventSeatOffersBySection(params) {
             organizer: { id: { $eq: sellerId } },
             id: { $eq: eventId },
             typeOf: factory.eventType.ScreeningEvent
-        }, ['startDate', 'offers.itemOffered'])).shift();
+        }, ['startDate', 'offers.itemOffered', 'location', 'superEvent'])).shift();
         if (event === undefined) {
             throw new factory.errors.NotFound(factory.eventType.ScreeningEvent);
         }
@@ -167,8 +169,10 @@ function findEventSeatOffersBySection(params) {
         const eventOffers = event.offers;
         const reservedSeatsAvailable = eventOffers?.itemOffered.serviceOutput?.reservedTicket?.ticketedSeat !== undefined;
         if (reservedSeatsAvailable) {
-            const roomBranchCode = String(eventOffers.itemOffered?.availableChannel?.serviceLocation.branchCode);
-            const movieTheaterBranchCode = String(eventOffers.itemOffered?.availableChannel?.serviceLocation.containedInPlace.branchCode);
+            // const roomBranchCode = String(eventOffers.itemOffered?.availableChannel?.serviceLocation.branchCode);
+            // const movieTheaterBranchCode = String(eventOffers.itemOffered?.availableChannel?.serviceLocation.containedInPlace.branchCode);
+            const roomBranchCode = event.location.branchCode;
+            const movieTheaterBranchCode = event.superEvent.location.branchCode;
             const seats = await repos.seat.projectSeatsByScreeningRoom({
                 limit,
                 page,

package/lib/chevre/service/payment/any/authorize.d.ts

@@ -2,7 +2,6 @@ import * as factory from '../../../factory';
 import { Settings } from '../../../settings';
 import type { AcceptedPaymentMethodRepo } from '../../../repo/acceptedPaymentMethod';
 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 { CheckMovieTicketActionRepo } from '../../../repo/action/checkMovieTicket';
@@ -29,7 +28,7 @@ import type { TransactionNumberRepo } from '../../../repo/transactionNumber';
 interface IAuthorizeRepos {
     acceptedPaymentMethod: AcceptedPaymentMethodRepo;
     accountingReport: AccountingReportRepo;
-    action: ActionRepo;
+    action?: never;
     actions: {
         pay: PayActionRepo;
         refund: RefundActionRepo;

package/lib/chevre/service/payment/any/onPayActionCompleted.d.ts

@@ -7,6 +7,7 @@ import type { PayActionRepo } from '../../../repo/action/pay';
 import type { RefundActionRepo } from '../../../repo/action/refund';
 import type { TaskRepo } from '../../../repo/task';
 interface IOnPayActionCompletedRepos {
+    action?: never;
     actions: {
         pay: PayActionRepo;
         refund: RefundActionRepo;

package/lib/chevre/service/payment/any/onRefundActionCompletedOrFailed.d.ts

@@ -4,6 +4,7 @@ import type { PayActionRepo } from '../../../repo/action/pay';
 import type { RefundActionRepo } from '../../../repo/action/refund';
 import type { TaskRepo } from '../../../repo/task';
 interface IOnRefundActionCompletedOrFailedRepos {
+    action?: never;
     actions: {
         pay: PayActionRepo;
         refund: RefundActionRepo;

package/lib/chevre/service/payment/creditCard/payCreditCard.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 { PaymentServiceRepo } from '../../../repo/paymentService';
@@ -12,7 +11,7 @@ import { Settings } from '../../../settings';
  * クレジットカード決済
  */
 declare function payCreditCard(params: factory.action.trade.pay.IAttributes): (repos: {
-    action: ActionRepo;
+    action?: never;
     actions: {
         pay: PayActionRepo;
         refund: RefundActionRepo;

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

@@ -55,7 +55,7 @@ function payCreditCard(params) {
             paymentMethodType, seller: { id: sellerId }, paymentServiceId,
             requirePaymentAccepted
         })(repos);
-        const action = await repos.action.start(params);
+        const action = await repos.actions.pay.start(params);
         const alterTranResults = [];
         const processAlterTranResults = [];
         let recipe;
@@ -86,7 +86,7 @@ function payCreditCard(params) {
             try {
                 // add recipe(2024-06-29~)
                 recipe = (0, factory_1.processAlterTranResult2payRecipe)({ processAlterTranResults, project: { id: params.project.id } });
-                await repos.action.giveUp({ typeOf: action.typeOf, id: action.id, error, recipe });
+                await repos.actions.pay.giveUp({ typeOf: action.typeOf, id: action.id, error, recipe });
             }
             catch (__) {
                 // 失敗したら仕方ない
@@ -96,7 +96,7 @@ function payCreditCard(params) {
         const actionResult = {
         // creditCardSales: alterTranResults // discontinue(2024-06-10~)
         };
-        await repos.action.completeWithVoid({ typeOf: action.typeOf, id: action.id, result: actionResult, recipe });
+        await repos.actions.pay.completeWithVoid({ typeOf: action.typeOf, id: action.id, result: actionResult, recipe });
         await (0, onPayActionCompleted_1.onPayActionCompleted)({
             // actionStatus: factory.actionStatusType.CompletedActionStatus,
             id: action.id,
@@ -105,7 +105,11 @@ function payCreditCard(params) {
             project: params.project,
             purpose: params.purpose,
             typeOf: action.typeOf
-        })(repos);
+        })({
+            actions: repos.actions,
+            accountingReport: repos.accountingReport,
+            task: repos.task
+        });
         // return action;
     };
 }

package/lib/chevre/service/payment/creditCard/refundCreditCard.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 { PaymentServiceRepo } from '../../../repo/paymentService';
@@ -17,7 +16,7 @@ declare function refundCreditCard(params: Pick<factory.action.trade.refund.IAttr
         id: string;
     };
 }): (repos: {
-    action: ActionRepo;
+    action?: never;
     actions: {
         pay: PayActionRepo;
         refund: RefundActionRepo;

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

@@ -53,11 +53,11 @@ function refundCreditCard(params
         let payAction;
         let alterTranResultByPayAction;
         if (requirePayAction) {
-            payAction = await repos.action.findPayAction({ project: { id: params.project.id }, paymentMethodId });
+            payAction = await repos.actions.pay.findPayActionByPaymentMethodId({ project: { id: params.project.id }, paymentMethodId });
             if (payAction === undefined) {
                 throw new factory.errors.NotFound(factory.actionType.PayAction);
             }
-            const payRecipe = await repos.action.findRecipeByAction({
+            const payRecipe = await repos.actions.pay.findRecipeByAction({
                 project: { id: params.project.id },
                 recipeFor: { id: payAction.id }
             });
@@ -73,7 +73,7 @@ function refundCreditCard(params
             id: paymentServiceId
         });
         const { sameAs, ...startingActionParams } = params; // eslint-disable-line @typescript-eslint/no-unused-vars
-        const action = await repos.action.start({
+        const action = await repos.actions.refund.start({
             ...startingActionParams,
             ...(typeof params.sameAs?.id === 'string') ? { sameAs: { id: params.sameAs.id, typeOf: 'Task' } } : undefined
         });
@@ -106,7 +106,7 @@ function refundCreditCard(params
         }
         catch (error) {
             try {
-                await repos.action.giveUp({
+                await repos.actions.refund.giveUp({
                     typeOf: action.typeOf, id: action.id, error,
                     ...(recipe !== undefined) ? { recipe } : undefined
                 });
@@ -118,7 +118,7 @@ function refundCreditCard(params
         }
         const actionResult = {}; // optimize(2024-06-10~)
         // add recipe(2024-06-04~)
-        await repos.action.completeWithVoid({ typeOf: action.typeOf, id: action.id, result: actionResult, recipe });
+        await repos.actions.refund.completeWithVoid({ typeOf: action.typeOf, id: action.id, result: actionResult, recipe });
         await (0, onRefundActionCompletedOrFailed_1.onRefundActionCompletedOrFailed)({
             actionStatus: factory.actionStatusType.CompletedActionStatus,
             id: action.id,
@@ -127,7 +127,11 @@ function refundCreditCard(params
             project: startingActionParams.project,
             purpose: startingActionParams.purpose,
             typeOf: action.typeOf
-        })(repos);
+        })({
+            actions: repos.actions,
+            accountingReport: repos.accountingReport,
+            task: repos.task
+        });
     };
 }
 function processAlterTran(params) {

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

@@ -3,7 +3,6 @@
  */
 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 { ProductRepo } from '../../repo/product';
@@ -12,7 +11,7 @@ declare function voidTransaction(__: factory.task.voidPayment.IData): (___: {
     product: ProductRepo;
 }) => Promise<void>;
 declare function payFaceToFace(params: factory.action.trade.pay.IAttributes): (repos: {
-    action: ActionRepo;
+    action?: never;
     actions: {
         pay: PayActionRepo;
         refund: RefundActionRepo;
@@ -22,7 +21,7 @@ declare function payFaceToFace(params: factory.action.trade.pay.IAttributes): (r
     task: TaskRepo;
 }) => Promise<void>;
 declare function refundFaceToFace(params: factory.task.refund.IData): (repos: {
-    action: ActionRepo;
+    action?: never;
     actions: {
         pay: PayActionRepo;
         refund: RefundActionRepo;

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

@@ -39,13 +39,13 @@ function voidTransaction(__) {
 }
 function payFaceToFace(params) {
     return async (repos) => {
-        const action = await repos.action.start(params);
+        const action = await repos.actions.pay.start(params);
         try {
             // no op
         }
         catch (error) {
             try {
-                await repos.action.giveUp({ typeOf: action.typeOf, id: action.id, error });
+                await repos.actions.pay.giveUp({ typeOf: action.typeOf, id: action.id, error });
             }
             catch (__) {
                 // 失敗したら仕方ない
@@ -53,7 +53,7 @@ function payFaceToFace(params) {
             throw error;
         }
         const actionResult = {};
-        await repos.action.completeWithVoid({ typeOf: action.typeOf, id: action.id, result: actionResult });
+        await repos.actions.pay.completeWithVoid({ typeOf: action.typeOf, id: action.id, result: actionResult });
         await (0, onPayActionCompleted_1.onPayActionCompleted)({
             // actionStatus: factory.actionStatusType.CompletedActionStatus,
             id: action.id,
@@ -62,19 +62,23 @@ function payFaceToFace(params) {
             project: params.project,
             purpose: params.purpose,
             typeOf: action.typeOf
-        })(repos);
+        })({
+            actions: repos.actions,
+            accountingReport: repos.accountingReport,
+            task: repos.task
+        });
         // return action;
     };
 }
 function refundFaceToFace(params) {
     return async (repos) => {
-        const action = await repos.action.start(params);
+        const action = await repos.actions.refund.start(params);
         try {
             // no op
         }
         catch (error) {
             try {
-                await repos.action.giveUp({ typeOf: action.typeOf, id: action.id, error });
+                await repos.actions.refund.giveUp({ typeOf: action.typeOf, id: action.id, error });
             }
             catch (__) {
                 // no op
@@ -82,7 +86,7 @@ function refundFaceToFace(params) {
             throw error;
         }
         const actionResult = {};
-        await repos.action.completeWithVoid({ typeOf: action.typeOf, id: action.id, result: actionResult });
+        await repos.actions.refund.completeWithVoid({ typeOf: action.typeOf, id: action.id, result: actionResult });
         await (0, onRefundActionCompletedOrFailed_1.onRefundActionCompletedOrFailed)({
             actionStatus: factory.actionStatusType.CompletedActionStatus,
             id: action.id,
@@ -91,7 +95,11 @@ function refundFaceToFace(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/payment/movieTicket/authorize.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 { CheckMovieTicketActionRepo } from '../../../repo/action/checkMovieTicket';
@@ -40,7 +39,7 @@ declare function authorize(params: factory.assetTransaction.pay.IStartParamsWith
         id: string;
     };
 }): (repos: {
-    action: ActionRepo;
+    action?: never;
     actions: {
         pay: PayActionRepo;
         refund: RefundActionRepo;