@chevre/domain 23.1.0-alpha.31 → 23.1.0-alpha.33

package/example/src/chevre/pendingReservation/findEventSeatOffersBySection.ts

@@ -0,0 +1,45 @@
+// tslint:disable:no-console
+import * as mongoose from 'mongoose';
+
+import { chevre } from '../../../../lib/index';
+
+const { PROJECT_ID } = process.env;
+const formatter = new Intl.NumberFormat('ja-JP');
+
+// tslint:disable-next-line:max-func-body-length
+async function main() {
+    let startTime: [number, number] = process.hrtime();
+    let diff: [number, number] = process.hrtime(startTime);
+    await mongoose.connect(<string>process.env.MONGOLAB_URI, { autoIndex: false });
+
+    setInterval(
+        async () => {
+            startTime = process.hrtime();
+            const result = await (await chevre.service.offer.createService()).findEventSeatOffersBySection({
+                limit: 100,
+                page: 10,
+                projectId: String(PROJECT_ID),
+                eventId: '693622f7876e9977c32ae270',
+                /**
+                 * セクションコード
+                 */
+                sectionCode: 'Default'
+            })({
+                event: await chevre.repository.Event.createInstance(mongoose.connection),
+                seat: await chevre.repository.place.Seat.createInstance(mongoose.connection),
+                stockHolder: await chevre.repository.StockHolder.createInstance({ connection: mongoose.connection })
+            });
+            diff = process.hrtime(startTime);
+            // tslint:disable-next-line:no-null-keyword
+            console.dir(result, { depth: null });
+            console.log(result.length, 'results found');
+            console.log('diff:', [diff[0], formatter.format(diff[1])]);
+        },
+        // tslint:disable-next-line:no-magic-numbers
+        1000
+    );
+}
+
+main()
+    .then()
+    .catch(console.error);

package/example/src/chevre/project/unsetProjectSettings.ts

@@ -13,8 +13,8 @@ async function main() {
         {
             _id: {
                 $nin: [
-                    'ttts-development', 'sskts-development',
-                    'ttts-test', 'sskts-test',
+                    'ttts-development',
+                    'ttts-test',
                     'ttts-production', 'sskts-production'
                 ]
             }

package/lib/chevre/repo/pendingReservation.js

@@ -286,34 +286,38 @@ class PendingReservationRepo {
             });
         });
     }
-    // public async searchHolders2(params: {
+    // public async findSubReservationsByEvent(params: {
+    //     limit: number;
+    //     page: number;
     //     project: { id: string };
     //     eventId: string;
-    //     startDate: Date;
-    //     hasTicketedSeat: boolean;
-    //     offers: IOffer[];
-    // }): Promise<IGetHolderResult[]> {
-    //     const { eventId, offers, hasTicketedSeat } = params;
-    //     const reservationIdentifiers = offers.map((offer) => PendingReservationRepo.offer2identifier(offer, hasTicketedSeat));
+    // }): Promise<{
+    //     // reservationNumber: string;
+    //     identifier: string;
+    // }[]> {
+    //     const { limit, page, eventId } = params;
     //     const aggregate = this.pendingReservationModel.aggregate<{
-    //         // reservationNumber: string;
     //         identifier: string;
     //     }>([
-    //         // unwind,matchの順序
-    //         // unwind->matchでは遅い？
-    //         // match->limit->unwind->matchにする
     //         {
-    //             $unwind: {
-    //                 path: '$subReservation'
+    //             $match: {
+    //                 'reservationFor.id': { $eq: eventId },
+    //                 'subReservation.identifier': { $exists: true }
     //             }
     //         },
+    //         // { $sort: { bookingTime: factory.sortType.Descending } },
     //         {
-    //             $match: {
-    //                 'reservationFor.id': { $eq: eventId },
-    //                 'subReservation.identifier': { $exists: true, $in: reservationIdentifiers }
+    //             $unwind: {
+    //                 path: '$subReservation'
     //             }
     //         },
