@chevre/domain 21.2.0-alpha.0 → 21.2.0-alpha.10

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

@@ -119,7 +119,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,
@@ -171,14 +171,80 @@ function addReservations(params) {
         return transaction;
     });
 }
+/**
+ * イベントに対する座席オファーを座席コードとセクションコード指定で検索する
+ */
+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
@@ -575,7 +641,7 @@ function processLockSeats(params) {
         const holder = params.transaction.id;
         const maximumAttendeeCapacity4event = (_a = params.event.location) === null || _a === void 0 ? void 0 : _a.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 +651,7 @@ function processLockSeats(params) {
             }, maximumAttendeeCapacity4event);
         }
         else {
-            yield repos.eventAvailability.lock({
+            yield repos.stockHolder.lock({
                 eventId: params.event.id,
                 startDate: moment(params.event.startDate)
                     .toDate(),

package/lib/chevre/service/offer/event/authorize.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 { 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 PlaceRepo } from '../../../repo/place';
@@ -11,6 +10,7 @@ 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';
 import { MongoRepository as TransactionRepo } from '../../../repo/transaction';
 import { RedisRepository as TransactionNumberRepo } from '../../../repo/transactionNumber';
@@ -19,7 +19,7 @@ interface IAuthorizeRepos {
     action: ActionRepo;
     assetTransaction: AssetTransactionRepo;
     event: EventRepo;
-    eventAvailability: ScreeningEventAvailabilityRepo;
+    stockHolder: StockHolderRepo;
     offer: OfferRepo;
     offerCatalog: OfferCatalogRepo;
     offerRateLimit: OfferRateLimitRepo;

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

@@ -1,15 +1,15 @@
 import * as factory from '../../../factory';
 import { MongoRepository as ActionRepo } from '../../../repo/action';
 import { MongoRepository as AssetTransactionRepo } from '../../../repo/assetTransaction';
-import { RedisRepository as ScreeningEventAvailabilityRepo } from '../../../repo/itemAvailability/screeningEvent';
 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';
 import { MongoRepository as TransactionRepo } from '../../../repo/transaction';
 interface ICancelRepos {
     action: ActionRepo;
     assetTransaction: AssetTransactionRepo;
-    eventAvailability: ScreeningEventAvailabilityRepo;
+    stockHolder: StockHolderRepo;
     offerRateLimit: OfferRateLimitRepo;
     reservation: ReservationRepo;
     task: TaskRepo;

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

@@ -1,15 +1,15 @@
 import * as factory from '../../../factory';
 import { MongoRepository as ActionRepo } from '../../../repo/action';
 import { MongoRepository as AssetTransactionRepo } from '../../../repo/assetTransaction';
-import { RedisRepository as ScreeningEventAvailabilityRepo } from '../../../repo/itemAvailability/screeningEvent';
 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 import WebAPIIdentifier = factory.service.webAPI.Identifier;
 interface IVoidTransactionRepos {
     action: ActionRepo;
     assetTransaction: AssetTransactionRepo;
-    eventAvailability: ScreeningEventAvailabilityRepo;
+    stockHolder: StockHolderRepo;
     offerRateLimit: OfferRateLimitRepo;
     reservation: ReservationRepo;
     task: TaskRepo;

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

@@ -1,8 +1,8 @@
 import { MongoRepository as EventRepo } from '../repo/event';
-import { RedisRepository as EventAvailabilityRepo } from '../repo/itemAvailability/screeningEvent';
 import { MongoRepository as PlaceRepo } from '../repo/place';
 import { MongoRepository as PriceSpecificationRepo } from '../repo/priceSpecification';
 import { MongoRepository as ProjectRepo } from '../repo/project';
+import { StockHolderRepository as StockHolderRepo } from '../repo/stockHolder';
 import { MongoRepository as TaskRepo } from '../repo/task';
 import * as factory from '../factory';
 import * as EventOfferService from './offer/event';
@@ -11,35 +11,22 @@ import * as MoneyTransferOfferService from './offer/moneyTransfer';
 import * as ProductOfferService from './offer/product';
 export { EventOfferService as event, EventServiceByCOAOfferService as eventServiceByCOA, MoneyTransferOfferService as moneyTransfer, ProductOfferService as product };
 /**
- * イベントに対する座席オファーを座席コードとセクションコード指定で検索する
+ * 座席にオファー情報を付加する
  */
-export declare function searchEventSeatOffers(params: {
-    branchCode?: {
-        $in?: string[];
-    };
-    containedInPlace?: {
-        branchCode?: {
-            $in?: string[];
-        };
-    };
-    event: {
-        id: string;
-    };
-    $projection?: {
-        [key: string]: number;
-    };
-}): (repos: {
-    event: EventRepo;
-    priceSpecification: PriceSpecificationRepo;
-    eventAvailability: EventAvailabilityRepo;
-    place: PlaceRepo;
-}) => Promise<factory.place.seat.IPlaceWithOffer[]>;
+export declare function addOffers2Seat(params: {
+    seat: factory.place.seat.IPlace;
+    availability: factory.itemAvailability;
+    /**
+     * 座席区分加算料金
+     */
+    priceSpecs: factory.priceSpecification.IPriceSpecification<factory.priceSpecificationType.CategoryCodeChargeSpecification>[];
+}): factory.place.seat.IPlaceWithOffer;
 /**
  * イベントに対する座席オファーを検索する
  */
 export declare function searchEventSeatOffersWithPaging(params: {
-    limit?: number;
-    page?: number;
+    limit: number;
+    page: number;
     branchCode?: {
         $eq?: string;
     };
@@ -57,7 +44,7 @@ export declare function searchEventSeatOffersWithPaging(params: {
 }): (repos: {
     event: EventRepo;
     priceSpecification: PriceSpecificationRepo;
-    eventAvailability: EventAvailabilityRepo;
+    stockHolder: StockHolderRepo;
     place: PlaceRepo;
 }) => Promise<factory.place.seat.IPlaceWithOffer[]>;
 interface IChangedEvent {

package/lib/chevre/service/offer.js

@@ -9,7 +9,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     });
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.createAggregateScreeningEventIfNotExist = exports.onEventChanged = exports.searchEventSeatOffersWithPaging = exports.searchEventSeatOffers = exports.product = exports.moneyTransfer = exports.eventServiceByCOA = exports.event = void 0;
+exports.createAggregateScreeningEventIfNotExist = exports.onEventChanged = exports.searchEventSeatOffersWithPaging = exports.addOffers2Seat = exports.product = exports.moneyTransfer = exports.eventServiceByCOA = exports.event = void 0;
 const moment = require("moment");
 const factory = require("../factory");
 const EventOfferService = require("./offer/event");
@@ -24,121 +24,33 @@ exports.product = ProductOfferService;
  * 座席にオファー情報を付加する
  */
 function addOffers2Seat(params) {
-    const seatNumber = params.seat.branchCode;
-    const unavailableOffer = params.unavailableOffers.find((o) => o.seatSection === params.seatSection && o.seatNumber === seatNumber);
-    const priceComponent = [];
     // 座席タイプが指定されていれば、適用される価格仕様を構成要素に追加
     const seatingTypes = (Array.isArray(params.seat.seatingType))
         ? params.seat.seatingType
-        : (typeof params.seat.seatingType === 'string' && params.seat.seatingType.length > 0) ? [params.seat.seatingType]
-            : [];
-    priceComponent.push(...params.priceSpecs.filter((s) => {
+        : (typeof params.seat.seatingType === 'string' && params.seat.seatingType.length > 0) ? [params.seat.seatingType] : [];
+    const priceComponent = params.priceSpecs.filter((s) => {
         // 適用カテゴリーコードに座席タイプが含まれる価格仕様を検索
         return (Array.isArray(s.appliesToCategoryCode))
             && s.appliesToCategoryCode.some((categoryCode) => {
-                return seatingTypes.includes(categoryCode.codeValue)
-                    // tslint:disable-next-line:max-line-length
-                    && categoryCode.inCodeSet.identifier === factory.categoryCode.CategorySetIdentifier.SeatingType;
+                return seatingTypes.includes(categoryCode.codeValue);
+                // && categoryCode.inCodeSet.identifier === factory.categoryCode.CategorySetIdentifier.SeatingType;
             });
-    }));
-    // 最適化(2022-11-15~)
+    });
     const priceSpecification = {
         typeOf: factory.priceSpecificationType.CompoundPriceSpecification,
-        // priceCurrency: factory.priceCurrency.JPY,
-        // valueAddedTaxIncluded: true,
-        priceComponent: priceComponent
+        priceComponent
     };
-    let availability = (unavailableOffer !== undefined)
-        ? factory.itemAvailability.OutOfStock
-        : factory.itemAvailability.InStock;
-    if (params.availability !== undefined) {
+    let availability = factory.itemAvailability.InStock;
+    if (typeof params.availability === 'string') {
         availability = params.availability;
     }
     return Object.assign(Object.assign({}, params.seat), { offers: [{
-                // 最適化(2022-11-15~)
-                // project: params.project,
                 typeOf: factory.offerType.Offer,
-                // priceCurrency: factory.priceCurrency.JPY,
-                availability: availability,
-                priceSpecification: priceSpecification
+                availability,
+                priceSpecification
             }] });
 }
-/**
- * イベントに対する座席オファーを座席コードとセクションコード指定で検索する
- */
-function searchEventSeatOffers(params) {
-    return (repos) => __awaiter(this, void 0, void 0, function* () {
-        var _a, _b, _c, _d, _e, _f, _g, _h, _j;
-        let offers = [];
-        // イベント取得属性最適化(2023-01-23~)
-        // const event = await repos.event.findById<factory.eventType.ScreeningEvent | factory.eventType.Event>({
-        //     id: params.event.id
-        // });
-        const event = yield repos.event.findMinimizedIndividualEventById({
-            id: params.event.id
-        });
-        // 座席指定利用可能かどうか
-        const eventOffers = 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: event.project.id } },
-                typeOf: factory.priceSpecificationType.CategoryCodeChargeSpecification,
-                appliesToCategoryCode: {
-                    inCodeSet: { identifier: { $eq: factory.categoryCode.CategorySetIdentifier.SeatingType } }
-                }
-            });
-            // const roomBranchCode = event.location.branchCode;
-            // const movieTheaterBranchCode = event.superEvent.location.branchCode;
-            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: event.project.id } },
-                branchCode: { $in: (_g = params.branchCode) === null || _g === void 0 ? void 0 : _g.$in },
-                containedInPlace: {
-                    branchCode: {
-                        $in: (_j = (_h = params.containedInPlace) === null || _h === void 0 ? void 0 : _h.branchCode) === null || _j === void 0 ? void 0 : _j.$in
-                    },
-                    containedInPlace: {
-                        branchCode: { $eq: roomBranchCode },
-                        containedInPlace: {
-                            branchCode: { $eq: movieTheaterBranchCode }
-                        }
-                    }
-                },
-                $projection: params.$projection
-            });
-            if (seats.length > 0) {
-                const availabilities = yield repos.eventAvailability.searchAvailability({
-                    eventId: params.event.id,
-                    startDate: moment(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) => {
-                    var _a;
-                    return addOffers2Seat({
-                        project: event.project,
-                        seat: seat,
-                        seatSection: (_a = seat.containedInPlace) === null || _a === void 0 ? void 0 : _a.branchCode,
-                        unavailableOffers: [],
-                        availability: availabilities[index].availability,
-                        priceSpecs: priceSpecs
-                    });
-                });
-            }
-        }
-        return offers;
-    });
-}
-exports.searchEventSeatOffers = searchEventSeatOffers;
+exports.addOffers2Seat = addOffers2Seat;
 /**
  * イベントに対する座席オファーを検索する
  */
@@ -147,12 +59,7 @@ function searchEventSeatOffersWithPaging(params) {
         var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k;
         let offers = [];
         // イベント取得属性最適化(2023-01-23~)
-        // const event = await repos.event.findById<factory.eventType.ScreeningEvent | factory.eventType.Event>({
-        //     id: params.event.id
-        // });
-        const event = yield repos.event.findMinimizedIndividualEventById({
-            id: params.event.id
-        });
+        const event = yield repos.event.findMinimizedIndividualEventById({ id: params.event.id });
         // 座席指定利用可能かどうか
         const eventOffers = 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;
@@ -165,8 +72,6 @@ function searchEventSeatOffersWithPaging(params) {
                     inCodeSet: { identifier: { $eq: factory.categoryCode.CategorySetIdentifier.SeatingType } }
                 }
             });
-            // const roomBranchCode = event.location.branchCode;
-            // const movieTheaterBranchCode = event.superEvent.location.branchCode;
             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(Object.assign(Object.assign({}, params), { project: { id: { $eq: event.project.id } }, containedInPlace: {
@@ -183,7 +88,7 @@ function searchEventSeatOffersWithPaging(params) {
                     }
                 } }));
             if (seats.length > 0) {
-                const availabilities = yield repos.eventAvailability.searchAvailability({
+                const availabilities = yield repos.stockHolder.searchHolders({
                     eventId: params.event.id,
                     startDate: moment(event.startDate)
                         .toDate(),
@@ -196,14 +101,14 @@ function searchEventSeatOffersWithPaging(params) {
                     })
                 });
                 offers = seats.map((seat, index) => {
-                    var _a;
                     return addOffers2Seat({
-                        project: event.project,
-                        seat: seat,
-                        seatSection: (_a = seat.containedInPlace) === null || _a === void 0 ? void 0 : _a.branchCode,
-                        unavailableOffers: [],
-                        availability: availabilities[index].availability,
-                        priceSpecs: priceSpecs
+                        seat,
+                        // unavailableOffers: [],
+                        // availability: availabilities[index].availability,
+                        availability: (typeof availabilities[index] === 'string')
+                            ? factory.itemAvailability.OutOfStock // ホルダーが存在すればOutOfStock
+                            : factory.itemAvailability.InStock,
+                        priceSpecs
                     });
                 });
             }

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

@@ -1,9 +1,9 @@
 import * as factory from '../../factory';
 import { MongoRepository as ActionRepo } from '../../repo/action';
 import { MongoRepository as AssetTransactionRepo } from '../../repo/assetTransaction';
-import { RedisRepository as ScreeningEventAvailabilityRepo } from '../../repo/itemAvailability/screeningEvent';
 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';
 type IObjectSubReservation = factory.assetTransaction.reserve.IObjectSubReservation;
 /**
@@ -12,7 +12,7 @@ type IObjectSubReservation = factory.assetTransaction.reserve.IObjectSubReservat
 declare function cancelPendingReservation(actionAttributesList: factory.action.cancel.reservation.IAttributes[]): (repos: {
     action: ActionRepo;
     assetTransaction: AssetTransactionRepo;
-    eventAvailability: ScreeningEventAvailabilityRepo;
+    stockHolder: StockHolderRepo;
     offerRateLimit: OfferRateLimitRepo;
     reservation: ReservationRepo;
     task: TaskRepo;
@@ -22,7 +22,7 @@ declare function cancelPendingReservation(actionAttributesList: factory.action.c
  */
 declare function cancelReservation(actionAttributesList: factory.action.cancel.reservation.IAttributes[]): (repos: {
     action: ActionRepo;
-    eventAvailability: ScreeningEventAvailabilityRepo;
+    stockHolder: StockHolderRepo;
     offerRateLimit: OfferRateLimitRepo;
     reservation: ReservationRepo;
     task: TaskRepo;

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

@@ -344,9 +344,9 @@ function processUnlockSeat(params) {
                 seatSection: ''
             }
         };
-        let holder = yield repos.eventAvailability.getHolder(lockKey);
+        let holder = yield repos.stockHolder.getHolder(lockKey);
         if (holder === params.expectedHolder) {
-            yield repos.eventAvailability.unlock(lockKey);
+            yield repos.stockHolder.unlock(lockKey);
         }
         // 予約取引がまだ座席を保持していれば座席ロック解除
         const ticketedSeat = reservation.reservedTicket.ticketedSeat;
@@ -359,9 +359,9 @@ function processUnlockSeat(params) {
                     seatSection: ticketedSeat.seatSection
                 }
             };
-            holder = yield repos.eventAvailability.getHolder(lockKey);
+            holder = yield repos.stockHolder.getHolder(lockKey);
             if (holder === params.expectedHolder) {
-                yield repos.eventAvailability.unlock(lockKey);
+                yield repos.stockHolder.unlock(lockKey);
             }
         }
         // subReservationがあれば、そちらも解除(順不同)
@@ -380,9 +380,9 @@ function processUnlockSeat(params) {
                             seatSection: seatSection4sub
                         }
                     };
