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

package/lib/chevre/service/payment/creditCard/authorize/processAuthorizeCreditCard.d.ts

@@ -1,5 +1,5 @@
 import * as GMO from '@motionpicture/gmo-service';
-import { ActionRepo } from '../../../../repo/action';
+import { AuthorizeInvoiceActionRepo } from '../../../../repo/action/authorizeInvoice';
 import * as factory from '../../../../factory';
 interface ICreditCardPaymentAgencyTransaction {
     entryTranArgs: GMO.factory.credit.IEntryTranArgs;
@@ -8,6 +8,11 @@ interface ICreditCardPaymentAgencyTransaction {
     execTranResult: GMO.factory.credit.IExecTranResult | GMO.factory.credit.IExecTran3dsResult;
     secureTran2Result?: never;
 }
+interface IProcessAuthorizeCreditCardRepos {
+    action?: never;
+    authorizeInvoiceAction: AuthorizeInvoiceActionRepo;
+    creditCardService: GMO.service.Credit;
+}
 declare function processAuthorizeCreditCard(params: {
     project: {
         id: string;
@@ -26,8 +31,5 @@ declare function processAuthorizeCreditCard(params: {
      * 決済URL発行処理かどうか
      */
     processPublishPaymentUrl: boolean;
-}): (repos: {
-    action: ActionRepo;
-    creditCardService: GMO.service.Credit;
-}) => Promise<ICreditCardPaymentAgencyTransaction>;
-export { ICreditCardPaymentAgencyTransaction, processAuthorizeCreditCard };
+}): (repos: IProcessAuthorizeCreditCardRepos) => Promise<ICreditCardPaymentAgencyTransaction>;
+export { ICreditCardPaymentAgencyTransaction, IProcessAuthorizeCreditCardRepos, processAuthorizeCreditCard };

package/lib/chevre/service/payment/creditCard/authorize/processAuthorizeCreditCard.js

@@ -109,7 +109,7 @@ function processAuthorizeCreditCard(params) {
                 sameAs: { id: params.payTransaction.id, typeOf: factory.assetTransactionType.Pay }
             };
             // add action(2024-06-12~)
-            const action = await repos.action.start(actionAttributes, { recipe });
+            const action = await repos.authorizeInvoiceAction.start(actionAttributes, { recipe });
             try {
                 entryTranResult = await repos.creditCardService.entryTran(entryTranArgs);
                 execTranArgs = {
@@ -131,7 +131,7 @@ function processAuthorizeCreditCard(params) {
             }
             catch (error) {
                 try {
-                    await repos.action.giveUp({ typeOf: actionAttributes.typeOf, id: action.id, error });
+                    await repos.authorizeInvoiceAction.giveUp({ typeOf: actionAttributes.typeOf, id: action.id, error });
                 }
                 catch (__) {
                     // 失敗したら仕方ない
@@ -146,7 +146,7 @@ function processAuthorizeCreditCard(params) {
                 }
             });
             const actionResult = {};
-            await repos.action.completeWithVoid({ typeOf: actionAttributes.typeOf, id: action.id, result: actionResult, recipe });
+            await repos.authorizeInvoiceAction.completeWithVoid({ typeOf: actionAttributes.typeOf, id: action.id, result: actionResult, recipe });
         }
         return { entryTranArgs, entryTranResult, execTranArgs, execTranResult };
     };

package/lib/chevre/service/payment/creditCard/authorize/processAuthorizeCreditCard3ds.d.ts

@@ -1,5 +1,5 @@
 import type * as GMO from '@motionpicture/gmo-service';
-import { ActionRepo } from '../../../../repo/action';
+import { AuthorizeInvoiceActionRepo } from '../../../../repo/action/authorizeInvoice';
 import * as factory from '../../../../factory';
 interface ICreditCardPaymentAgencyTransaction3ds {
     entryTranArgs: GMO.factory.credit.IEntryTranArgs;
@@ -8,6 +8,11 @@ interface ICreditCardPaymentAgencyTransaction3ds {
     execTranResult: GMO.factory.credit.IExecTranResult | GMO.factory.credit.IExecTran3dsResult;
     secureTran2Result: GMO.factory.credit.ISecureTran2Result;
 }
+interface IProcessAuthorizeCreditCard3dsRepos {
+    action?: never;
+    authorizeInvoiceAction: AuthorizeInvoiceActionRepo;
+    creditCardService: GMO.service.Credit;
+}
 declare function processAuthorizeCreditCard3ds(params: {
     project: {
         id: string;
@@ -17,8 +22,5 @@ declare function processAuthorizeCreditCard3ds(params: {
     };
     availableChannel: Pick<factory.serviceChannel.IServiceChannelCreditCard, 'credentials' | 'serviceUrl'>;
     pendingPaymentAgencyTransaction: Pick<ICreditCardPaymentAgencyTransaction3ds, 'entryTranArgs' | 'entryTranResult' | 'execTranArgs' | 'execTranResult'>;
-}): (repos: {
-    action: ActionRepo;
-    creditCardService: GMO.service.Credit;
-}) => Promise<ICreditCardPaymentAgencyTransaction3ds>;
-export { ICreditCardPaymentAgencyTransaction3ds, processAuthorizeCreditCard3ds };
+}): (repos: IProcessAuthorizeCreditCard3dsRepos) => Promise<ICreditCardPaymentAgencyTransaction3ds>;
+export { IProcessAuthorizeCreditCard3dsRepos, ICreditCardPaymentAgencyTransaction3ds, processAuthorizeCreditCard3ds };

package/lib/chevre/service/payment/creditCard/authorize/processAuthorizeCreditCard3ds.js

@@ -47,13 +47,13 @@ function processAuthorizeCreditCard3ds(params) {
             sameAs: { id: params.payTransaction.id, typeOf: factory.assetTransactionType.Pay }
         };
         // add action(2024-06-12~)
-        const action = await repos.action.start(actionAttributes, { recipe });
+        const action = await repos.authorizeInvoiceAction.start(actionAttributes, { recipe });
         try {
             secureTran2Result = await repos.creditCardService.secureTran2(secureTran2Args);
         }
         catch (error) {
             try {
-                await repos.action.giveUp({ typeOf: actionAttributes.typeOf, id: action.id, error });
+                await repos.authorizeInvoiceAction.giveUp({ typeOf: actionAttributes.typeOf, id: action.id, error });
             }
             catch (__) {
                 // 失敗したら仕方ない
@@ -65,7 +65,7 @@ function processAuthorizeCreditCard3ds(params) {
             result: { secureTran2Args, secureTran2Result }
         });
         const actionResult = {};
-        await repos.action.completeWithVoid({ typeOf: actionAttributes.typeOf, id: action.id, result: actionResult, recipe });
+        await repos.authorizeInvoiceAction.completeWithVoid({ typeOf: actionAttributes.typeOf, id: action.id, result: actionResult, recipe });
         return { entryTranArgs, entryTranResult, execTranArgs, execTranResult, secureTran2Result };
     };
 }

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

@@ -1,6 +1,6 @@
 import * as factory from '../../../factory';
 import { Settings } from '../../../settings';
-import type { ActionRepo } from '../../../repo/action';
+import type { AuthorizeInvoiceActionRepo } from '../../../repo/action/authorizeInvoice';
 import type { PaymentServiceRepo } from '../../../repo/paymentService';
 import type { PaymentServiceProviderRepo } from '../../../repo/paymentServiceProvider';
 import type { SellerPaymentAcceptedRepo } from '../../../repo/sellerPaymentAccepted';
@@ -41,7 +41,8 @@ payTransaction: IPayTransactionAsAuthorizeInvoiceAction, paymentServiceId: strin
         id?: string;
     };
 }): (repos: {
-    action: ActionRepo;
+    action?: never;
+    authorizeInvoiceAction: AuthorizeInvoiceActionRepo;
     paymentAccepted: SellerPaymentAcceptedRepo;
     paymentService: PaymentServiceRepo;
     paymentServiceProvider: PaymentServiceProviderRepo;

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

@@ -88,7 +88,7 @@ payTransaction, paymentServiceId, options) {
                     payTransaction: { id: payTransaction.id },
                     availableChannel,
                     pendingPaymentAgencyTransaction
-                })({ action: repos.action, creditCardService });
+                })({ authorizeInvoiceAction: repos.authorizeInvoiceAction, creditCardService });
             }
             else {
                 authorizeResult = await (0, processAuthorizeCreditCard_1.processAuthorizeCreditCard)({
@@ -97,7 +97,7 @@ payTransaction, paymentServiceId, options) {
                     shopId, shopPass, returnUrls3ds, callbackType3ds, orderId, availableChannel,
                     object: payTransaction.object.paymentMethod,
                     processPublishPaymentUrl: options.processPublishPaymentUrl
-                })({ action: repos.action, creditCardService });
+                })({ authorizeInvoiceAction: repos.authorizeInvoiceAction, creditCardService });
             }
         }
         catch (error) {

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

@@ -1,16 +1,17 @@
 import * as factory from '../../../factory';
 import { Settings } from '../../../settings';
-import type { ActionRepo } from '../../../repo/action';
+import type { AuthorizeInvoiceActionRepo } from '../../../repo/action/authorizeInvoice';
 import type { PaymentServiceRepo } from '../../../repo/paymentService';
 import type { PaymentServiceProviderRepo } from '../../../repo/paymentServiceProvider';
 import type { SellerPaymentAcceptedRepo } from '../../../repo/sellerPaymentAccepted';
-/**
- * クレジットカード決済中止
- */
-declare function voidTransaction(params: factory.task.voidPayment.IData): (repos: {
-    action: ActionRepo;
+interface IVoidTransactionRepos {
+    authorizeInvoiceAction: AuthorizeInvoiceActionRepo;
     paymentAccepted: SellerPaymentAcceptedRepo;
     paymentService: PaymentServiceRepo;
     paymentServiceProvider: PaymentServiceProviderRepo;
-}, settings: Settings) => Promise<void>;
-export { voidTransaction };
+}
+/**
+ * クレジットカード決済中止
+ */
+declare function voidTransaction(params: factory.task.voidPayment.IData): (repos: IVoidTransactionRepos, settings: Settings) => Promise<void>;
+export { IVoidTransactionRepos, voidTransaction };

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

@@ -57,12 +57,20 @@ function voidTransaction(params) {
             requirePaymentAccepted: false
         })(repos);
         // authorizeInvoiceActionが存在すれば取消(2024-06-13~)