-    //         { $limit: reservationIdentifiers.length },
+    //         { $sort: { 'subReservation.identifier': factory.sortType.Ascending } },
+    //         // {
+    //         //     $match: {
+    //         //         // セクションで絞ってみる
+    //         //         'subReservation.identifier': { $regex: new RegExp('^Default:') }
+    //         //     }
+    //         // },
     //         {
     //             $project: {
     //                 _id: 0,
@@ -322,64 +326,17 @@ class PendingReservationRepo {
     //             }
     //         }
     //     ]);
-    //     const docs = await aggregate
-    //         .option({ maxTimeMS: MONGO_MAX_TIME_MS })
-    //         .exec();
-    //     debug('searchHolders: aggregated.', docs, docs.length, 'docs');
-    //     // reservationNumberを正確に返す必要はなく、存在しているかどうかだけ分かればよい(stringを返せばよい)
-    //     return reservationIdentifiers.map((reservationIdentifier) => {
-    //         const doc = docs.find(({ identifier }) => identifier === reservationIdentifier);
-    //         // tslint:disable-next-line:no-null-keyword
-    //         // return (doc !== undefined) ? doc.reservationNumber : null;
-    //         // tslint:disable-next-line:no-null-keyword
-    //         return (doc !== undefined) ? doc.identifier : null;
-    //     });
-    // }
-    // public async searchHoldersByDistinct(params: {
-    //     project: { id: string };
-    //     eventId: string;
-    //     startDate: Date;
-    //     hasTicketedSeat: boolean;
-    //     offers: IOffer[];
-    // }) {
-    //     const { eventId, offers, hasTicketedSeat } = params;
-    //     const reservationIdentifiers = offers.map((offer) => PendingReservationRepo.offer2identifier(offer, hasTicketedSeat));
-    //     const doc = await this.pendingReservationModel.distinct(
-    //         'subReservation.identifier',
-    //         {
-    //             'reservationFor.id': { $eq: eventId },
-    //             'subReservation.identifier': { $exists: true, $in: reservationIdentifiers }
-    //         }
-    //     )
-    //         .setOptions({ maxTimeMS: MONGO_MAX_TIME_MS })
-    //         .exec();
-    //     debug('searchHolders: distinct.', doc);
-    //     return doc;
-    // }
-    // public async getSize(params: Omit<IUnlockKey, 'holder' | 'offer'>) {
-    //     const { eventId } = params;
-    //     const aggregate = this.aggregateReservationModel.aggregate([
-    //         {
-    //             $match: {
-    //                 'reservationFor.id': { $eq: eventId }
-    //             }
-    //         },
-    //         {
-    //             $project: {
-    //                 typeOf: 1,
-    //                 objectSize: { $bsonSize: '$$ROOT' }
-    //             }
-    //         }
-    //     ]);
+    //     if (typeof limit === 'number' && limit > 0) {
+    //         const pageMustBePositive: number = (typeof page === 'number' && page > 0) ? page : 1;
+    //         aggregate.skip(limit * (pageMustBePositive - 1))
+    //             .limit(limit);
+    //     } else {
+    //         throw new factory.errors.Argument('limit', 'must be number > 0');
+    //     }
     //     return aggregate
     //         .option({ maxTimeMS: MONGO_MAX_TIME_MS })
     //         .exec();
     // }
-    // public getCursor(conditions: FilterQuery<any>, projection: any) {
-    //     return this.aggregateReservationModel.find(conditions, projection)
-    //         .sort({ bookingTime: factory.sortType.Ascending })
-    //         .cursor();
-    // }
     docExists(params) {
         return __awaiter(this, void 0, void 0, function* () {
             const { eventId } = params;

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

@@ -1,5 +1,6 @@
 import type { EventRepo } from '../repo/event';
 import type { SeatRepo } from '../repo/place/seat';
+import type { SectionRepo } from '../repo/place/section';
 import type { StockHolderRepo } from '../repo/stockHolder';
 import * as factory from '../factory';
 import * as EventOfferService from './offer/event';
@@ -25,6 +26,11 @@ type ISeatAsEventOffer = Pick<factory.place.seat.IPlaceWithOffer, 'branchCode' |
     };
     offers?: Pick<factory.place.seat.IOffer, 'availability'>[];
 };
+type ISeatOfferBySection = Pick<factory.place.seat.IOffer, 'availability'> & {
+    itemOffered: {
+        branchCode: string;
+    };
+};
 /**
  * イベントに対する座席オファーを検索する
  */
@@ -43,9 +49,32 @@ export declare function searchEventSeatOffersWithPaging(params: {
         id: string;
     };
     $projection?: factory.place.seat.IProjection;
-    options: {};
+    options: {
+        /**
+         * 自動的にひとつめのセクションに絞るかどうか
+         */
+        useDefaultSection: boolean;
+    };
 }): (repos: {
     event: EventRepo;
     stockHolder: StockHolderRepo;
     seat: SeatRepo;
+    section: SectionRepo;
 }) => Promise<ISeatAsEventOffer[]>;
+/**
+ * セクション指定でイベントに対する座席オファーを検索する
+ */
+export declare function findEventSeatOffersBySection(params: {
+    limit: number;
+    page: number;
+    projectId: string;
+    eventId: string;
+    /**
+     * セクションコード
+     */
+    sectionCode: string;
+}): (repos: {
+    event: EventRepo;
+    stockHolder: StockHolderRepo;
+    seat: SeatRepo;
+}) => Promise<ISeatOfferBySection[]>;

package/lib/chevre/service/offer.js

@@ -12,6 +12,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.product = exports.moneyTransfer = exports.eventServiceByCOA = exports.event = void 0;
 exports.addOffers2Seat = addOffers2Seat;
 exports.searchEventSeatOffersWithPaging = searchEventSeatOffersWithPaging;
+exports.findEventSeatOffersBySection = findEventSeatOffersBySection;
 const moment = require("moment");
 const factory = require("../factory");
 const EventOfferService = require("./offer/event");
@@ -56,32 +57,49 @@ function addOffers2Seat(params) {
 /**
  * イベントに対する座席オファーを検索する
  */
-// 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;
-        // const { excludePriceSpecification } = params.options;
+        const { useDefaultSection } = params.options;
         let offers = [];
         // optimize(2024-07-18~)
-        const event = yield repos.event.projectEventFieldsById({ id: params.event.id }, ['project', 'startDate', 'offers.itemOffered']);
+        const event = yield repos.event.projectEventFieldsById({ id: params.event.id }, ['project', 'startDate', 'offers.itemOffered', 'organizer']);
         // 座席指定利用可能かどうか
         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 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);
+            let defaultSectionCode;
+            if (useDefaultSection) {
+                const defaultSection = (yield repos.section.findSectionsByRoom({
+                    limit: 1,
+                    page: 1,
+                    projectId: event.project.id,
+                    sellerId: event.organizer.id,
+                    movieTheaterCode: movieTheaterBranchCode,
+                    roomCode: roomBranchCode
+                })).shift();
+                if (defaultSection === undefined) {
+                    return [];
+                }
+                defaultSectionCode = defaultSection.branchCode;
+                // tslint:disable-next-line:no-console
+                console.log('searchEventSeatOffersWithPaging:defaultSectionCode:', defaultSectionCode);
+            }
             const seats = yield repos.seat.projectSeatsByScreeningRoom(Object.assign(Object.assign({}, params), { project: { id: { $eq: event.project.id } }, screeningRoom: {
                     branchCode: { $eq: roomBranchCode },
                     containedInPlace: {
                         branchCode: { $eq: movieTheaterBranchCode }
                     }
                 }, containedInPlace: {
-                    branchCode: {
-                        $eq: (typeof ((_h = (_g = params.containedInPlace) === null || _g === void 0 ? void 0 : _g.branchCode) === null || _h === void 0 ? void 0 : _h.$eq) === 'string')
-                            ? (_k = (_j = params.containedInPlace) === null || _j === void 0 ? void 0 : _j.branchCode) === null || _k === void 0 ? void 0 : _k.$eq
-                            : undefined
-                    }
+                    branchCode: Object.assign({}, (typeof defaultSectionCode === 'string')
+                        ? { $eq: defaultSectionCode }
+                        : {
+                            $eq: (typeof ((_h = (_g = params.containedInPlace) === null || _g === void 0 ? void 0 : _g.branchCode) === null || _h === void 0 ? void 0 : _h.$eq) === 'string')
+                                ? (_k = (_j = params.containedInPlace) === null || _j === void 0 ? void 0 : _j.branchCode) === null || _k === void 0 ? void 0 : _k.$eq
+                                : undefined
+                        })
                 }, $projection: Object.assign({}, params.$projection) }));
             if (seats.length > 0) {
                 const availabilities = yield repos.stockHolder.searchHolders({
@@ -98,31 +116,6 @@ function searchEventSeatOffersWithPaging(params) {
                         };
                     })
                 });
