@chevre/domain 21.2.0-alpha.12 → 21.2.0-alpha.120

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

@@ -62,6 +62,7 @@ interface IConfirmRepo {
     task: TaskRepo;
 }
 export type IConfirmOperation<T> = (repos: IConfirmRepo) => Promise<T>;
+type IObjectSubReservation = factory.assetTransaction.reserve.IObjectSubReservation;
 type IStartParams = factory.assetTransaction.reserve.IStartParamsWithoutDetail & {
     /**
      * 承認アクションを介した場合に検索済のイベント
@@ -94,7 +95,15 @@ type IStartParams = factory.assetTransaction.reserve.IStartParamsWithoutDetail &
 /**
  * 取引開始
  */
-export declare function start(params: IStartParams): IStartOperation<factory.assetTransaction.ITransaction<factory.assetTransactionType.Reserve>>;
+export declare function start(params: IStartParams & {
+    disablePendingReservations: boolean;
+    useHoldStockByTransactionNumber: boolean;
+    stockHoldUntilDaysAfterEventEnd: number;
+}): IStartOperation<{
+    transaction: factory.assetTransaction.ITransaction<factory.assetTransactionType.Reserve>;
+    objectSubReservations: IObjectSubReservation[];
+    issuedThrough: factory.assetTransaction.reserve.IIssuedThrough;
+}>;
 /**
  * 取引確定
  */

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

@@ -27,7 +27,7 @@ const validateStartRequest_1 = require("./reserve/validateStartRequest");
  */
 function start(params) {
     return (repos) => __awaiter(this, void 0, void 0, function* () {
-        var _a, _b, _c, _d, _e;
+        var _a, _b, _c, _d;
         const now = new Date();
         // 自動発行廃止(2022-05-17~)
         const reservationNumber = params.transactionNumber;
@@ -35,7 +35,8 @@ function start(params) {
             throw new factory.errors.ArgumentNull('transactionNumber');
         }
         // eventをfix
-        if (typeof ((_a = params.object.reservationFor) === null || _a === void 0 ? void 0 : _a.id) !== 'string' || params.object.reservationFor.id.length === 0) {
+        const reservationForId = (_a = params.object.reservationFor) === null || _a === void 0 ? void 0 : _a.id;
+        if (typeof reservationForId !== 'string' || reservationForId.length === 0) {
             throw new factory.errors.ArgumentNull('object.reservationFor.id');
         }
         let event;
@@ -43,7 +44,7 @@ function start(params) {
             event = params.preSearchedEvent;
         }
         else {
-            event = yield repos.event.findMinimizedIndividualEventById({ id: params.object.reservationFor.id });
+            event = yield repos.event.findMinimizedIndividualEventById({ id: reservationForId });
         }
         // validationを承認アクション開始前から移行(2023-01-27~)
         (0, validateStartRequest_1.validateStartRequest)({
@@ -63,19 +64,24 @@ function start(params) {
         catch (error) {
             throw error;
         }
-        // 指定があれば予約追加
-        if (typeof ((_d = params.object.reservationFor) === null || _d === void 0 ? void 0 : _d.id) === 'string') {
-            transaction = yield addReservations({
-                id: transaction.id,
-                object: params.object,
-                event,
-                preSearchedTicketOffers: params.preSearchedTicketOffers,
-                preSearchedUnitPriceOffers: params.preSearchedUnitPriceOffers,
-                availableAtOrFrom: { id: (_e = params.availableAtOrFrom) === null || _e === void 0 ? void 0 : _e.id },
-                validateAppliesToMovieTicket: params.validateAppliesToMovieTicket
-            })(repos);
-        }
-        return transaction;
+        let objectSubReservations = [];
+        const addReservationsResult = yield addReservations({
+            id: transaction.id,
+            object: params.object,
+            event,
+            preSearchedTicketOffers: params.preSearchedTicketOffers,
+            preSearchedUnitPriceOffers: params.preSearchedUnitPriceOffers,
+            availableAtOrFrom: { id: (_d = params.availableAtOrFrom) === null || _d === void 0 ? void 0 : _d.id },
+            validateAppliesToMovieTicket: params.validateAppliesToMovieTicket,
+            stockHoldUntilDaysAfterEventEnd: params.stockHoldUntilDaysAfterEventEnd
+        })(repos);
+        transaction = addReservationsResult.transaction;
+        objectSubReservations = addReservationsResult.objectSubReservations;
+        return {
+            transaction,
+            objectSubReservations,
+            issuedThrough: addReservationsResult.issuedThrough
+        };
     });
 }
 exports.start = start;
@@ -132,6 +138,21 @@ function addReservations(params) {
         })(repos);
         // 予約イベント最適化
         const reservationFor = (0, factory_1.createReservationFor)(event);
+        const { issuedThrough } = (0, factory_1.createIssuedThrough)({ reservationFor: event });
+        // const minimizedObjectSubReservations: factory.assetTransaction.reserve.IMinimizedObjectSubReservation[] =
+        //     objectSubReservations.map((r) => {
+        //         return {
+        //             id: r.id,
+        //             typeOf: r.typeOf,
+        //             reservedTicket: {
+        //                 ticketType: r.reservedTicket.ticketType,
+        //                 ...(typeof r.reservedTicket.ticketedSeat?.typeOf === 'string')
+        //                     ? { ticketedSeat: r.reservedTicket.ticketedSeat }
+        //                     : undefined
+        //             },
+        //             ...(Array.isArray(r.subReservation)) ? { subReservation: r.subReservation } : undefined
+        //         };
+        //     });
         // 取引に予約追加
         let lockedOfferRateLimitKeys = [];
         try {
@@ -140,12 +161,13 @@ function addReservations(params) {
                 typeOf: factory.assetTransactionType.Reserve,
                 id: transaction.id,
                 object: {
-                    project: transaction.project,
                     acceptedOffer: acceptedOffers4transactionObject,
+                    // issuedThroughを追加(2023-06-05~)
+                    issuedThrough,
                     reservationFor,
                     // subReservationにreservationForを保管しない(2021-10-19～)
-                    subReservation: objectSubReservations,
-                    typeOf: factory.reservationType.ReservationPackage
+                    subReservation: objectSubReservations
+                    // subReservation: minimizedObjectSubReservations
                 }
             });
         }
@@ -162,13 +184,20 @@ function addReservations(params) {
         yield processLockSeats({
             event: event,
             reservations: objectSubReservations,
-            transaction: transaction
+            transaction: {
+                id: transaction.id,
+                transactionNumber: transaction.transactionNumber,
+                object: { useHoldStockByTransactionNumber: transaction.object.useHoldStockByTransactionNumber === true }
+            },
+            stockHoldUntilDaysAfterEventEnd: params.stockHoldUntilDaysAfterEventEnd
         })(repos);
-        // 予約作成(insertManyで実装)
-        yield repos.reservation.createMany({ reservationFor, reservations: objectSubReservations });
-        // 予約作成後処理
+        if (transaction.object.disablePendingReservations !== true) {
+            // 予約作成(insertManyで実装)
+            yield repos.reservation.createMany({ reservationFor, reservations: objectSubReservations });
+        }
+        // ストックホルダー処理(stockHolderで残席数を集計しているので必要)
         yield onReservationsCreated({ event })(repos);
-        return transaction;
+        return { transaction, objectSubReservations, issuedThrough };
     });
 }
 /**
@@ -385,7 +414,7 @@ function createReservations4transactionObject(params) {
                 id: reservationId,
                 reserveDate: params.now,
                 agent: params.transaction.agent,
-                broker: params.transaction.object.broker,
+                // broker: params.transaction.object.broker,
                 reservationNumber: reservationNumber,
                 reservationFor: params.event,
                 reservedTicket: reservedTicket,
@@ -596,7 +625,7 @@ function processLockOfferRateLimit(params) {
  */
 function processLockSeats(params) {
     return (repos) => __awaiter(this, void 0, void 0, function* () {
-        var _a;
+        var _a, _b;
         const offers = [];
         params.reservations.forEach((r) => {
             var _a, _b;
@@ -636,10 +665,16 @@ function processLockSeats(params) {
             }
         });
         const expires = moment(params.event.endDate)
-            .add(1, 'month')
+            // 設定化(2023-06-05~)
+            // .add(1, 'month')
+            .add(params.stockHoldUntilDaysAfterEventEnd, 'days')
             .toDate();
-        const holder = params.transaction.id;
-        const maximumAttendeeCapacity4event = (_a = params.event.location) === null || _a === void 0 ? void 0 : _a.maximumAttendeeCapacity;
+        // holder:取引番号に対応(2023-06-05~)
+        let holder = params.transaction.id;
+        if (((_a = params.transaction.object) === null || _a === void 0 ? void 0 : _a.useHoldStockByTransactionNumber) === true) {
+            holder = params.transaction.transactionNumber;
+        }
+        const maximumAttendeeCapacity4event = (_b = params.event.location) === null || _b === void 0 ? void 0 : _b.maximumAttendeeCapacity;
         if (typeof maximumAttendeeCapacity4event === 'number') {
             yield repos.stockHolder.lockIfNotLimitExceeded({
                 eventId: params.event.id,
@@ -698,20 +733,22 @@ function confirm(params) {
             throw new factory.errors.ArgumentNull('Transaction ID or Transaction Number');
         }
         const order = yield fixOrderAsPurpose(params, transaction)(repos);
-        const potentialActions = (0, factory_1.createPotentialActions)(Object.assign(Object.assign({}, params), { transaction: transaction, order }));
+        const { potentialActions, underName } = (0, factory_1.createPotentialActions)(Object.assign(Object.assign({}, params), { transaction,
+            order }));
         // 取引確定
         const result = {};
-        yield repos.assetTransaction.confirm({
-            typeOf: factory.assetTransactionType.Reserve,
-            id: transaction.id,
-            result: result,
-            potentialActions: (settings_1.USE_ASSET_TRANSACTION_SYNC_PROCESSING)
+        yield repos.assetTransaction.confirm(Object.assign({ typeOf: factory.assetTransactionType.Reserve, id: transaction.id, result: result, potentialActions: (settings_1.USE_ASSET_TRANSACTION_SYNC_PROCESSING)
                 ? { reserve: [] }
-                : potentialActions
-        });
+                : potentialActions }, (typeof (underName === null || underName === void 0 ? void 0 : underName.typeOf) === 'string')
+            ? { object: { underName } }
+            : undefined));
         if (settings_1.USE_ASSET_TRANSACTION_SYNC_PROCESSING) {
             // sync対応(2023-01-13~)
-            yield (0, confirmReservation_1.confirmReservation)(potentialActions.reserve)(repos);
+            yield (0, confirmReservation_1.confirmReservation)({
+                actionAttributesList: potentialActions.reserve,
+                useOnReservationConfirmed: true,
+                byTask: true
+            })(repos);
         }
     });
 }
@@ -732,7 +769,7 @@ function fixOrderAsPurpose(params, transaction) {
                 project: { id: { $eq: transaction.project.id } },
                 confirmationNumbers: [payPurposeConfirmationNumber],
                 orderNumbers: [payPurposeOrderNumber]
-            });
+            }, { customer: 1, orderNumber: 1, typeOf: 1 });
             order = orders.shift();
             if (order === undefined) {
                 throw new factory.errors.NotFound('Order as purpose');
@@ -754,8 +791,8 @@ function cancel(params) {
         });
         // 本来非同期でタスクが実行されるが、同期的に仮予約取消が実行されていないと、サービス利用側が困る可能性があるので、
         // 同期的にもcancelPendingReservationを実行しておく
-        const cancelActionAttributes = (0, factory_1.createPendingReservationAction)({ transaction });
-        if (cancelActionAttributes.length > 0) {
+        const cancelActionAttributes = (0, factory_1.createCancelPendingReservationAction)({ transaction });
+        if (cancelActionAttributes !== undefined) {
             yield (0, cancelReservation_1.cancelPendingReservation)(cancelActionAttributes)(repos);
         }
     });
