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

package/lib/chevre/repo/itemAvailability/screeningEvent.d.ts

@@ -75,8 +75,6 @@ export declare class RedisRepository {
         startDate: Date;
         offers: IOffer[];
     }): Promise<{
-        seatSection: string;
-        seatNumber: string;
         availability: factory.itemAvailability;
     }[]>;
 }

package/lib/chevre/repo/itemAvailability/screeningEvent.js

@@ -163,15 +163,27 @@ class RedisRepository {
             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 = 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 });
+            // return params.offers.map((o, index) => {
+            //     const value4offer = result[index];
+            //     return {
+            //         ...o,
+            //         availability: (typeof value4offer === 'string')
+            //             ? factory.itemAvailability.OutOfStock // ホルダーが存在すればOutOfStock
+            //             : factory.itemAvailability.InStock
+            //     };
+            // });
+            // availabilityのみ返却(2023-04-17~)
+            return result.map((holder) => {
+                return {
+                    availability: (typeof holder === 'string')
+                        ? factory.itemAvailability.OutOfStock // ホルダーが存在すればOutOfStock
+                        : factory.itemAvailability.InStock
+                };
             });
         });
     }

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,77 @@ 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.eventAvailability.searchAvailability({
+                    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,
+                        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

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

@@ -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;
     };

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: {
@@ -196,14 +101,11 @@ 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: [],
+                        seat,
+                        // unavailableOffers: [],
                         availability: availabilities[index].availability,
-                        priceSpecs: priceSpecs
+                        priceSpecs
                     });
                 });
             }

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.2"
 }