-                // ルームに含まれる座席区分のみ加算料金を検索(2024-08-05~)
-                // const uniqueSeatingTypes = await repos.seat.aggregateSeatingTypes({
-                //     project: { id: { $eq: event.project.id } },
-                //     containedInPlace: {
-                //         containedInPlace: {
-                //             branchCode: { $eq: roomBranchCode },
-                //             containedInPlace: { branchCode: { $eq: movieTheaterBranchCode } }
-                //         }
-                //     }
-                // });
-                // 座席タイプ価格仕様を検索
-                // let priceSpecs: ICategoryCodeChargeSpecification[] = [];
-                // if (!excludePriceSpecification) {
-                //     if (Array.isArray(uniqueSeatingTypes) && uniqueSeatingTypes.length > 0) {
-                //         priceSpecs =
-                //             await repos.priceSpecification.search<factory.priceSpecificationType.CategoryCodeChargeSpecification>({
-                //                 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,
@@ -137,3 +130,72 @@ function searchEventSeatOffersWithPaging(params) {
         return offers;
     });
 }
+/**
+ * セクション指定でイベントに対する座席オファーを検索する
+ */
+function findEventSeatOffersBySection(params) {
+    return (repos) => __awaiter(this, void 0, void 0, function* () {
+        var _a, _b, _c, _d, _e, _f;
+        const { limit, page, projectId, eventId, sectionCode } = params;
+        let offers = [];
+        // optimize(2024-07-18~)
+        const event = yield repos.event.projectEventFieldsById({ id: eventId }, ['startDate', 'offers.itemOffered']);
+        // 座席指定利用可能かどうか
+        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 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.projectSeatsByScreeningRoom({
+                limit,
+                page,
+                project: { id: { $eq: projectId } },
+                screeningRoom: {
+                    branchCode: { $eq: roomBranchCode },
+                    containedInPlace: {
+                        branchCode: { $eq: movieTheaterBranchCode }
+                    }
+                },
+                containedInPlace: {
+                    branchCode: { $eq: sectionCode } // セクション指定
+                },
+                $projection: {
+                    'containedInPlace.branchCode': 0,
+                    'containedInPlace.containedInPlace': 0,
+                    'containedInPlace.typeOf': 0,
+                    'containedInPlace.name': 0,
+                    typeOf: 0,
+                    additionalProperty: 0,
+                    seatingType: 0,
+                    name: 0
+                }
+            });
+            if (seats.length > 0) {
+                const availabilities = yield repos.stockHolder.searchHolders({
+                    project: { id: projectId },
+                    eventId,
+                    startDate: moment(event.startDate)
+                        .toDate(),
+                    hasTicketedSeat: true,
+                    offers: seats.map((s) => {
+                        return {
+                            seatNumber: s.branchCode,
+                            seatSection: sectionCode
+                        };
+                    })
+                });
+                offers = seats.map((seat, index) => {
+                    return {
+                        availability: (typeof availabilities[index] === 'string')
+                            ? factory.itemAvailability.OutOfStock // ホルダーが存在すればOutOfStock
+                            : factory.itemAvailability.InStock,
+                        itemOffered: {
+                            branchCode: seat.branchCode
+                        }
+                    };
+                });
+            }
+        }
+        return offers;
+    });
+}

package/package.json

@@ -115,5 +115,5 @@
     "postversion": "git push origin --tags",
     "prepublishOnly": "npm run clean && npm run build && npm test && npm run doc"
   },
-  "version": "23.1.0-alpha.31"
+  "version": "23.1.0-alpha.33"
 }