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

package/example/src/chevre/aggregateEventReservation.ts

@@ -22,7 +22,7 @@ async function main() {
         id: String(process.env.EVENT_ID)
     })({
         event: new chevre.repository.Event(mongoose.connection),
-        eventAvailability: new chevre.repository.itemAvailability.ScreeningEvent(client),
+        stockHolder: new chevre.repository.StockHolder(client),
         offer: new chevre.repository.Offer(mongoose.connection),
         offerCatalog: new chevre.repository.OfferCatalog(mongoose.connection),
         offerRateLimit: new chevre.repository.rateLimit.Offer(client),

package/example/src/chevre/processReserve.ts

@@ -30,7 +30,7 @@ async function main() {
     const priceSpecRepo = new chevre.repository.PriceSpecification(mongoose.connection);
     const reservationRepo = new chevre.repository.Reservation(mongoose.connection);
     const eventRepo = new chevre.repository.Event(mongoose.connection);
-    const itemAvailabilityRepo = new chevre.repository.itemAvailability.ScreeningEvent(client);
+    const itemAvailabilityRepo = new chevre.repository.StockHolder(client);
     const offerRateLimitRepo = new chevre.repository.rateLimit.Offer(client);
 
     const identifier = `CIN${(new Date()).valueOf()}`;
@@ -70,7 +70,7 @@ async function main() {
         validateEventOfferPeriod: false,
         validateAppliesToMovieTicket: true
     })({
-        eventAvailability: itemAvailabilityRepo,
+        stockHolder: itemAvailabilityRepo,
         event: eventRepo,
         offer: offerRepo,
         offerCatalog: offerCatalogRepo,

package/example/src/chevre/searchEventSeats.ts

@@ -0,0 +1,42 @@
+// tslint:disable:no-console
+import * as redis from 'redis';
+
+import { chevre } from '../../../lib/index';
+
+// const project = { id: String(process.env.PROJECT_ID) };
+
+// tslint:disable-next-line:max-func-body-length
+async function main() {
+    const client = redis.createClient<redis.RedisDefaultModules, Record<string, never>, Record<string, never>>({
+        socket: {
+            port: Number(<string>process.env.REDIS_PORT),
+            host: <string>process.env.REDIS_HOST
+        },
+        password: <string>process.env.REDIS_KEY
+    });
+    await client.connect();
+
+    const itemAvailabilityRepo = new chevre.repository.StockHolder(client);
+
+    const result = await itemAvailabilityRepo.searchHolders({
+        eventId: 'alckc9mlx',
+        startDate: new Date(),
+        offers: [
+            {
+                seatSection: 'Default',
+                seatNumber: 'B-10'
+            },
+            {
+                seatSection: 'xxx',
+                seatNumber: 'xxx'
+            }
+        ]
+    });
+    console.log(result);
+}
+
+main()
+    .then(() => {
+        console.log('success!');
+    })
+    .catch(console.error);

package/lib/chevre/repo/{itemAvailability/screeningEvent.d.ts → stockHolder.d.ts}

@@ -1,5 +1,4 @@
 import { RedisClientType } from 'redis';
-import * as factory from '../../factory';
 export interface IOffer {
     itemOffered?: {
         serviceOutput?: {
@@ -24,10 +23,11 @@ export interface IUnlockKey {
     startDate: Date;
     offer: IOffer;
 }
+export type IGetHolderResult = string | null;
 /**
  * イベントストックホルダーリポジトリ
  */
-export declare class RedisRepository {
+export declare class StockHolderRepository {
     static KEY_PREFIX_NEW: string;
     static KEY_PREFIX: string;
     private readonly redisClient;
@@ -70,13 +70,9 @@ export declare class RedisRepository {
      * 在庫状況を検索する
      * offers.lengthが0だと"ERR wrong number of arguments for 'hmget' command"となるので注意
      */
-    searchAvailability(params: {
+    searchHolders(params: {
         eventId: string;
         startDate: Date;
         offers: IOffer[];
-    }): Promise<{
-        seatSection: string;
-        seatNumber: string;
-        availability: factory.itemAvailability;
-    }[]>;
+    }): Promise<IGetHolderResult[]>;
 }

package/lib/chevre/repo/{itemAvailability/screeningEvent.js → stockHolder.js}

@@ -9,16 +9,16 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     });
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.RedisRepository = void 0;
+exports.StockHolderRepository = void 0;
 const createDebug = require("debug");
 const moment = require("moment");
-const factory = require("../../factory");
-const settings_1 = require("../../settings");
+const factory = require("../factory");
+const settings_1 = require("../settings");
 const debug = createDebug('chevre-domain:repo');
 /**
  * イベントストックホルダーリポジトリ
  */
-class RedisRepository {
+class StockHolderRepository {
     constructor(redisClient) {
         this.redisClient = redisClient;
     }
@@ -36,10 +36,10 @@ class RedisRepository {
             && moment(params.startDate)
                 .isSameOrAfter(settings_1.USE_NEW_EVENT_AVAILABILITY_KEY_FROM);
         if (useNewKey) {
-            return `${RedisRepository.KEY_PREFIX_NEW}:${params.eventId}`;
+            return `${StockHolderRepository.KEY_PREFIX_NEW}:${params.eventId}`;
         }
         else {
-            return `${RedisRepository.KEY_PREFIX}:${params.eventId}`;
+            return `${StockHolderRepository.KEY_PREFIX}:${params.eventId}`;
         }
     }
     /**
@@ -47,7 +47,7 @@ class RedisRepository {
      */
     lockIfNotLimitExceeded(lockKey, maximum) {
         return __awaiter(this, void 0, void 0, function* () {
-            const key = RedisRepository.createKey({ eventId: lockKey.eventId, startDate: lockKey.startDate });
+            const key = StockHolderRepository.createKey({ eventId: lockKey.eventId, startDate: lockKey.startDate });
             yield this.redisClient.watch(key);
             const hashCount = yield this.redisClient.hLen(key);
             // Process result
@@ -64,10 +64,10 @@ class RedisRepository {
      */
     lock(lockKey) {
         return __awaiter(this, void 0, void 0, function* () {
-            const key = RedisRepository.createKey({ eventId: lockKey.eventId, startDate: lockKey.startDate });
+            const key = StockHolderRepository.createKey({ eventId: lockKey.eventId, startDate: lockKey.startDate });
             const value = lockKey.holder;
             const multi = this.redisClient.multi();
-            const fields = lockKey.offers.map((offer) => RedisRepository.offer2field(offer));
+            const fields = lockKey.offers.map((offer) => StockHolderRepository.offer2field(offer));
             fields.forEach((field) => {
                 multi.hSetNX(key, field, value);
             });
@@ -103,8 +103,8 @@ class RedisRepository {
      */
     unlock(params) {
         return __awaiter(this, void 0, void 0, function* () {
-            const key = RedisRepository.createKey({ eventId: params.eventId, startDate: params.startDate });
-            const field = RedisRepository.offer2field(params.offer);
+            const key = StockHolderRepository.createKey({ eventId: params.eventId, startDate: params.startDate });
+            const field = StockHolderRepository.offer2field(params.offer);
             yield this.redisClient.multi()
                 .hDel(key, field)
                 .exec();
@@ -115,7 +115,7 @@ class RedisRepository {
      */
     findUnavailableOffersByEventId(params) {
         return __awaiter(this, void 0, void 0, function* () {
-            const key = RedisRepository.createKey({ eventId: params.eventId, startDate: params.startDate });
+            const key = StockHolderRepository.createKey({ eventId: params.eventId, startDate: params.startDate });
             const reply = yield this.redisClient.hGetAll(key);
             let offers = [];
             if (reply !== null) {
@@ -134,7 +134,7 @@ class RedisRepository {
      */
     countUnavailableOffers(params) {
         return __awaiter(this, void 0, void 0, function* () {
-            const key = RedisRepository.createKey({ eventId: params.event.id, startDate: params.event.startDate });
+            const key = StockHolderRepository.createKey({ eventId: params.event.id, startDate: params.event.startDate });
             const reply = yield this.redisClient.hLen(key);
             let fieldCount = 0;
             if (typeof reply === 'number') {
@@ -148,8 +148,8 @@ class RedisRepository {
      */
     getHolder(params) {
         return __awaiter(this, void 0, void 0, function* () {
-            const key = RedisRepository.createKey({ eventId: params.eventId, startDate: params.startDate });
-            const field = RedisRepository.offer2field(params.offer);
+            const key = StockHolderRepository.createKey({ eventId: params.eventId, startDate: params.startDate });
+            const field = StockHolderRepository.offer2field(params.offer);
             return this.redisClient.hGet(key, field);
         });
     }
@@ -157,25 +157,50 @@ class RedisRepository {
      * 在庫状況を検索する
      * offers.lengthが0だと"ERR wrong number of arguments for 'hmget' command"となるので注意
      */
-    searchAvailability(params) {
+    // public async searchAvailability(params: {
+    //     eventId: string;
+    //     startDate: Date;
+    //     offers: IOffer[];
+    // }): Promise<{
+    //     seatSection: string;
+    //     seatNumber: string;
+    //     availability: factory.itemAvailability;
+    // }[]> {
+    //     const key = RedisRepository.createKey({ eventId: params.eventId, startDate: params.startDate });
+    //     const fields = params.offers.map((o) => {
+    //         return RedisRepository.offer2field(o);
+    //     });
+    //     // Array reply: list of values associated with the given fields, in the same order as they are requested.
+    //     const result = await this.redisClient.hmGet(key, fields);
+    //     if (!Array.isArray(result)) {
+    //         throw new factory.errors.ServiceUnavailable(`searchAvailability got non-array: ${typeof result}`);
+    //     }
+    //     return params.offers.map((o, index) => {
+    //         const value4offer = result[index];
+    //         return {
+    //             ...o,
+    //             availability: (typeof value4offer === 'string')
+    //                 ? factory.itemAvailability.OutOfStock // ホルダーが存在すればOutOfStock
+    //                 : factory.itemAvailability.InStock
+    //         };
+    //     });
+    // }
+    searchHolders(params) {
         return __awaiter(this, void 0, void 0, function* () {
-            const key = RedisRepository.createKey({ eventId: params.eventId, startDate: params.startDate });
+            const key = StockHolderRepository.createKey({ eventId: params.eventId, startDate: params.startDate });
             const fields = params.offers.map((o) => {
-                return RedisRepository.offer2field(o);
+                return StockHolderRepository.offer2field(o);
             });
+            // Array reply: list of values associated with the given fields, in the same order as they are requested.
             const result = yield this.redisClient.hmGet(key, fields);
             if (!Array.isArray(result)) {
                 throw new factory.errors.ServiceUnavailable(`searchAvailability got non-array: ${typeof result}`);
             }
-            return params.offers.map((o, index) => {
-                const value4offer = result[index];
-                return Object.assign(Object.assign({}, o), { availability: (typeof value4offer === 'string')
-                        ? factory.itemAvailability.OutOfStock
-                        : factory.itemAvailability.InStock });
-            });
+            // そのまま返却(2023-04-17~)
+            return result;
         });
     }
 }
-RedisRepository.KEY_PREFIX_NEW = 'stockHolder';
-RedisRepository.KEY_PREFIX = 'chevre:itemAvailability:screeningEvent';
-exports.RedisRepository = RedisRepository;
+StockHolderRepository.KEY_PREFIX_NEW = 'stockHolder';
+StockHolderRepository.KEY_PREFIX = 'chevre:itemAvailability:screeningEvent';
+exports.StockHolderRepository = StockHolderRepository;

package/lib/chevre/repository.d.ts

@@ -16,7 +16,6 @@ import { MongoRepository as CreativeWorkRepo } from './repo/creativeWork';
 import { MongoRepository as CustomerRepo } from './repo/customer';
 import { MongoRepository as EmailMessageRepo } from './repo/emailMessage';
 import { MongoRepository as EventRepo } from './repo/event';
-import { RedisRepository as ScreeningEventItemAvailabilityRepo } from './repo/itemAvailability/screeningEvent';
 import { MongoRepository as MemberRepo } from './repo/member';
 import { MongoRepository as MerchantReturnPolicyRepo } from './repo/merchantReturnPolicy';
 import { MongoRepository as OfferRepo } from './repo/offer';
@@ -34,6 +33,7 @@ import { MongoRepository as RoleRepo } from './repo/role';
 import { MongoRepository as SellerRepo } from './repo/seller';
 import { MongoRepository as ServiceOutputRepo } from './repo/serviceOutput';
 import { RedisRepository as ServiceOutputIdentifierRepo } from './repo/serviceOutputIdentifier';
+import { StockHolderRepository as StockHolderRepo } from './repo/stockHolder';
 import { MongoRepository as TaskRepo } from './repo/task';
 import { MongoRepository as TelemetryRepo } from './repo/telemetry';
 import { MongoRepository as TransactionRepo } from './repo/transaction';
@@ -183,6 +183,8 @@ export declare class ServiceOutput extends ServiceOutputRepo {
 }
 export declare class ServiceOutputIdentifier extends ServiceOutputIdentifierRepo {
 }
+export declare class StockHolder extends StockHolderRepo {
+}
 export declare class Task extends TaskRepo {
 }
 export declare class Telemetry extends TelemetryRepo {
@@ -193,10 +195,6 @@ export declare class TransactionNumber extends TransactionNumberRepo {
 }
 export declare class Trip extends TripRepo {
 }
-export declare namespace itemAvailability {
-    class ScreeningEvent extends ScreeningEventItemAvailabilityRepo {
-    }
-}
 export declare namespace rateLimit {
     class Offer extends OfferRateLimitRepo {
     }

package/lib/chevre/repository.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.rateLimit = exports.itemAvailability = exports.Trip = exports.TransactionNumber = exports.Transaction = exports.Telemetry = exports.Task = exports.ServiceOutputIdentifier = exports.ServiceOutput = exports.Seller = exports.Role = exports.Reservation = exports.Project = exports.Product = exports.PriceSpecification = exports.Place = exports.Permit = exports.Person = exports.paymentMethod = exports.OwnershipInfo = exports.OrderNumber = exports.Order = exports.OfferCatalog = exports.Offer = exports.MerchantReturnPolicy = exports.Member = exports.Event = exports.EmailMessage = exports.Customer = exports.CreativeWork = exports.ConfirmationNumber = exports.Comment = exports.Code = exports.CategoryCode = exports.AssetTransaction = exports.action = exports.Aggregation = exports.AdditionalProperty = exports.Action = exports.AccountTransaction = exports.AccountTitle = exports.AccountingReport = exports.Account = void 0;
+exports.rateLimit = exports.Trip = exports.TransactionNumber = exports.Transaction = exports.Telemetry = exports.Task = exports.StockHolder = exports.ServiceOutputIdentifier = exports.ServiceOutput = exports.Seller = exports.Role = exports.Reservation = exports.Project = exports.Product = exports.PriceSpecification = exports.Place = exports.Permit = exports.Person = exports.paymentMethod = exports.OwnershipInfo = exports.OrderNumber = exports.Order = exports.OfferCatalog = exports.Offer = exports.MerchantReturnPolicy = exports.Member = exports.Event = exports.EmailMessage = exports.Customer = exports.CreativeWork = exports.ConfirmationNumber = exports.Comment = exports.Code = exports.CategoryCode = exports.AssetTransaction = exports.action = exports.Aggregation = exports.AdditionalProperty = exports.Action = exports.AccountTransaction = exports.AccountTitle = exports.AccountingReport = exports.Account = void 0;
 // tslint:disable:max-classes-per-file completed-docs
 /**
  * リポジトリ
@@ -20,7 +20,6 @@ const creativeWork_1 = require("./repo/creativeWork");
 const customer_1 = require("./repo/customer");
 const emailMessage_1 = require("./repo/emailMessage");
 const event_1 = require("./repo/event");
-const screeningEvent_1 = require("./repo/itemAvailability/screeningEvent");
 const member_1 = require("./repo/member");
 const merchantReturnPolicy_1 = require("./repo/merchantReturnPolicy");
 const offer_1 = require("./repo/offer");
@@ -38,6 +37,7 @@ const role_1 = require("./repo/role");
 const seller_1 = require("./repo/seller");
 const serviceOutput_1 = require("./repo/serviceOutput");
 const serviceOutputIdentifier_1 = require("./repo/serviceOutputIdentifier");
+const stockHolder_1 = require("./repo/stockHolder");
 const task_1 = require("./repo/task");
 const telemetry_1 = require("./repo/telemetry");
 const transaction_1 = require("./repo/transaction");
@@ -225,6 +225,9 @@ exports.ServiceOutput = ServiceOutput;
 class ServiceOutputIdentifier extends serviceOutputIdentifier_1.RedisRepository {
 }
 exports.ServiceOutputIdentifier = ServiceOutputIdentifier;
+class StockHolder extends stockHolder_1.StockHolderRepository {
+}
+exports.StockHolder = StockHolder;
 class Task extends task_1.MongoRepository {
 }
 exports.Task = Task;
@@ -240,12 +243,6 @@ exports.TransactionNumber = TransactionNumber;
 class Trip extends trip_1.MongoRepository {
 }
 exports.Trip = Trip;
-var itemAvailability;
-(function (itemAvailability) {
-    class ScreeningEvent extends screeningEvent_1.RedisRepository {
-    }
-    itemAvailability.ScreeningEvent = ScreeningEvent;
-})(itemAvailability = exports.itemAvailability || (exports.itemAvailability = {}));
 var rateLimit;
 (function (rateLimit) {
     // tslint:disable-next-line:no-shadowed-variable

package/lib/chevre/service/aggregation/event/aggregateScreeningEvent.d.ts

@@ -1,5 +1,4 @@
 import { MongoRepository as EventRepo } from '../../../repo/event';
-import { RedisRepository as EventAvailabilityRepo } 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';
@@ -7,11 +6,12 @@ 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 * as factory from '../../../factory';
 export type IAggregateScreeningEventOperation<T> = (repos: {
     event: EventRepo;
-    eventAvailability: EventAvailabilityRepo;
+    stockHolder: StockHolderRepo;
     offer: OfferRepo;
     offerCatalog: OfferCatalogRepo;
     offerRateLimit: OfferRateLimitRepo;

package/lib/chevre/service/aggregation/event/aggregateScreeningEvent.js

@@ -387,13 +387,14 @@ function filterByEligibleSeatingType(params) {
         const maximumAttendeeCapacity = eligibleSeatOffers.length;
         let remainingAttendeeCapacity;
         if (maximumAttendeeCapacity > 0) {
-            const availabilities = yield repos.eventAvailability.searchAvailability({
+            const availabilities = yield repos.stockHolder.searchHolders({
                 eventId: params.event.id,
                 startDate: moment(params.event.startDate)
                     .toDate(),
                 offers: eligibleSeatOffers
             });
-            remainingAttendeeCapacity = availabilities.filter((a) => a.availability === factory.itemAvailability.InStock).length;
+            // remainingAttendeeCapacity = availabilities.filter((a) => a.availability === factory.itemAvailability.InStock).length;
+            remainingAttendeeCapacity = availabilities.filter((holder) => typeof holder !== 'string').length;
         }
         else {
             remainingAttendeeCapacity = 0;
@@ -438,7 +439,7 @@ function aggregateReservationByEvent(params) {
         // remainingAttendeeCapacityを決定
         if (typeof maximumAttendeeCapacity === 'number') {
             // 残席数を座席ロック数から計算
-            const unavailableOfferCount = yield repos.eventAvailability.countUnavailableOffers({
+            const unavailableOfferCount = yield repos.stockHolder.countUnavailableOffers({
                 event: {
                     id: params.event.id,
                     startDate: moment(params.event.startDate)

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;

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/package.json

@@ -117,5 +117,5 @@
     "postversion": "git push origin --tags",
     "prepublishOnly": "npm run clean && npm run build && npm test && npm run doc"
   },
-  "version": "21.2.0-alpha.1"
+  "version": "21.2.0-alpha.3"
 }