@@ -773,27 +810,6 @@ function exportTasksById(params) {
         });
         const potentialActions = transaction.potentialActions;
         const taskAttributes = [];
-        // 資産取引削除タスクを作成
-        const deleteTransactionTask = {
-            project: transaction.project,
-            name: factory.taskName.DeleteAssetTransaction,
-            status: factory.taskStatus.Ready,
-            runsAt: moment(transaction.endDate)
-                .add(settings_1.ASSET_TRANSACTION_STORAGE_PERIOD_IN_DAYS, 'days')
-                .toDate(),
-            remainingNumberOfTries: 3,
-            numberOfTried: 0,
-            executionResults: [],
-            data: {
-                object: {
-                    project: transaction.project,
-                    id: transaction.id,
-                    transactionNumber: transaction.transactionNumber,
-                    typeOf: transaction.typeOf
-                }
-            }
-        };
-        taskAttributes.push(deleteTransactionTask);
         switch (transaction.status) {
             case factory.transactionStatusType.Confirmed:
                 // tslint:disable-next-line:no-single-line-block-comment
@@ -821,8 +837,8 @@ function exportTasksById(params) {
             case factory.transactionStatusType.Canceled:
                 // sync対応(2023-01-13~)
                 if (!settings_1.USE_ASSET_TRANSACTION_SYNC_PROCESSING) {
-                    const cancelActionAttributes4canceled = (0, factory_1.createPendingReservationAction)({ transaction });
-                    if (cancelActionAttributes4canceled.length > 0) {
+                    const cancelActionAttributes4canceled = (0, factory_1.createCancelPendingReservationAction)({ transaction });
+                    if (cancelActionAttributes4canceled !== undefined) {
                         const cancelPendingReservationTask = {
                             project: transaction.project,
                             name: factory.taskName.CancelPendingReservation,
@@ -832,7 +848,7 @@ function exportTasksById(params) {
                             numberOfTried: 0,
                             executionResults: [],
                             data: {
-                                actionAttributes: cancelActionAttributes4canceled
+                                actionAttributes: [cancelActionAttributes4canceled]
                             }
                         };
                         taskAttributes.push(cancelPendingReservationTask);
@@ -840,8 +856,8 @@ function exportTasksById(params) {
                 }
                 break;
             case factory.transactionStatusType.Expired:
-                const cancelActionAttributes = (0, factory_1.createPendingReservationAction)({ transaction });
-                if (cancelActionAttributes.length > 0) {
+                const cancelActionAttributes = (0, factory_1.createCancelPendingReservationAction)({ transaction });
+                if (cancelActionAttributes !== undefined) {
                     const cancelPendingReservationTask = {
                         project: transaction.project,
                         name: factory.taskName.CancelPendingReservation,
@@ -851,7 +867,7 @@ function exportTasksById(params) {
                         numberOfTried: 0,
                         executionResults: [],
                         data: {
-                            actionAttributes: cancelActionAttributes
+                            actionAttributes: [cancelActionAttributes]
                         }
                     };
                     taskAttributes.push(cancelPendingReservationTask);
@@ -860,7 +876,7 @@ function exportTasksById(params) {
             default:
                 throw new factory.errors.NotImplemented(`Transaction status "${transaction.status}" not implemented.`);
         }
-        return repos.task.saveMany(taskAttributes);
+        return repos.task.saveMany(taskAttributes, { emitImmediately: true });
     });
 }
 exports.exportTasksById = exportTasksById;

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

@@ -28,6 +28,12 @@ export declare function exportTasks<T extends factory.assetTransactionType>(para
     typeOf?: {
         $in: T[];
     };
+    id?: string;
+    tasksExportAction?: {
+        agent: {
+            name: string;
+        };
+    };
 }): (repos: {
     task: TaskRepo;
     assetTransaction: AssetTransactionRepo;

package/lib/chevre/service/assetTransaction.js

@@ -20,6 +20,7 @@ const PayTransactionService = require("./assetTransaction/pay");
 const RefundTransactionService = require("./assetTransaction/refund");
 const RegisterServiceTransactionService = require("./assetTransaction/registerService");
 const ReserveTransactionService = require("./assetTransaction/reserve");
+const settings_1 = require("../settings");
 exports.cancelReservation = CancelReservationTransactionService;
 exports.moneyTransfer = MoneyTransferTransactionService;
 exports.pay = PayTransactionService;
@@ -31,10 +32,14 @@ exports.reserve = ReserveTransactionService;
  */
 function exportTasks(params) {
     return (repos) => __awaiter(this, void 0, void 0, function* () {
-        const transaction = yield repos.assetTransaction.startExportTasks({
-            typeOf: params.typeOf,
-            status: params.status
-        });
+        var _a;
+        const transaction = yield repos.assetTransaction.startExportTasks(Object.assign({ typeOf: params.typeOf, status: params.status, tasksExportAction: {
+                agent: {
+                    name: (typeof ((_a = params.tasksExportAction) === null || _a === void 0 ? void 0 : _a.agent.name) === 'string')
+                        ? params.tasksExportAction.agent.name
+                        : settings_1.DEFAULT_TASKS_EXPORT_AGENT_NAME
+                }
+            } }, (typeof params.id === 'string') ? { id: params.id } : undefined));
         if (transaction === null) {
             return;
         }

package/lib/chevre/service/event.js

@@ -127,7 +127,7 @@ function importFromCOA(params) {
             })(repos);
             savedScreeningEventSeriesCount = savedEventsCount;
             try {
-                // イベントごとに永続化トライ
+                // イベント永続化
                 const screeningEvents = yield saveScreeningEvents({
                     locationBranchCode: params.locationBranchCode,
                     movieTheater: movieTheater,
@@ -154,6 +154,8 @@ function importFromCOA(params) {
                 // "message": "ESOCKETTIMEDOUT",
                 if (error.name === 'COAServiceError') {
                     if (error.message === 'ESOCKETTIMEDOUT') {
+                        // tslint:disable-next-line:no-console
+                        console.error('saveScreeningEvents throwed an error', error.name, error.message);
                         throwsError = false;
                     }
                 }
@@ -212,7 +214,7 @@ function saveScreeningEventSeries(params) {
         const availablePaymentMethodTypes = yield repos.categoryCode.search({
             project: { id: { $eq: params.project.id } },
             inCodeSet: { identifier: { $eq: factory.categoryCode.CategorySetIdentifier.PaymentMethodType } }
-        });
+        }, [], []);
         const screeningEventSerieses = filmsFromCOA.map((filmFromCOA) => {
             return createScreeningEventSeriesFromCOA({
                 project: project,
@@ -584,7 +586,10 @@ function createScreeningEventSeriesFromCOA(params) {
         endDate: endDate,
         startDate: startDate,
         coaInfo,
-        offers: Object.assign({ project: { typeOf: params.project.typeOf, id: params.project.id }, typeOf: factory.offerType.Offer, priceCurrency: factory.priceCurrency.JPY }, (Array.isArray(unacceptedPaymentMethod)) ? { unacceptedPaymentMethod: unacceptedPaymentMethod } : undefined),
+        offers: Object.assign({ 
+            // 不要なので廃止(2023-06-09~)
+            // project: { typeOf: params.project.typeOf, id: params.project.id },
+            typeOf: factory.offerType.Offer, priceCurrency: factory.priceCurrency.JPY }, (Array.isArray(unacceptedPaymentMethod)) ? { unacceptedPaymentMethod: unacceptedPaymentMethod } : undefined),
         additionalProperty
     };
 }
@@ -765,8 +770,14 @@ function updateEvent4ttts(params) {
             throw error;
         }
         // アクション完了
-        yield repos.action.complete({ typeOf: action.typeOf, id: action.id, result: {} });
-        yield (0, offer_1.onEventChanged)({ event, isNew: false })({
+        yield repos.action.complete({ typeOf: action.typeOf, id: action.id, result: { id: event.id } });
+        yield (0, offer_1.onEventChanged)({
+            id: [event.id],
+            project: { id: event.project.id },
+            typeOf: event.typeOf,
+            isNew: false,
+            useInform: true
+        })({
             event: repos.event,
             project: repos.project,
             task: repos.task

package/lib/chevre/service/notification/factory.js

@@ -12,7 +12,7 @@ function task2lineNotify(params) {
     const lastExecutionResult = (task.executionResults.length > 0) ? task.executionResults.slice(-1)[0] : undefined;
     let lastError = lastExecutionResult === null || lastExecutionResult === void 0 ? void 0 : lastExecutionResult.error;
     if (typeof lastError === 'string') {
-        lastError = { message: lastError };
+        lastError = { message: lastError, name: 'Error' };
     }
     const lastMessage = `${String(lastError === null || lastError === void 0 ? void 0 : lastError.name)} ${String(lastError === null || lastError === void 0 ? void 0 : lastError.message)}`;
     const content = `project:${(_a = task.project) === null || _a === void 0 ? void 0 : _a.id}
@@ -38,7 +38,7 @@ function tasks2lineNotify(params) {
         const lastExecutionResult = (task.executionResults.length > 0) ? task.executionResults.slice(-1)[0] : undefined;
         let lastError = lastExecutionResult === null || lastExecutionResult === void 0 ? void 0 : lastExecutionResult.error;
         if (typeof lastError === 'string') {
-            lastError = { message: lastError };
+            lastError = { message: lastError, name: 'Error' };
         }
         const lastMessage = `${String(lastError === null || lastError === void 0 ? void 0 : lastError.name)} ${String(lastError === null || lastError === void 0 ? void 0 : lastError.message)}`;
         return `project:${(_a = task.project) === null || _a === void 0 ? void 0 : _a.id}

package/lib/chevre/service/notification.d.ts

@@ -1,7 +1,9 @@
 import * as factory from '../factory';
 import { MongoRepository as ActionRepo } from '../repo/action';
 import { MongoRepository as ProjectRepo } from '../repo/project';
-export type Operation<T> = () => Promise<T>;
+export type Operation<T> = (repos: {
+    accessToken: string;
+}) => Promise<T>;
 /**
  * Eメールメッセージを送信する
  * https://sendgrid.com/docs/API_Reference/Web_API_v3/Mail/errors.html

package/lib/chevre/service/notification.js

@@ -111,15 +111,11 @@ exports.sendEmailMessage = sendEmailMessage;
  * https://notify-bot.line.me/doc/ja/
  */
 function report2developers(subject, content, imageThumbnail, imageFullsize) {
-    return () => __awaiter(this, void 0, void 0, function* () {
+    return (repos) => __awaiter(this, void 0, void 0, function* () {
         const LINE_NOTIFY_URL = credentials_1.credentials.lineNotify.url;
-        const LINE_NOTIFY_ACCESS_TOKEN = credentials_1.credentials.lineNotify.accessToken;
         if (LINE_NOTIFY_URL === undefined) {
             throw new Error('Environment variable LINE_NOTIFY_URL not set');
         }
-        if (LINE_NOTIFY_ACCESS_TOKEN === undefined) {
-            throw new Error('Environment variable LINE_NOTIFY_ACCESS_TOKEN not set');
-        }
         const message = `--------
 ${subject}
 --------
@@ -130,7 +126,7 @@ ${content}`;
             var _a;
             request.post({
                 url: LINE_NOTIFY_URL,
-                auth: { bearer: LINE_NOTIFY_ACCESS_TOKEN },
+                auth: { bearer: repos.accessToken },
                 form: formData,
                 json: true,
                 timeout: (_a = settings_1.settings.webhook) === null || _a === void 0 ? void 0 : _a.timeout
@@ -154,6 +150,45 @@ ${content}`;
 exports.report2developers = report2developers;
 const USERNAME_ARGUMENT_REQUIRED_MESSAGE = 'Missing required key \'Username\' in params';
 function triggerWebhook(params) {
+    return (repos) => __awaiter(this, void 0, void 0, function* () {
+        // retryableにする(2023-05-12~)
+        let retry = true;
+        let numberOfTry = 0;
+        while (numberOfTry >= 0) {
+            try {
+                numberOfTry += 1;
+                if (numberOfTry > settings_1.TRIGGER_WEBHOOK_MAX_RETRY_COUNT) {
+                    retry = false;
+                }
+                // retryInterval
+                if (numberOfTry > 1) {
+                    yield sleep(settings_1.TRIGGER_WEBHOOK_RETRY_INTERVAL_IN_MS * (numberOfTry - 1));
+                }
+                yield processInformAction(params)(repos);
+                break;
+            }
+            catch (error) {
+                if (retry) {
+                    continue;
+                }
+                else {
+                    throw error;
+                }
+            }
+        }
+    });
+}
+exports.triggerWebhook = triggerWebhook;
+function sleep(waitTime) {
+    return __awaiter(this, void 0, void 0, function* () {
+        return new Promise((resolve) => {
+            setTimeout(() => {
+                resolve();
+            }, waitTime);
+        });
+    });
+}
+function processInformAction(params) {
     return (repos) => __awaiter(this, void 0, void 0, function* () {
         var _a, _b;
         // アクション開始
@@ -219,4 +254,3 @@ function triggerWebhook(params) {
         yield repos.action.complete({ typeOf: action.typeOf, id: action.id, result: result });
     });
 }
-exports.triggerWebhook = triggerWebhook;

package/lib/chevre/service/offer/event/authorize.d.ts

@@ -57,5 +57,8 @@ declare function authorize(params: {
          */
         id: string;
     };
+    disablePendingReservations: boolean;
+    useHoldStockByTransactionNumber: boolean;
+    stockHoldUntilDaysAfterEventEnd: number;
 }): IAuthorizeOperation<IAuthorizeOfferAction>;
 export { authorize };

package/lib/chevre/service/offer/event/authorize.js

@@ -66,7 +66,10 @@ function authorize(params) {
                         ticketOffers,
                         unitPriceOffers,
                         validateEvent: params.validateEvent === true,
-                        validateEventOfferPeriod: params.validateEventOfferPeriod === true
+                        validateEventOfferPeriod: params.validateEventOfferPeriod === true,
+                        disablePendingReservations: params.disablePendingReservations,
+                        useHoldStockByTransactionNumber: params.useHoldStockByTransactionNumber,
+                        stockHoldUntilDaysAfterEventEnd: params.stockHoldUntilDaysAfterEventEnd
                     })(repos);
                     // requestBody = processStartReserveResult.requestBody;
                     // responseBody = processStartReserveResult.responseBody;
@@ -162,9 +165,12 @@ function processStartReserve4chevre(params) {
         // requestBody = startParams;
         const startParamObject = yield validateObjectWithoutDetail(startParams)(repos);
         // 予約取引開始
-        responseBody = yield ReserveTransactionService.start(Object.assign(Object.assign({}, startParams), { object: startParamObject, preSearchedEvent: event, preSearchedTicketOffers: params.ticketOffers, preSearchedUnitPriceOffers: params.unitPriceOffers, availableAtOrFrom: { id: params.availableAtOrFrom.id }, validateEvent: params.validateEvent, validateEventOfferPeriod: params.validateEventOfferPeriod, validateAppliesToMovieTicket: true }))(repos);
+        const startReserveTransactionResult = yield ReserveTransactionService.start(Object.assign(Object.assign({}, startParams), { object: startParamObject, preSearchedEvent: event, preSearchedTicketOffers: params.ticketOffers, preSearchedUnitPriceOffers: params.unitPriceOffers, availableAtOrFrom: { id: params.availableAtOrFrom.id }, validateEvent: params.validateEvent, validateEventOfferPeriod: params.validateEventOfferPeriod, validateAppliesToMovieTicket: true, disablePendingReservations: params.disablePendingReservations, useHoldStockByTransactionNumber: params.useHoldStockByTransactionNumber, stockHoldUntilDaysAfterEventEnd: params.stockHoldUntilDaysAfterEventEnd }))(repos);
+        responseBody = startReserveTransactionResult.transaction;
         // 予約取引からオファー情報を生成する
         acceptedOffers4result = (0, factory_1.responseBody2acceptedOffers4result)({
+            issuedThrough: startReserveTransactionResult.issuedThrough,
+            objectSubReservations: startReserveTransactionResult.objectSubReservations,
             responseBody: responseBody,
             event: event,
             project: transaction.project,

package/lib/chevre/service/offer/event/factory.d.ts

@@ -23,8 +23,11 @@ export declare function createAuthorizeSeatReservationActionAttributes(params: {
 export declare function acceptedOffers2amount(params: {
     acceptedOffers: IResultAcceptedOffer[];
 }): number;
+type IObjectSubReservation = factory.assetTransaction.reserve.IObjectSubReservation;
 type IResultAcceptedOffer = factory.action.authorize.offer.seatReservation.IResultAcceptedOffer;
 export declare function responseBody2acceptedOffers4result(params: {
+    issuedThrough: factory.assetTransaction.reserve.IIssuedThrough;
+    objectSubReservations: IObjectSubReservation[];
     responseBody: factory.assetTransaction.reserve.ITransaction;
     event: IMinimizedIndividualEvent<factory.eventType.ScreeningEvent>;
     project: {

package/lib/chevre/service/offer/event/factory.js

@@ -154,10 +154,15 @@ exports.acceptedOffers2amount = acceptedOffers2amount;
 function responseBody2acceptedOffers4result(params) {
     let acceptedOffers4result = [];
     // 予約取引からacceptedOffers4resultを生成する
-    if (Array.isArray(params.responseBody.object.subReservation)) {
-        acceptedOffers4result = params.responseBody.object.subReservation.map((itemOffered) => {
+    if (Array.isArray(params.objectSubReservations)) {
+        acceptedOffers4result = params.objectSubReservations.map((itemOffered) => {
             var _a;
-            const reservation = createReservation({ project: params.project, itemOffered, event: params.event });
+            const reservation = createReservation({
+                project: params.project,
+                itemOffered,
+                event: params.event,
+                issuedThrough: params.issuedThrough
+            });
             // appliesToMovieTicketがArrayでないケースは廃止(2022-09-12~)
             const priceSpecification = itemOffered.price;
             const priceComponent = priceSpecification.priceComponent.map((c) => {
@@ -244,7 +249,10 @@ function createReservation(params) {
             // 最適化(2022-05-31~)
             superEvent: Object.assign(Object.assign({ typeOf: event.superEvent.typeOf, id: event.superEvent.id, kanaName: event.superEvent.kanaName, location: event.superEvent.location, name: event.superEvent.name, soundFormat: event.superEvent.soundFormat, videoFormat: event.superEvent.videoFormat, workPerformed }, (typeof event.superEvent.duration === 'string') ? { duration: event.superEvent.duration } : undefined), (event.superEvent.headline !== undefined) ? { headline: event.superEvent.headline } : undefined)
         };
-        reservationItem = Object.assign({ project: itemOffered.project, typeOf: itemOffered.typeOf, additionalProperty: itemOffered.additionalProperty, additionalTicketText: itemOffered.additionalTicketText, id: itemOffered.id, issuedThrough: itemOffered.issuedThrough, reservationNumber: itemOffered.reservationNumber, reservationFor,
+        if (params.issuedThrough.typeOf !== factory.product.ProductType.EventService) {
+            throw new factory.errors.Argument('issuedThrough', `issuedThrough.typeOf must be ${factory.product.ProductType.EventService}`);
+        }
+        reservationItem = Object.assign({ project: itemOffered.project, typeOf: itemOffered.typeOf, additionalProperty: itemOffered.additionalProperty, additionalTicketText: itemOffered.additionalTicketText, id: itemOffered.id, issuedThrough: params.issuedThrough, reservationNumber: itemOffered.reservationNumber, reservationFor,
             reservedTicket }, (typeof ((_a = itemOffered.programMembershipUsed) === null || _a === void 0 ? void 0 : _a.typeOf) === 'string')
             ? { programMembershipUsed: itemOffered.programMembershipUsed }
             : undefined);
@@ -269,7 +277,10 @@ function createReservation(params) {
             busNumber: tripByEvent.busNumber,
             identifier: tripByEvent.identifier
         };
-        reservationItem = Object.assign({ project: itemOffered.project, typeOf: itemOffered.typeOf, additionalProperty: itemOffered.additionalProperty, additionalTicketText: itemOffered.additionalTicketText, id: itemOffered.id, issuedThrough: itemOffered.issuedThrough, reservationNumber: itemOffered.reservationNumber, reservationFor,
+        if (params.issuedThrough.typeOf !== factory.product.ProductType.Transportation) {
+            throw new factory.errors.Argument('issuedThrough', `issuedThrough.typeOf must be ${factory.product.ProductType.Transportation}`);
+        }
+        reservationItem = Object.assign({ project: itemOffered.project, typeOf: itemOffered.typeOf, additionalProperty: itemOffered.additionalProperty, additionalTicketText: itemOffered.additionalTicketText, id: itemOffered.id, issuedThrough: params.issuedThrough, reservationNumber: itemOffered.reservationNumber, reservationFor,
             reservedTicket }, (typeof ((_d = itemOffered.programMembershipUsed) === null || _d === void 0 ? void 0 : _d.typeOf) === 'string')
             ? { programMembershipUsed: itemOffered.programMembershipUsed }
             : undefined);

package/lib/chevre/service/offer/event/importFromCOA.js

@@ -20,7 +20,7 @@ function importFromCOA(params) {
             page: 1,
             project: { id: { $eq: params.project.id } },
             inCodeSet: { identifier: { $eq: factory.categoryCode.CategorySetIdentifier.CurrencyType } }
-        });
+        }, [], []);
         const defaultCurrencyType = currencyTypes.shift();
         // メンバーシップ区分検索
         const membershipTypes = yield repos.categoryCode.search({
@@ -28,7 +28,7 @@ function importFromCOA(params) {
             page: 1,
             project: { id: { $eq: params.project.id } },
             inCodeSet: { identifier: { $eq: factory.categoryCode.CategorySetIdentifier.MembershipType } }
-        });
+        }, [], []);
         const defaultMembershipType = membershipTypes.shift();
         try {
             const ticketResults = yield repos.masterService.ticket({ theaterCode: params.theaterCode });