@chevre/domain 22.1.0-alpha.5 → 22.1.0-alpha.7

package/example/src/chevre/place/aggregateSeatingTypes.ts

@@ -0,0 +1,29 @@
+// tslint:disable:no-console
+import * as mongoose from 'mongoose';
+import { chevre } from '../../../../lib/index';
+
+const project = { typeOf: chevre.factory.organizationType.Project, id: String(process.env.PROJECT_ID) };
+
+async function main() {
+    await mongoose.connect(<string>process.env.MONGOLAB_URI, { autoIndex: false });
+
+    const seatRepo = await chevre.repository.place.Seat.createInstance(mongoose.connection);
+
+    const seatingTypes = await seatRepo.aggregateSeatingTypes({
+        project: { id: { $eq: project.id } },
+        branchCode: { $in: ['A-2', 'A-1'] },
+        containedInPlace: {
+            branchCode: { $in: ['Default'] },
+            containedInPlace: {
+                branchCode: { $eq: '100' },
+                containedInPlace: { branchCode: { $eq: '118' } }
+            }
+        }
+    });
+    console.log(seatingTypes);
+    console.log(seatingTypes.length);
+}
+
+main()
+    .then(console.log)
+    .catch(console.error);

package/lib/chevre/repo/place/seat.d.ts

@@ -41,6 +41,40 @@ export declare class SeatRepo {
         };
     }, $unset: any): Promise<IUpdateSeatResult>;
     searchSeats(params: factory.place.seat.ISearchConditions): Promise<factory.place.seat.IPlace[]>;