-                    const holder4sub = yield repos.eventAvailability.getHolder(lockKey4sub);
+                    const holder4sub = yield repos.stockHolder.getHolder(lockKey4sub);
                     if (holder4sub === params.expectedHolder) {
-                        yield repos.eventAvailability.unlock(lockKey4sub);
+                        yield repos.stockHolder.unlock(lockKey4sub);
                     }
                 }
             })));

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

@@ -12,7 +12,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.call = void 0;
 const factory = require("../../factory");
 const event_1 = require("../../repo/event");
-const screeningEvent_1 = require("../../repo/itemAvailability/screeningEvent");
 const offer_1 = require("../../repo/offer");
 const offerCatalog_1 = require("../../repo/offerCatalog");
 const place_1 = require("../../repo/place");
@@ -20,6 +19,7 @@ const product_1 = require("../../repo/product");
 const project_1 = require("../../repo/project");
 const offer_2 = require("../../repo/rateLimit/offer");
 const reservation_1 = require("../../repo/reservation");
+const stockHolder_1 = require("../../repo/stockHolder");
 const task_1 = require("../../repo/task");
 const AggregationService = require("../aggregation");
 /**
@@ -32,7 +32,7 @@ function call(data) {
         }
         yield AggregationService.event.aggregateScreeningEvent(data)({
             event: new event_1.MongoRepository(settings.connection),
-            eventAvailability: new screeningEvent_1.RedisRepository(settings.redisClient),
+            stockHolder: new stockHolder_1.StockHolderRepository(settings.redisClient),
             offer: new offer_1.MongoRepository(settings.connection),
             offerCatalog: new offerCatalog_1.MongoRepository(settings.connection),
             offerRateLimit: new offer_2.RedisRepository(settings.redisClient),

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

@@ -13,9 +13,9 @@ exports.call = void 0;
 const factory = require("../../factory");
 const action_1 = require("../../repo/action");
 const assetTransaction_1 = require("../../repo/assetTransaction");
-const screeningEvent_1 = require("../../repo/itemAvailability/screeningEvent");
 const offer_1 = require("../../repo/rateLimit/offer");
 const reservation_1 = require("../../repo/reservation");
+const stockHolder_1 = require("../../repo/stockHolder");
 const task_1 = require("../../repo/task");
 const ReserveService = require("../reserve");
 /**
@@ -30,12 +30,12 @@ function call(data) {
         const assetTransactionRepo = new assetTransaction_1.MongoRepository(settings.connection);
         const taskRepo = new task_1.MongoRepository(settings.connection);
         const reservationRepo = new reservation_1.MongoRepository(settings.connection);
-        const eventAvailabilityRepo = new screeningEvent_1.RedisRepository(settings.redisClient);
+        const stockHolderRepo = new stockHolder_1.StockHolderRepository(settings.redisClient);
         const offerRateLimitRepo = new offer_1.RedisRepository(settings.redisClient);
         yield ReserveService.cancelPendingReservation(data.actionAttributes)({
             action: actionRepo,
             assetTransaction: assetTransactionRepo,
-            eventAvailability: eventAvailabilityRepo,
+            stockHolder: stockHolderRepo,
             offerRateLimit: offerRateLimitRepo,
             reservation: reservationRepo,
             task: taskRepo

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

@@ -13,9 +13,9 @@ exports.call = void 0;
 const factory = require("../../factory");
 const action_1 = require("../../repo/action");
 const assetTransaction_1 = require("../../repo/assetTransaction");
-const screeningEvent_1 = require("../../repo/itemAvailability/screeningEvent");
 const offer_1 = require("../../repo/rateLimit/offer");
 const reservation_1 = require("../../repo/reservation");
+const stockHolder_1 = require("../../repo/stockHolder");
 const task_1 = require("../../repo/task");
 const ReserveService = require("../reserve");
 /**
@@ -30,7 +30,7 @@ function call(data) {
         const reservationRepo = new reservation_1.MongoRepository(settings.connection);
         const taskRepo = new task_1.MongoRepository(settings.connection);
         const transactionRepo = new assetTransaction_1.MongoRepository(settings.connection);
-        const eventAvailabilityRepo = new screeningEvent_1.RedisRepository(settings.redisClient);
+        const stockHolderRepo = new stockHolder_1.StockHolderRepository(settings.redisClient);
         const offerRateLimitRepo = new offer_1.RedisRepository(settings.redisClient);
         yield ReserveService.cancelReservation(data.actionAttributes)({
             action: actionRepo,
@@ -38,7 +38,7 @@ function call(data) {
             task: taskRepo,
             assetTransaction: transactionRepo,
             offerRateLimit: offerRateLimitRepo,
-            eventAvailability: eventAvailabilityRepo
+            stockHolder: stockHolderRepo
         });
     });
 }

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

@@ -13,9 +13,9 @@ exports.call = void 0;
 const factory = require("../../factory");
 const action_1 = require("../../repo/action");
 const assetTransaction_1 = require("../../repo/assetTransaction");
-const screeningEvent_1 = require("../../repo/itemAvailability/screeningEvent");
 const offer_1 = require("../../repo/rateLimit/offer");
 const reservation_1 = require("../../repo/reservation");
+const stockHolder_1 = require("../../repo/stockHolder");
 const task_1 = require("../../repo/task");
 const EventOfferService = require("../offer/event");
 /**
@@ -28,14 +28,14 @@ function call(data) {
         }
         const actionRepo = new action_1.MongoRepository(settings.connection);
         const assetTransactionRepo = new assetTransaction_1.MongoRepository(settings.connection);
-        const eventAvailabilityRepo = new screeningEvent_1.RedisRepository(settings.redisClient);
+        const stockHolderRepo = new stockHolder_1.StockHolderRepository(settings.redisClient);
         const offerRateLimitRepo = new offer_1.RedisRepository(settings.redisClient);
         const reservationRepo = new reservation_1.MongoRepository(settings.connection);
         const taskRepo = new task_1.MongoRepository(settings.connection);
         yield EventOfferService.voidTransaction(data)({
             action: actionRepo,
             assetTransaction: assetTransactionRepo,
-            eventAvailability: eventAvailabilityRepo,
+            stockHolder: stockHolderRepo,
             offerRateLimit: offerRateLimitRepo,
             reservation: reservationRepo,
             task: taskRepo

package/lib/chevre/settings.d.ts

@@ -30,6 +30,7 @@ export declare const DEFAULT_PAYMENT_METHOD_TYPE_FOR_CREDIT_CARD: string;
 export declare const USE_ASSET_TRANSACTION_SYNC_PROCESSING: boolean;
 export declare const USE_PAY_ASSET_TRANSACTION_SYNC_PROCESSING: boolean;
 export declare const USE_NEW_EVENT_AVAILABILITY_KEY_FROM: moment.Moment;
+export declare const USE_NEW_CONFIRMATION_NUMBER_KEY_FROM: moment.Moment;
 /**
  * グローバル設定
  */

