@chevre/domain 21.2.0-alpha.1 → 21.2.0-alpha.100

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

@@ -2,7 +2,6 @@ import * as factory from '../../factory';
 import { MongoRepository as ActionRepo } from '../../repo/action';
 import { MongoRepository as AssetTransactionRepo } from '../../repo/assetTransaction';
 import { IMinimizedIndividualEvent, MongoRepository as EventRepo } from '../../repo/event';
-import { RedisRepository as ScreeningEventAvailabilityRepo } from '../../repo/itemAvailability/screeningEvent';
 import { MongoRepository as OfferRepo } from '../../repo/offer';
 import { MongoRepository as OfferCatalogRepo } from '../../repo/offerCatalog';
 import { MongoRepository as OrderRepo } from '../../repo/order';
@@ -12,9 +11,10 @@ import { MongoRepository as ProductRepo } from '../../repo/product';
 import { MongoRepository as ProjectRepo } from '../../repo/project';
 import { RedisRepository as OfferRateLimitRepo } from '../../repo/rateLimit/offer';
 import { MongoRepository as ReservationRepo } from '../../repo/reservation';
+import { StockHolderRepository as StockHolderRepo } from '../../repo/stockHolder';
 import { MongoRepository as TaskRepo } from '../../repo/task';
 export interface IStartOperationRepos {
-    eventAvailability: ScreeningEventAvailabilityRepo;
+    stockHolder: StockHolderRepo;
     event: EventRepo;
     offer: OfferRepo;
     offerCatalog: OfferCatalogRepo;
@@ -29,7 +29,7 @@ export interface IStartOperationRepos {
 }
 export type IStartOperation<T> = (repos: IStartOperationRepos) => Promise<T>;
 export interface IAddReservationsOperationRepos {
-    eventAvailability: ScreeningEventAvailabilityRepo;
+    stockHolder: StockHolderRepo;
     event: EventRepo;
     offer: OfferRepo;
     offerCatalog: OfferCatalogRepo;
@@ -44,7 +44,7 @@ export interface IAddReservationsOperationRepos {
 export type IAddReservationsOperation<T> = (repos: IAddReservationsOperationRepos) => Promise<T>;
 export type ICancelOperation<T> = (repos: {
     action: ActionRepo;
-    eventAvailability: ScreeningEventAvailabilityRepo;
+    stockHolder: StockHolderRepo;
     offerRateLimit: OfferRateLimitRepo;
     reservation: ReservationRepo;
     task: TaskRepo;
@@ -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;
@@ -119,7 +125,7 @@ function addReservations(params) {
             ticketOffers = searchEventTicketOffersResult.ticketOffers;
             availableOffers = searchEventTicketOffersResult.unitPriceOffers;
         }
-        const availableSeatOffers = yield searchAvailableSeatOffers({ acceptedOffers, event: { id: event.id } })(repos);
+        const availableSeatOffers = yield searchAvailableSeatOffers({ acceptedOffers, event })(repos);
         // 仮予約作成
         const { acceptedOffers4transactionObject, objectSubReservations } = yield createAcceptedOffers4transactionObject({
             acceptedOffers,
@@ -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,23 +184,96 @@ 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 };
+    });
+}
+/**
+ * イベントに対する座席オファーを座席コードとセクションコード指定で検索する
+ */
+function searchEventSeatOffers(params) {
+    return (repos) => __awaiter(this, void 0, void 0, function* () {
+        var _a, _b, _c, _d, _e, _f;
+        let offers = [];
+        // 座席指定利用可能かどうか
+        const eventOffers = params.event.offers;
+        const reservedSeatsAvailable = ((_b = (_a = eventOffers === null || eventOffers === void 0 ? void 0 : eventOffers.itemOffered.serviceOutput) === null || _a === void 0 ? void 0 : _a.reservedTicket) === null || _b === void 0 ? void 0 : _b.ticketedSeat) !== undefined;
+        if (reservedSeatsAvailable) {
+            // 座席タイプ価格仕様を検索
+            const priceSpecs = yield repos.priceSpecification.search({
+                project: { id: { $eq: params.event.project.id } },
+                typeOf: factory.priceSpecificationType.CategoryCodeChargeSpecification,
+                appliesToCategoryCode: {
+                    inCodeSet: { identifier: { $eq: factory.categoryCode.CategorySetIdentifier.SeatingType } }
+                }
+            });
+            const roomBranchCode = String((_d = (_c = eventOffers.itemOffered) === null || _c === void 0 ? void 0 : _c.availableChannel) === null || _d === void 0 ? void 0 : _d.serviceLocation.branchCode);
+            const movieTheaterBranchCode = String((_f = (_e = eventOffers.itemOffered) === null || _e === void 0 ? void 0 : _e.availableChannel) === null || _f === void 0 ? void 0 : _f.serviceLocation.containedInPlace.branchCode);
+            const seats = yield repos.place.searchSeats({
+                project: { id: { $eq: params.event.project.id } },
+                branchCode: { $in: params.branchCode.$in },
+                containedInPlace: {
+                    branchCode: {
+                        $in: params.containedInPlace.branchCode.$in
+                    },
+                    containedInPlace: {
+                        branchCode: { $eq: roomBranchCode },
+                        containedInPlace: {
+                            branchCode: { $eq: movieTheaterBranchCode }
+                        }
+                    }
+                },
+                $projection: params.$projection
+            });
+            if (seats.length > 0) {
+                const availabilities = yield repos.stockHolder.searchHolders({
+                    eventId: params.event.id,
+                    startDate: moment(params.event.startDate)
+                        .toDate(),
+                    offers: seats.map((s) => {
+                        var _a;
+                        return {
+                            seatNumber: s.branchCode,
+                            seatSection: (_a = s.containedInPlace) === null || _a === void 0 ? void 0 : _a.branchCode
+                        };
+                    })
+                });
+                offers = seats.map((seat, index) => {
+                    return OfferService.addOffers2Seat({
+                        seat,
+                        // unavailableOffers: [],
+                        // availability: availabilities[index].availability,
+                        availability: (typeof availabilities[index] === 'string')
+                            ? factory.itemAvailability.OutOfStock // ホルダーが存在すればOutOfStock
+                            : factory.itemAvailability.InStock,
+                        priceSpecs
+                    });
+                });
+            }
+        }
+        return offers;
     });
 }
 function searchAvailableSeatOffers(params) {
     return (repos) => __awaiter(this, void 0, void 0, function* () {
         // 座席オファー検索(必要な分だけ)
         const { acceptedSeatNumbers, acceptedSeatSections } = getAcceptedSeatNumbersAndSeatSections({ acceptedOffers: params.acceptedOffers });
-        return OfferService.searchEventSeatOffers({
+        return searchEventSeatOffers({
             branchCode: { $in: acceptedSeatNumbers },
             containedInPlace: { branchCode: { $in: acceptedSeatSections } },
-            event: { id: params.event.id },
+            event: params.event,
             // 試しに冗長な情報を非取得にしてみる
             $projection: {
                 'containedInPlace.containedInPlace': 0
@@ -319,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,
@@ -530,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;
@@ -570,12 +665,18 @@ 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.eventAvailability.lockIfNotLimitExceeded({
+            yield repos.stockHolder.lockIfNotLimitExceeded({
                 eventId: params.event.id,
                 startDate: moment(params.event.startDate)
                     .toDate(),
@@ -585,7 +686,7 @@ function processLockSeats(params) {
             }, maximumAttendeeCapacity4event);
         }
         else {
-            yield repos.eventAvailability.lock({
+            yield repos.stockHolder.lock({
                 eventId: params.event.id,
                 startDate: moment(params.event.startDate)
                     .toDate(),
@@ -632,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);
         }
     });
 }
@@ -666,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');
@@ -688,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);
         }
     });
@@ -707,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
@@ -755,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,
@@ -766,7 +848,7 @@ function exportTasksById(params) {
                             numberOfTried: 0,
                             executionResults: [],
                             data: {
-                                actionAttributes: cancelActionAttributes4canceled
+                                actionAttributes: [cancelActionAttributes4canceled]
                             }
                         };
                         taskAttributes.push(cancelPendingReservationTask);
@@ -774,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,
@@ -785,7 +867,7 @@ function exportTasksById(params) {
                         numberOfTried: 0,
                         executionResults: [],
                         data: {
-                            actionAttributes: cancelActionAttributes
+                            actionAttributes: [cancelActionAttributes]
                         }
                     };
                     taskAttributes.push(cancelPendingReservationTask);
@@ -794,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

@@ -3,7 +3,6 @@
  */
 import * as factory from '../factory';
 import { MongoRepository as AssetTransactionRepo } from '../repo/assetTransaction';
-import { MongoRepository as ProjectRepo } from '../repo/project';
 import { MongoRepository as TaskRepo } from '../repo/task';
 import * as CancelReservationTransactionService from './assetTransaction/cancelReservation';
 import * as MoneyTransferTransactionService from './assetTransaction/moneyTransfer';
@@ -29,8 +28,13 @@ export declare function exportTasks<T extends factory.assetTransactionType>(para
     typeOf?: {
         $in: T[];
     };
+    id?: string;
+    tasksExportAction?: {
+        agent: {
+            name: string;
+        };
+    };
 }): (repos: {
-    project: ProjectRepo;
     task: TaskRepo;
     assetTransaction: AssetTransactionRepo;
 }) => Promise<{

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,11 +32,14 @@ exports.reserve = ReserveTransactionService;
  */
 function exportTasks(params) {
     return (repos) => __awaiter(this, void 0, void 0, function* () {
-        const transaction = yield repos.assetTransaction.startExportTasks({
-            // project: params.project,
-            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;
                     }
                 }

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;