+    /**
+     * 座席区分集計検索
+     */
+    aggregateSeatingTypes(params: {
+        project: {
+            id: {
+                $eq: string;
+            };
+        };
+        /**
+         * 座席コード
+         */
+        branchCode?: {
+            $in?: string[];
+        };
+        containedInPlace?: {
+            /**
+             * セクションコード
+             */
+            branchCode?: {
+                $in?: string[];
+            };
+            containedInPlace?: {
+                branchCode?: {
+                    $eq?: string;
+                };
+                containedInPlace?: {
+                    branchCode?: {
+                        $eq?: string;
+                    };
+                };
+            };
+        };
+    }): Promise<string[]>;
     deleteSeat(seat: {
         project: {
             id: string;

package/lib/chevre/repo/place/seat.js

@@ -340,6 +340,64 @@ class SeatRepo {
                 .exec();
         });
     }
+    /**
+     * 座席区分集計検索
+     */
+    aggregateSeatingTypes(params) {
+        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m;
+        return __awaiter(this, void 0, void 0, function* () {
+            const matchStages = [{ $match: { typeOf: { $eq: factory.placeType.ScreeningRoom } } }];
+            const projectIdEq = (_b = (_a = params.project) === null || _a === void 0 ? void 0 : _a.id) === null || _b === void 0 ? void 0 : _b.$eq;
+            if (typeof projectIdEq === 'string') {
+                matchStages.push({ $match: { 'project.id': { $eq: projectIdEq } } });
+            }
+            const branchCodeEq = (_e = (_d = (_c = params.containedInPlace) === null || _c === void 0 ? void 0 : _c.containedInPlace) === null || _d === void 0 ? void 0 : _d.branchCode) === null || _e === void 0 ? void 0 : _e.$eq;
+            if (typeof branchCodeEq === 'string') {
+                matchStages.push({ $match: { branchCode: { $eq: branchCodeEq } } });
+            }
+            const containedInPlaceBranchCodeEq = (_j = (_h = (_g = (_f = params.containedInPlace) === null || _f === void 0 ? void 0 : _f.containedInPlace) === null || _g === void 0 ? void 0 : _g.containedInPlace) === null || _h === void 0 ? void 0 : _h.branchCode) === null || _j === void 0 ? void 0 : _j.$eq;
+            if (typeof containedInPlaceBranchCodeEq === 'string') {
+                matchStages.push({
+                    $match: { 'containedInPlace.branchCode': { $exists: true, $eq: containedInPlaceBranchCodeEq } }
+                });
+            }
+            const seatBranchCodeIn = (_k = params.branchCode) === null || _k === void 0 ? void 0 : _k.$in;
+            if (Array.isArray(seatBranchCodeIn)) {
+                matchStages.push({
+                    $match: { 'containsPlace.containsPlace.branchCode': { $exists: true, $in: seatBranchCodeIn } }
+                });
+            }
+            const sectionBranchCodeIn = (_m = (_l = params.containedInPlace) === null || _l === void 0 ? void 0 : _l.branchCode) === null || _m === void 0 ? void 0 : _m.$in;
+            if (Array.isArray(sectionBranchCodeIn)) {
+                matchStages.push({
+                    $match: { 'containsPlace.branchCode': { $exists: true, $in: sectionBranchCodeIn } }
+                });
+            }
+            const aggregate = this.placeModel.aggregate([
+                { $unwind: { path: '$containsPlace', preserveNullAndEmptyArrays: false } },
+                { $unwind: { path: '$containsPlace.containsPlace', preserveNullAndEmptyArrays: false } },
+                { $unwind: { path: '$containsPlace.containsPlace.seatingType', preserveNullAndEmptyArrays: false } },
+                ...matchStages,
+                {
+                    $group: {
+                        _id: '$containsPlace.containsPlace.seatingType'
+                    }
+                },
+                {
+                    $group: {
+                        // tslint:disable-next-line:no-null-keyword
+                        _id: null,
+                        seatingTypes: { $push: '$_id' }
+                    }
+                }
+            ]);
+            const result = (yield aggregate
+                .option({ maxTimeMS: settings_1.MONGO_MAX_TIME_MS })
+                .exec()).shift();
+            // .then((result) => result.map(({ _id }) => _id));
+            return (result !== undefined) ? result.seatingTypes : [];
+        });
+    }
     deleteSeat(seat) {
         var _a;
         return __awaiter(this, void 0, void 0, function* () {

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

@@ -10,6 +10,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.start = void 0;
+const createDebug = require("debug");
 const moment = require("moment");
 const factory = require("../../../factory");
 const pecorinoapi = require("../../../pecorinoapi");
@@ -20,6 +21,7 @@ const createSubReservations_1 = require("./start/createSubReservations");
 const createPointAward_1 = require("./start/factory/createPointAward");
 const createStartParams_1 = require("./start/factory/createStartParams");
 const validateStartRequest_1 = require("./validateStartRequest");
+const debug = createDebug('chevre-domain:service:assetTransaction');
 const ONE_MONTH_IN_DAYS = 31;
 /**
  * 取引開始
@@ -198,18 +200,17 @@ function addReservations(params) {
             transaction: {
                 id: params.transaction.id,
                 transactionNumber: params.transaction.transactionNumber
-                // object: { useHoldStockByTransactionNumber: transaction.object.useHoldStockByTransactionNumber === true }
             },
             stockHoldUntilDaysAfterEventEnd: params.stockHoldUntilDaysAfterEventEnd
         })(repos);
         // ストックホルダー処理(stockHolderで残席数を集計しているので必要)
         yield onReservationsCreated({ event, transaction: { transactionNumber: reservationNumber } })(repos);
-        // return { objectSubReservations };
     });
 }
 /**
  * イベントに対する座席オファーを座席コードとセクションコード指定で検索する
  */
+// tslint:disable-next-line:max-func-body-length
 function searchEventSeatOffers(params) {
     return (repos) => __awaiter(this, void 0, void 0, function* () {
         var _a, _b, _c, _d, _e, _f;
@@ -218,14 +219,6 @@ function searchEventSeatOffers(params) {
         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.seat.searchSeats({
@@ -259,6 +252,33 @@ function searchEventSeatOffers(params) {
                         };
                     })
                 });
+                // ルームに含まれる座席区分のみ加算料金を検索(2024-08-06~)
+                const uniqueSeatingTypes = yield repos.seat.aggregateSeatingTypes({
+                    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 } }
+                        }
+                    }
+                });
+                debug('searchEventSeatOffers: uniqueSeatingTypes:', uniqueSeatingTypes, params.event.project.id, params.branchCode.$in, params.containedInPlace.branchCode.$in, roomBranchCode, movieTheaterBranchCode);
+                // 座席タイプ価格仕様を検索
+                let priceSpecs = [];
+                if (Array.isArray(uniqueSeatingTypes) && uniqueSeatingTypes.length > 0) {
+                    priceSpecs = yield repos.priceSpecification.search({
+                        project: { id: { $eq: params.event.project.id } },
+                        typeOf: factory.priceSpecificationType.CategoryCodeChargeSpecification,
+                        appliesToCategoryCode: {
+                            inCodeSet: { identifier: { $eq: factory.categoryCode.CategorySetIdentifier.SeatingType } },
+                            codeValue: { $in: uniqueSeatingTypes } // ルームに含まれる座席区分のみ加算料金を検索(2024-08-06~)
+                        }
+                    });
+                }
                 offers = seats.map((seat, index) => {
                     return OfferService.addOffers2Seat({
                         seat,

package/lib/chevre/service/offer.js

@@ -10,6 +10,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.searchEventSeatOffersWithPaging = exports.addOffers2Seat = exports.product = exports.moneyTransfer = exports.eventServiceByCOA = exports.event = void 0;
+const createDebug = require("debug");
 const moment = require("moment");
 const factory = require("../factory");
 const EventOfferService = require("./offer/event");
@@ -20,6 +21,7 @@ const MoneyTransferOfferService = require("./offer/moneyTransfer");
 exports.moneyTransfer = MoneyTransferOfferService;
 const ProductOfferService = require("./offer/product");
 exports.product = ProductOfferService;
+const debug = createDebug('chevre-domain:service:offer');
 /**
  * 座席にオファー情報を付加する
  */
@@ -58,6 +60,7 @@ exports.addOffers2Seat = addOffers2Seat;
  */
 // tslint:disable-next-line:max-func-body-length
 function searchEventSeatOffersWithPaging(params) {
+    // tslint:disable-next-line:max-func-body-length
     return (repos) => __awaiter(this, void 0, void 0, function* () {
         var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k;
         let offers = [];
@@ -97,28 +100,29 @@ function searchEventSeatOffersWithPaging(params) {
                         };
                     })
                 });
-                // tslint:disable-next-line:no-suspicious-comment
-                // TODO 必要な座席区分のみ検索?
-                // const uniqueSeatingTypes: string[] = [...new Set(seats.reduce<string[]>(
-                //     (a, { seatingType }) => {
-                //         if (Array.isArray(seatingType)) {
-                //             return [...a, ...seatingType];
-                //         } else if (typeof seatingType === 'string') {
-                //             return [...a, seatingType];
-                //         } else {
-                //             return a;
-                //         }
-                //     },
-                //     []
-                // ))];
-                // 座席タイプ価格仕様を検索
-                const priceSpecs = yield repos.priceSpecification.search({
+                // ルームに含まれる座席区分のみ加算料金を検索(2024-08-05~)
+                const uniqueSeatingTypes = yield repos.seat.aggregateSeatingTypes({
                     project: { id: { $eq: event.project.id } },
-                    typeOf: factory.priceSpecificationType.CategoryCodeChargeSpecification,
-                    appliesToCategoryCode: {
-                        inCodeSet: { identifier: { $eq: factory.categoryCode.CategorySetIdentifier.SeatingType } }
+                    containedInPlace: {
+                        containedInPlace: {
+                            branchCode: { $eq: roomBranchCode },
+                            containedInPlace: { branchCode: { $eq: movieTheaterBranchCode } }
+                        }
                     }
                 });
+                debug('searchEventSeatOffersWithPaging: uniqueSeatingTypes:', uniqueSeatingTypes, event.project.id, roomBranchCode, movieTheaterBranchCode);
+                // 座席タイプ価格仕様を検索
+                let priceSpecs = [];
+                if (Array.isArray(uniqueSeatingTypes) && uniqueSeatingTypes.length > 0) {
+                    priceSpecs = yield repos.priceSpecification.search({
+                        project: { id: { $eq: event.project.id } },
+                        typeOf: factory.priceSpecificationType.CategoryCodeChargeSpecification,
+                        appliesToCategoryCode: {
+                            inCodeSet: { identifier: { $eq: factory.categoryCode.CategorySetIdentifier.SeatingType } },
+                            codeValue: { $in: uniqueSeatingTypes } // ルームに含まれる座席区分のみ加算料金を検索(2024-08-05~)
+                        }
+                    });
+                }
                 offers = seats.map((seat, index) => {
                     return addOffers2Seat({
                         seat,

package/package.json

@@ -110,5 +110,5 @@
     "postversion": "git push origin --tags",
     "prepublishOnly": "npm run clean && npm run build && npm test && npm run doc"
   },
-  "version": "22.1.0-alpha.5"
+  "version": "22.1.0-alpha.7"
 }