package/lib/chevre/settings.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.settings = exports.USE_NEW_EVENT_AVAILABILITY_KEY_FROM = exports.USE_PAY_ASSET_TRANSACTION_SYNC_PROCESSING = exports.USE_ASSET_TRANSACTION_SYNC_PROCESSING = exports.DEFAULT_PAYMENT_METHOD_TYPE_FOR_CREDIT_CARD = exports.DEFAULT_SENDER_EMAIL = exports.TRANSACTION_CANCELED_STORAGE_PERIOD_IN_DAYS = exports.TRANSACTION_CONFIRMED_STORAGE_PERIOD_IN_DAYS = exports.ASSET_TRANSACTION_STORAGE_PERIOD_IN_DAYS = exports.ABORTED_TASKS_WITHOUT_REPORT = void 0;
+exports.settings = exports.USE_NEW_CONFIRMATION_NUMBER_KEY_FROM = exports.USE_NEW_EVENT_AVAILABILITY_KEY_FROM = exports.USE_PAY_ASSET_TRANSACTION_SYNC_PROCESSING = exports.USE_ASSET_TRANSACTION_SYNC_PROCESSING = exports.DEFAULT_PAYMENT_METHOD_TYPE_FOR_CREDIT_CARD = exports.DEFAULT_SENDER_EMAIL = exports.TRANSACTION_CANCELED_STORAGE_PERIOD_IN_DAYS = exports.TRANSACTION_CONFIRMED_STORAGE_PERIOD_IN_DAYS = exports.ASSET_TRANSACTION_STORAGE_PERIOD_IN_DAYS = exports.ABORTED_TASKS_WITHOUT_REPORT = void 0;
 const moment = require("moment");
 const factory = require("./factory");
 const transactionWebhookUrls = (typeof process.env.INFORM_TRANSACTION_URL === 'string')
@@ -48,7 +48,10 @@ exports.USE_ASSET_TRANSACTION_SYNC_PROCESSING = process.env.USE_ASSET_TRANSACTIO
 exports.USE_PAY_ASSET_TRANSACTION_SYNC_PROCESSING = process.env.USE_PAY_ASSET_TRANSACTION_SYNC_PROCESSING === '1';
 exports.USE_NEW_EVENT_AVAILABILITY_KEY_FROM = (typeof process.env.USE_NEW_EVENT_AVAILABILITY_KEY_FROM === 'string')
     ? moment(process.env.USE_NEW_EVENT_AVAILABILITY_KEY_FROM)
-    : moment('2023-07-23T15:00:00Z');
+    : moment('2023-08-31T15:00:00Z');
+exports.USE_NEW_CONFIRMATION_NUMBER_KEY_FROM = (typeof process.env.USE_NEW_CONFIRMATION_NUMBER_KEY_FROM === 'string')
+    ? moment(process.env.USE_NEW_CONFIRMATION_NUMBER_KEY_FROM)
+    : moment('2023-04-30T15:00:00Z');
 /**
  * グローバル設定
  */