-        const authorizeInvoiceAction = (await repos.action.search({
-            limit: 1,
-            page: 1,
-            typeOf: { $eq: factory.actionType.AuthorizeAction },
-            object: { paymentMethodId: { $eq: paymentMethodId } },
-            sameAs: { id: { $eq: transaction.id } }
+        // const authorizeInvoiceAction = (<Pick<factory.action.authorize.invoice.IAction, 'id' | 'typeOf' | 'project'>[]>
+        //     await repos.action.search(
+        //         {
+        //             limit: 1,
+        //             page: 1,
+        //             typeOf: { $eq: factory.actionType.AuthorizeAction },
+        //             object: { paymentMethodId: { $eq: paymentMethodId } },
+        //             sameAs: { id: { $eq: transaction.id } }
+        //         },
+        //         ['id', 'typeOf', 'project']
+        //     )).shift();
+        const authorizeInvoiceAction = (await repos.authorizeInvoiceAction.findAuthorizeInvoiceActionsByPayTransaction({
+            paymentMethodId,
+            payTransactionId: transaction.id
         }, ['id', 'typeOf', 'project'])).shift();
         if (authorizeInvoiceAction !== undefined) {
             const cancelAction = {
@@ -70,7 +78,7 @@ function voidTransaction(params) {
                 agent: { id: authorizeInvoiceAction.project.id, typeOf: factory.organizationType.Project }
                 // ...(typeof params.sameAs?.id === 'string') ? { sameAs: { id: params.sameAs.id, typeOf: 'Task' } } : undefined
             };
-            await repos.action.cancelWithVoid({ typeOf: authorizeInvoiceAction.typeOf, id: authorizeInvoiceAction.id, cancelAction });
+            await repos.authorizeInvoiceAction.cancelWithVoid({ typeOf: authorizeInvoiceAction.typeOf, id: authorizeInvoiceAction.id, cancelAction });
         }
         const creditCardService = new GMO.service.Credit({
             endpoint: String(availableChannel.serviceUrl),

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

@@ -1,5 +1,6 @@
 import type { AccountingReportRepo } from '../../../repo/accountingReport';
 import type { ActionRepo } from '../../../repo/action';
+import type { CheckMovieTicketActionRepo } from '../../../repo/action/checkMovieTicket';
 import type { CredentialsRepo } from '../../../repo/credentials';
 import type { EventRepo } from '../../../repo/event';
 import type { PaymentServiceRepo } from '../../../repo/paymentService';
@@ -38,6 +39,7 @@ declare function authorize(params: factory.assetTransaction.pay.IStartParamsWith
     };
 }): (repos: {
     action: ActionRepo;
+    checkMovieTicketAction: CheckMovieTicketActionRepo;
     accountingReport: AccountingReportRepo;
     credentials: CredentialsRepo;
     event: EventRepo;

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

@@ -1,4 +1,4 @@
-import type { ActionRepo } from '../../../repo/action';
+import type { CheckMovieTicketActionRepo } from '../../../repo/action/checkMovieTicket';
 import type { CredentialsRepo } from '../../../repo/credentials';
 import type { EventRepo } from '../../../repo/event';
 import type { PaymentServiceRepo } from '../../../repo/paymentService';
@@ -8,7 +8,7 @@ import * as factory from '../../../factory';
 import { Settings } from '../../../settings';
 import { ICheckResult } from './processPurchaseNumberAuth';
 interface ICheckOperationRepos {
-    action: ActionRepo;
+    checkMovieTicketAction: CheckMovieTicketActionRepo;
     credentials: CredentialsRepo;
     event: EventRepo;
     paymentAccepted: SellerPaymentAcceptedRepo;
@@ -22,4 +22,4 @@ type ICheckOperation<T> = (repos: ICheckOperationRepos, settings: Settings) => P
 declare function checkMovieTicket(params: factory.action.check.paymentMethod.movieTicket.IAttributes): ICheckOperation<{
     result: ICheckResult;
 }>;
-export { checkMovieTicket };
+export { ICheckOperationRepos, checkMovieTicket };

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

@@ -65,7 +65,7 @@ function checkMovieTicket(params) {
                 ? { sameAs: { id: params.sameAs.id, typeOf: 'Task' } } // タスク関連付け(2024-05-21~)
                 : undefined
         };
-        const action = await repos.action.start(actionAttributes);
+        const action = await repos.checkMovieTicketAction.start(actionAttributes);
         let processPurchaseNumberAuthResult;
         let recipe;
         try {
@@ -99,7 +99,7 @@ function checkMovieTicket(params) {
             // アクション保管用のエラーと両方保管(2024-05-22~)
             const errors = [(0, errorHandler_1.handleMvtkReserveError)(error), error];
             try {
-                await repos.action.giveUp({ typeOf: actionAttributes.typeOf, id: action.id, error: errors });
+                await repos.checkMovieTicketAction.giveUp({ typeOf: actionAttributes.typeOf, id: action.id, error: errors });
             }
             catch (__) {
                 // 失敗したら仕方ない
@@ -107,7 +107,7 @@ function checkMovieTicket(params) {
             throw errors[0];
         }
         const result = {};
-        await repos.action.completeWithVoid({ typeOf: actionAttributes.typeOf, id: action.id, result, recipe });
+        await repos.checkMovieTicketAction.completeWithVoid({ typeOf: actionAttributes.typeOf, id: action.id, result, recipe });
         return { result: processPurchaseNumberAuthResult };
     };
 }

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

@@ -1,4 +1,4 @@
-import type { ActionRepo } from '../../../repo/action';
+import type { CheckMovieTicketActionRepo } from '../../../repo/action/checkMovieTicket';
 import type { CredentialsRepo } from '../../../repo/credentials';
 import type { EventRepo } from '../../../repo/event';
 import type { PaymentServiceRepo } from '../../../repo/paymentService';
@@ -7,6 +7,15 @@ import type { SellerPaymentAcceptedRepo } from '../../../repo/sellerPaymentAccep
 import type { TaskRepo } from '../../../repo/task';
 import * as factory from '../../../factory';
 import { Settings } from '../../../settings';
+export interface IValidateMovieTicketRepos {
+    checkMovieTicketAction: CheckMovieTicketActionRepo;
+    credentials: CredentialsRepo;
+    event: EventRepo;
+    paymentAccepted: SellerPaymentAcceptedRepo;
+    paymentService: PaymentServiceRepo;
+    paymentServiceProvider: PaymentServiceProviderRepo;
+    task: TaskRepo;
+}
 export declare function validateMovieTicket(params: factory.assetTransaction.pay.IStartParamsWithoutDetail, paymentServiceId: string, checkedAction: {
     id: string;
 }, purpose: {
@@ -14,14 +23,6 @@ export declare function validateMovieTicket(params: factory.assetTransaction.pay
      * placeOrder ID
      */
     id?: string;
-}): (repos: {
-    action: ActionRepo;
-    credentials: CredentialsRepo;
-    event: EventRepo;
-    paymentAccepted: SellerPaymentAcceptedRepo;
-    paymentService: PaymentServiceRepo;
-    paymentServiceProvider: PaymentServiceProviderRepo;
-    task: TaskRepo;
-}, settings: Settings) => Promise<{
+}): (repos: IValidateMovieTicketRepos, settings: Settings) => Promise<{
     accountsReceivablesByServiceType: factory.assetTransaction.pay.IAccountsReceivableByServiceType[];
 }>;

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

@@ -137,26 +137,34 @@ function checkByIdentifierIfNotYet(params) {
         if (typeof placeOrderId === 'string') {
             // no op
         }
+        else {
+            // 注文取引IDの未指定ケースがあるかどうか確認するためにlog
+            console.log('checkByIdentifierIfNotYet: placeOrderId undefined. params:', JSON.stringify(params));
+        }
         const specifiedCheckedActionId = params.checkedAction?.id;
         if (typeof specifiedCheckedActionId === 'string' && specifiedCheckedActionId !== '') {
-            alreadyCheckedAction = (await repos.action.search({
-                limit: 1,
-                page: 1,
-                id: { $in: [specifiedCheckedActionId] },
-                actionStatus: { $in: [factory.actionStatusType.CompletedActionStatus] },
-                ...(typeof placeOrderId === 'string') ? { purpose: { id: { $in: [placeOrderId] } } } : undefined
-            }, ['id'])).shift();
+            alreadyCheckedAction = (await repos.checkMovieTicketAction.findCompletedCheckActions({
+                // limit: 1,
+                // page: 1,
+                // id: { $in: [specifiedCheckedActionId] },
+                id: specifiedCheckedActionId,
+                // actionStatus: { $in: [factory.actionStatusType.CompletedActionStatus] },
+                // ...(typeof placeOrderId === 'string') ? { purpose: { id: { $in: [placeOrderId] } } } : undefined
+                ...(typeof placeOrderId === 'string') ? { purpose: { id: placeOrderId } } : undefined
+            })).shift();
             if (alreadyCheckedAction === undefined) {
                 throw new factory.errors.NotFound(factory.actionType.CheckAction);
             }
         }
         else {
-            alreadyCheckedAction = (await repos.action.search({
-                limit: 1,
-                page: 1,
+            // 認証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] },
+                // typeOf: { $eq: factory.actionType.CheckAction },
+                // actionStatus: { $in: [factory.actionStatusType.CompletedActionStatus] },
                 object: {
                     typeOf: { $eq: factory.service.paymentService.PaymentServiceType.MovieTicket },
                     id: { $eq: params.paymentServiceId }, // 指定の決済サービスにおいて
@@ -167,11 +175,13 @@ function checkByIdentifierIfNotYet(params) {
                         }
                     }
                 },
-                ...(typeof placeOrderId === 'string') ? { purpose: { id: { $in: [placeOrderId] } } } : undefined
-            }, ['id'])).shift();
+                // ...(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) {
-            const recipe = await repos.action.findRecipeByAction({
+            const recipe = await repos.checkMovieTicketAction.findRecipeByAction({
                 project: { id: params.screeningEvent.project.id },
                 recipeFor: { id: alreadyCheckedAction.id }
             });

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

@@ -75,7 +75,7 @@ function cancelPengindIfNotYet(params) {
         let actionId;
         const actionAttributes = (0, factory_1.createCancelPendingReservationAction)({ transaction: reserveTransaction });
         // 冪等性を担保(2023-06-05~)
-        const completedActions = await repos.action.search({
+        const completedActions = await repos.action.findActionsByType({
             limit: 1,
             page: 1,
             actionStatus: { $in: [factory.actionStatusType.CompletedActionStatus] },
@@ -115,9 +115,7 @@ function cancelPengindIfNotYet(params) {
                                             subReservation: cancelingSubReservation.subReservation,
                                             reservationFor: {
                                                 id: String(reservationFor.id),
-                                                startDate: (reservationFor.typeOf === factory.eventType.ScreeningEvent)
-                                                    ? reservationFor.startDate
-                                                    : reservationFor.departureTime
+                                                startDate: reservationFor.startDate
                                             }
                                         },
                                         // holder:取引番号に対応(2023-06-05~)
@@ -220,9 +218,7 @@ function cancelReservation(actionAttributesList) {
                                         subReservation: cancelingSubReservation.subReservation,
                                         reservationFor: {
                                             id: String(reservationFor.id),
-                                            startDate: (reservationFor.typeOf === factory.eventType.ScreeningEvent)
-                                                ? reservationFor.startDate
-                                                : reservationFor.departureTime
+                                            startDate: reservationFor.startDate
                                         }
                                     },
                                     // holder:取引番号に対応(2023-06-05~)
@@ -439,11 +435,8 @@ function processUnlockOfferRateLimit(params) {
                     }
                 },
                 reservationFor: {
-                    startDate: (params.reservationFor.typeOf === factory.eventType.ScreeningEvent)
-                        ? (0, moment_1.default)(params.reservationFor.startDate)
-                            .toDate()
-                        : (0, moment_1.default)(params.reservationFor.departureTime)
-                            .toDate()
+                    startDate: (0, moment_1.default)(params.reservationFor.startDate)
+                        .toDate()
                 },
                 reservationNumber: reservation.reservationNumber
             };

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

@@ -134,7 +134,7 @@ params, options) {
         const actionAttributes = reserveTransaction2action({ transaction: reserveTransaction });
         // 冪等性を担保(2023-05-31~)
         debug('searching completed reserveAction... byTask:', options?.byTask, 'reservationNumber:', reservationPackage.reservationNumber);
-        const completedActions = await repos.action.search({
+        const completedActions = await repos.action.findActionsByType({
             limit: 1,
             page: 1,
             actionStatus: { $in: [factory.actionStatusType.CompletedActionStatus] },

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

@@ -2,7 +2,7 @@ import * as factory from '../../factory';
 import type { AuthorizationRepo } from '../../repo/authorization';
 import type { OrderRepo } from '../../repo/order';
 import type { ReservationRepo } from '../../repo/reservation';
-type AvailableReservationType = factory.reservationType.BusReservation | factory.reservationType.EventReservation;
+type AvailableReservationType = factory.reservationType.EventReservation;
 type IReservationResult = Pick<factory.reservation.IReservation<AvailableReservationType>, 'id' | 'additionalTicketText' | 'checkedIn' | 'reservationStatus'> & {
     reservedTicket: {
         ticketType: Pick<factory.reservation.ITicketType<AvailableReservationType>, 'identifier'> & {

package/lib/chevre/service/reserve/potentialActions/onReservationCanceled.d.ts

@@ -5,12 +5,11 @@ import * as factory from '../../../factory';
 import type { SettingRepo } from '../../../repo/setting';
 import type { TaskRepo } from '../../../repo/task';
 export type ICanceledEventReservation = Pick<factory.reservation.IReservation<factory.reservationType.EventReservation>, 'project' | 'id' | 'typeOf' | 'modifiedTime' | 'reservationNumber'>;
-export type ICanceledBusReservation = Pick<factory.reservation.IReservation<factory.reservationType.BusReservation>, 'project' | 'id' | 'typeOf' | 'modifiedTime' | 'reservationNumber'>;
 export declare function onReservationCanceled(
 /**
  * ステータス変更された予約リスト
  */
-canceledReservations: ICanceledEventReservation[] | ICanceledBusReservation[], 
+canceledReservations: ICanceledEventReservation[], 
 /**
  * 集計対象イベント
  */

package/lib/chevre/service/reserve/potentialActions/onReservationCanceled.js

@@ -34,6 +34,7 @@ function onReservationCanceled(
 /**
  * ステータス変更された予約リスト
  */
+// canceledReservations: ICanceledEventReservation[] | ICanceledBusReservation[],
 canceledReservations, 
 // useInformReservation: boolean,
 /**

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

@@ -7,7 +7,7 @@ type IReservationResult = Pick<factory.reservation.IReservation<factory.reservat
 declare function searchByOrder(params: {
     limit: number;
     page: number;
-    typeOf: factory.reservationType.BusReservation | factory.reservationType.EventReservation;
+    typeOf: factory.reservationType.EventReservation;
     project: {
         id: string;
     };

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

@@ -26,14 +26,16 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.call = call;
 const COA = __importStar(require("@motionpicture/coa-service"));
 const factory = __importStar(require("../../factory"));
-const action_1 = require("../../repo/action");
+// import { ActionRepo } from '../../repo/action';
+const acceptCOAOffer_1 = require("../../repo/action/acceptCOAOffer");
+const authorizeOffer_1 = require("../../repo/action/authorizeOffer");
 const credentials_1 = require("../../repo/credentials");
 const event_1 = require("../../repo/event");
 const orderNumber_1 = require("../../repo/orderNumber");
 const project_1 = require("../../repo/project");
 const reserveInterface_1 = require("../../repo/reserveInterface");
-const transaction_1 = require("../../repo/transaction");
-// import { TransactionProcessRepo } from '../../repo/transactionProcess';
+// import { TransactionRepo } from '../../repo/transaction';
+const placeOrder_1 = require("../../repo/transaction/placeOrder");
 const acceptOffer_1 = require("../offer/eventServiceByCOA/acceptOffer");
 let coaAuthClient;
 /**
@@ -76,7 +78,7 @@ function call(params) {
                 ...(credentialsRepo !== undefined) ? { credentialsRepo } : undefined
             });
         }
-        const actionRepo = new action_1.ActionRepo(connection);
+        const actionRepo = new acceptCOAOffer_1.AcceptCOAOfferActionRepo(connection);
         // const transactionProcessRepo = new TransactionProcessRepo(redisClient, { lockExpiresInSeconds: 120 });
         try {
             const reserveService = new COA.service.Reserve({
@@ -103,10 +105,12 @@ function call(params) {
                     isMember
                 })({
                     action: actionRepo,
+                    authorizeOfferAction: new authorizeOffer_1.AuthorizeOfferActionRepo(connection),
                     event: new event_1.EventRepo(connection),
                     orderNumber: new orderNumber_1.OrderNumberRepo({ connection }),
                     project: new project_1.ProjectRepo(connection),
-                    transaction: new transaction_1.TransactionRepo(connection),
+                    placeOrder: new placeOrder_1.PlaceOrderRepo(connection),
+                    // transaction: new TransactionRepo(connection),
                     reserveService,
                     masterService
                 });
@@ -124,7 +128,8 @@ function call(params) {
                     event: new event_1.EventRepo(connection),
                     orderNumber: new orderNumber_1.OrderNumberRepo({ connection }),
                     project: new project_1.ProjectRepo(connection),
-                    transaction: new transaction_1.TransactionRepo(connection),
+                    placeOrder: new placeOrder_1.PlaceOrderRepo(connection),
+                    // transaction: new TransactionRepo(connection),
                     reserveService,
                     masterService
                 });

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

@@ -28,6 +28,10 @@ const factory = __importStar(require("../../factory"));
 const acceptedPaymentMethod_1 = require("../../repo/acceptedPaymentMethod");
 const accountingReport_1 = require("../../repo/accountingReport");
 const action_1 = require("../../repo/action");
+const checkMovieTicket_1 = require("../../repo/action/checkMovieTicket");
+const acceptPay_1 = require("../../repo/action/acceptPay");
+const authorizeInvoice_1 = require("../../repo/action/authorizeInvoice");
+const authorizePaymentMethod_1 = require("../../repo/action/authorizePaymentMethod");
 const assetTransaction_1 = require("../../repo/assetTransaction");
 const authorization_1 = require("../../repo/authorization");
 const confirmationNumber_1 = require("../../repo/confirmationNumber");
@@ -43,7 +47,8 @@ const project_1 = require("../../repo/project");
 const sellerPaymentAccepted_1 = require("../../repo/sellerPaymentAccepted");
 const task_1 = require("../../repo/task");
 const ticket_1 = require("../../repo/ticket");
-const transaction_1 = require("../../repo/transaction");
+// import { TransactionRepo } from '../../repo/transaction';
+const placeOrder_1 = require("../../repo/transaction/placeOrder");
 const transactionNumber_1 = require("../../repo/transactionNumber");
 // import { TransactionProcessRepo } from '../../repo/transactionProcess';
 const any_1 = require("../payment/any");
@@ -60,7 +65,8 @@ function call(params) {
             return;
         }
         let callResult;
-        const actionRepo = new action_1.ActionRepo(connection);
+        // const actionRepo = new ActionRepo(connection);
+        const authorizePaymentMethodActionRepo = new authorizePaymentMethod_1.AuthorizePaymentMethodActionRepo(connection);
         // const transactionProcessRepo = new TransactionProcessRepo(redisClient, { lockExpiresInSeconds: 120 });
         const paymentServiceId = params.data.object.issuedThrough.id;
         const credentialsExpireInSeconds = settings.movieticketReserve.credentialsExpireInSeconds;
@@ -74,7 +80,11 @@ function call(params) {
             })({
                 acceptedPaymentMethod: new acceptedPaymentMethod_1.AcceptedPaymentMethodRepo(connection),
                 accountingReport: new accountingReport_1.AccountingReportRepo(connection),
-                action: actionRepo,
+                action: new action_1.ActionRepo(connection),
+                checkMovieTicketAction: new checkMovieTicket_1.CheckMovieTicketActionRepo(connection),
+                acceptPayAction: new acceptPay_1.AcceptPayActionRepo(connection),
+                authorizeInvoiceAction: new authorizeInvoice_1.AuthorizeInvoiceActionRepo(connection),
+                authorizePaymentMethodAction: authorizePaymentMethodActionRepo,
                 assetTransaction: new assetTransaction_1.AssetTransactionRepo(connection),
                 authorization: new authorization_1.AuthorizationRepo(connection),
                 confirmationNumber: new confirmationNumber_1.ConfirmationNumberRepo({ connection }),
@@ -93,7 +103,8 @@ function call(params) {
                 project: new project_1.ProjectRepo(connection),
                 task: new task_1.TaskRepo(connection),
                 ticket: new ticket_1.TicketRepo(connection),
-                transaction: new transaction_1.TransactionRepo(connection),
+                placeOrder: new placeOrder_1.PlaceOrderRepo(connection),
+                // transaction: new TransactionRepo(connection),
                 transactionNumber: new transactionNumber_1.TransactionNumberRepo({ connection })
                 // transactionProcess: transactionProcessRepo
             }, settings);
@@ -101,7 +112,7 @@ function call(params) {
         catch (error) {
             let throwsError = true;
             // アクションが存在すればタスクを実行済扱いにする
-            const action = (await actionRepo.searchBySameAs({
+            const action = (await authorizePaymentMethodActionRepo.searchBySameAs({
                 sameAs: { id: { $eq: params.id } },
                 purpose: { id: { $eq: params.data.purpose.id } },
                 typeOf: { $eq: factory.actionType.AuthorizeAction }

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

@@ -25,7 +25,7 @@ var __importStar = (this && this.__importStar) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.call = call;
 const factory = __importStar(require("../../factory"));
-const action_1 = require("../../repo/action");
+const checkMovieTicket_1 = require("../../repo/action/checkMovieTicket");
 const credentials_1 = require("../../repo/credentials");
 const event_1 = require("../../repo/event");
 const paymentService_1 = require("../../repo/paymentService");
@@ -45,7 +45,7 @@ function call(params) {
         if (!options.executeById) {
             return;
         }
-        const actionRepo = new action_1.ActionRepo(connection);
+        const actionRepo = new checkMovieTicket_1.CheckMovieTicketActionRepo(connection);
         // const transactionProcessRepo = new TransactionProcessRepo(redisClient, { lockExpiresInSeconds: 120 });
         const paymentServiceId = params.data.object[0]?.id;
         const credentialsExpireInSeconds = settings.movieticketReserve.credentialsExpireInSeconds;
@@ -56,7 +56,7 @@ function call(params) {
                 ...params.data,
                 sameAs: { id: params.id, typeOf: 'Task' }
             })({
-                action: actionRepo,
+                checkMovieTicketAction: actionRepo,
                 credentials: new credentials_1.CredentialsRepo(redisClient, {
                     scope: `${factory.service.paymentService.PaymentServiceType.MovieTicket}:${paymentServiceId}`,
                     expireInSeconds: (useCredentialsRepo) ? credentialsExpireInSeconds : 0