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

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

@@ -25,12 +25,11 @@ var __importStar = (this && this.__importStar) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.payMovieTicket = payMovieTicket;
 const surfrock = __importStar(require("@surfrock/sdk"));
-const http_status_1 = require("http-status");
 const errorHandler_1 = require("../../../errorHandler");
-const factory = __importStar(require("../../../factory"));
 const onPayActionCompleted_1 = require("../any/onPayActionCompleted");
 const factory_1 = require("./factory");
-const getCredentials_1 = require("./getCredentials");
+const payActionParams2seatInfoSyncIn_1 = require("./payMovieTicket/payActionParams2seatInfoSyncIn");
+const processSeatInfoSync_1 = require("./payMovieTicket/processSeatInfoSync");
 /**
  * 決済カード決済
  */
@@ -39,7 +38,7 @@ function payMovieTicket(params, options) {
         const { callOnPayActionCompleted } = options;
         const paymentMethodId = params.object[0]?.paymentMethod.paymentMethodId;
         const paymentServiceId = params.object[0]?.id;
-        const seatInfoSyncIn = await payActionParams2seatInfoSyncIn(params)(repos);
+        const seatInfoSyncIn = await (0, payActionParams2seatInfoSyncIn_1.payActionParams2seatInfoSyncIn)(params)(repos);
         const startingAction = (0, factory_1.createStartingPayAction)(params);
         let recipe = (0, factory_1.processSeatInfoSyncResult2payRecipe)({
             processSeatInfoSyncResult: { seatInfoSyncIn },
@@ -78,7 +77,7 @@ function payMovieTicket(params, options) {
                     credentialsRepo: repos.credentials // set credentialsRepo(2024-11-20~)
                 });
                 const seatService = new surfrock.service.seat.SeatService({ endpoint: String(availableChannel.serviceUrl), auth: mvtkReserveAuthClient }, { timeout: settings.movieticketReserve.timeout });
-                processSeatInfoSyncResult = await processSeatInfoSync({ seatInfoSyncIn })({ seatService });
+                processSeatInfoSyncResult = await (0, processSeatInfoSync_1.processSeatInfoSync)({ seatInfoSyncIn })({ seatService });
             }
             // add recipe(2024-06-03~)
             recipe = (0, factory_1.processSeatInfoSyncResult2payRecipe)({
@@ -119,69 +118,3 @@ function payMovieTicket(params, options) {
         }
     };
 }
-function payActionParams2seatInfoSyncIn(params) {
-    return async (repos) => {
-        const paymentMethodType = params.object[0]?.paymentMethod.typeOf;
-        const paymentMethodId = params.object[0]?.paymentMethod.paymentMethodId;
-        const paymentServiceId = params.object[0]?.id;
-        // イベントがひとつに特定されているかどうか確認
-        const eventIds = [...new Set(params.object.reduce((a, b) => [
-                ...a,
-                ...(Array.isArray(b.movieTickets)) ? b.movieTickets.map((ticket) => ticket.serviceOutput.reservationFor.id) : []
-            ], []))];
-        if (eventIds.length !== 1) {
-            throw new factory.errors.Argument('movieTickets', 'Number of events must be 1');
-        }
-        const event = await repos.event.projectEventFieldsById({ id: eventIds[0] }, 
-        // optimize projection(2024-07-19~)
-        [
-            'coaInfo', 'startDate', 'project',
-            'offers.offeredThrough', 'location.branchCode', 'superEvent.workPerformed.identifier'
-        ]);
-        const sellerId = String(params.recipient?.id);
-        // 全購入管理番号のMovieTicketをマージ
-        const movieTickets = params.object.reduce((a, b) => [...a, ...(Array.isArray(b.movieTickets)) ? b.movieTickets : []], []);
-        const sellerCredentials = await (0, getCredentials_1.getCredentials)({
-            seller: { id: sellerId, project: { id: event.project.id } },
-            paymentServiceId
-        })(repos);
-        const paymentAccepted = await repos.paymentAccepted.isAcceptedBySeller({
-            seller: { id: sellerId },
-            codeValue: paymentMethodType
-        });
-        if (paymentAccepted !== true) {
-            throw new factory.errors.Argument('transactionId', `payment not accepted [${paymentMethodType}]`);
-        }
-        return (0, factory_1.createSeatInfoSyncIn)({
-            paymentMethodType: paymentMethodType,
-            paymentMethodId: paymentMethodId,
-            movieTickets: movieTickets,
-            event: event,
-            purpose: params.purpose,
-            credentials: sellerCredentials
-        });
-    };
-}
-function processSeatInfoSync(params) {
-    return async (repos) => {
-        let seatInfoSyncResult;
-        const { seatInfoSyncIn } = 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.AlreadyPaid) {
-                    seatInfoSyncResult = error;
-                    throwsError = false;
-                }
-            }
-            if (throwsError) {
-                throw error;
-            }
-        }
-        return { seatInfoSyncIn, seatInfoSyncResult };
-    };
-}

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

@@ -1,5 +1,7 @@
 import type { AccountingReportRepo } from '../../../repo/accountingReport';
 import type { ActionRepo } from '../../../repo/action';
+import type { PayActionRepo } from '../../../repo/action/pay';
+import type { RefundActionRepo } from '../../../repo/action/refund';
 import type { CredentialsRepo } from '../../../repo/credentials';
 import type { PaymentServiceRepo } from '../../../repo/paymentService';
 import type { TaskRepo } from '../../../repo/task';
@@ -7,6 +9,10 @@ import * as factory from '../../../factory';
 import { Settings } from '../../../settings';
 interface IRefundOperationRepos {
     action: ActionRepo;
+    actions: {
+        pay: PayActionRepo;
+        refund: RefundActionRepo;
+    };
     accountingReport: AccountingReportRepo;
     credentials: CredentialsRepo;
     paymentService: PaymentServiceRepo;

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';
@@ -6,7 +6,15 @@ import type { PaymentServiceProviderRepo } from '../../../repo/paymentServicePro
 import type { SellerPaymentAcceptedRepo } from '../../../repo/sellerPaymentAccepted';
 import type { TaskRepo } from '../../../repo/task';
 import * as factory from '../../../factory';
-import { Settings } from '../../../settings';
+export interface IValidateMovieTicketRepos {
+    checkMovieTicketAction: CheckMovieTicketActionRepo;
+    credentials: CredentialsRepo;
+    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 +22,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) => Promise<{
     accountsReceivablesByServiceType: factory.assetTransaction.pay.IAccountsReceivableByServiceType[];
 }>;

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

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

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

@@ -1,5 +1,7 @@
 import type { AccountingReportRepo } from '../../../repo/accountingReport';
 import type { ActionRepo } from '../../../repo/action';
+import type { PayActionRepo } from '../../../repo/action/pay';
+import type { RefundActionRepo } from '../../../repo/action/refund';
 import type { CredentialsRepo } from '../../../repo/credentials';
 import type { PaymentServiceRepo } from '../../../repo/paymentService';
 import type { TaskRepo } from '../../../repo/task';
@@ -7,6 +9,10 @@ import * as factory from '../../../factory';
 import { Settings } from '../../../settings';
 declare function voidTransaction(params: factory.task.voidPayment.IData): (repos: {
     action: ActionRepo;
+    actions: {
+        pay: PayActionRepo;
+        refund: RefundActionRepo;
+    };
     accountingReport: AccountingReportRepo;
     credentials: CredentialsRepo;
     paymentService: PaymentServiceRepo;

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

@@ -1,6 +1,8 @@
 import * as factory from '../../factory';
 import type { AccountingReportRepo } from '../../repo/accountingReport';
 import type { ActionRepo } from '../../repo/action';
+import type { PayActionRepo } from '../../repo/action/pay';
+import type { RefundActionRepo } from '../../repo/action/refund';
 import type { AssetTransactionRepo } from '../../repo/assetTransaction';
 import type { ProductRepo } from '../../repo/product';
 import type { TaskRepo } from '../../repo/task';
@@ -18,12 +20,20 @@ declare function voidTransaction(params: factory.task.voidPayment.IData): (repos
 }) => Promise<void>;
 declare function payPaymentCard(params: factory.action.trade.pay.IAttributes): (repos: {
     action: ActionRepo;
+    actions: {
+        pay: PayActionRepo;
+        refund: RefundActionRepo;
+    };
     accountingReport: AccountingReportRepo;
     product: ProductRepo;
     task: TaskRepo;
 }) => Promise<void>;
 declare function refundPaymentCard(params: factory.task.refund.IData): (repos: {
     action: ActionRepo;
+    actions: {
+        pay: PayActionRepo;
+        refund: RefundActionRepo;
+    };
     accountingReport: AccountingReportRepo;
     product: ProductRepo;
     task: TaskRepo;

package/lib/chevre/service/permit.js

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

package/lib/chevre/service/reserve/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/factory.d.ts

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

package/lib/chevre/service/reserve/findByCode.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/findByCode.js

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

package/lib/chevre/service/reserve/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/reserve/searchByOrder.js

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

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

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

package/lib/chevre/service/task/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
                 });