@chevre/domain 21.2.0-alpha.129 → 21.2.0-alpha.130

package/example/src/chevre/lockStockHolder.ts

@@ -25,6 +25,7 @@ async function main() {
         project,
         eventId: 'sampleEventId',
         startDate: startDate.toDate(),
+        hasTicketedSeat: true,
         offers: [
             {
                 seatSection: 'sampleSeatSection',

package/example/src/chevre/searchAbortedTasks.ts

@@ -9,24 +9,22 @@ async function main() {
 
     const taskRepo = new chevre.repository.Task(mongoose.connection);
 
-    const tasks = <chevre.factory.task.ITask<chevre.factory.taskName.ConfirmPayTransaction>[]>await taskRepo.search({
+    const tasks = <chevre.factory.task.ITask<chevre.factory.taskName.ConfirmReserveTransaction>[]>await taskRepo.search({
         // limit: 100,
         // page: 1,
         name: {
-            $in: [chevre.factory.taskName.ConfirmPayTransaction]
+            $in: [chevre.factory.taskName.ConfirmReserveTransaction]
             // $nin: [
             //     chevre.factory.taskName.ImportEventsFromCOA,
             //     chevre.factory.taskName.ImportEventCapacitiesFromCOA
             // ]
         },
         statuses: [chevre.factory.taskStatus.Aborted],
-        runsFrom: moment('2023-05-02T22:00:00Z')
+        runsFrom: moment('2023-06-02T22:00:00Z')
             .toDate(),
         sort: { runsAt: chevre.factory.sortType.Ascending }
     });
-    console.log(tasks.map((task) => `${task.project.id},${task.id},${task.name},${moment(task.runsAt)
-        .tz('Asia/Tokyo')
-        .format('YYYY-MM-DDTHH:mm:ssZ')},"${task.data.object[0]?.transactionNumber}"`)
+    console.log(tasks.map((task) => `${task.data.object?.transactionNumber}`)
         .join('\n'));
     console.log(tasks.length);
 }

package/example/src/chevre/searchEventSeats.ts

@@ -23,6 +23,7 @@ async function main() {
         project,
         eventId: 'alckc9mlx',
         startDate: new Date(),
+        hasTicketedSeat: true,
         offers: [
             {
                 seatSection: 'Default',

package/example/src/chevre/searchScreeningRooms.ts

@@ -0,0 +1,23 @@
+// tslint:disable:no-console
+import * as mongoose from 'mongoose';
+
+import { chevre } from '../../../lib/index';
+
+// const PROJECT_ID = String(process.env.PROJECT_ID);
+
+async function main() {
+    await mongoose.connect(<string>process.env.MONGOLAB_URI, { autoIndex: false });
+
+    const placeRepo = new chevre.repository.Place(mongoose.connection);
+
+    const rooms = await placeRepo.searchScreeningRooms({
+        $projection: { sectionCount: 1 }
+    });
+    console.log('place found', rooms);
+    const filteredRooms = rooms.filter((room) => typeof room.sectionCount === 'number' && room.sectionCount > 1);
+    console.log(filteredRooms.length, 'filteredRooms found');
+}
+
+main()
+    .then(console.log)
+    .catch(console.error);

package/lib/chevre/repo/stockHolder.d.ts

@@ -19,6 +19,7 @@ export interface ILockKey {
     };
     eventId: string;
     startDate: Date;
+    hasTicketedSeat: boolean;
     offers: IOffer[];
     expires: Date;
     holder: string;
@@ -29,6 +30,7 @@ export interface IUnlockKey {
     };
     eventId: string;
     startDate: Date;
+    hasTicketedSeat: boolean;
     offer: IOffer;
     holder: string;
 }
@@ -120,6 +122,7 @@ export declare class StockHolderRepository {
         event: {
             id: string;
             startDate: Date;
+            hasTicketedSeat: boolean;
         };
     }): Promise<number>;
     /**
@@ -136,6 +139,7 @@ export declare class StockHolderRepository {
         };
         eventId: string;
         startDate: Date;
+        hasTicketedSeat: boolean;
         offers: IOffer[];
     }): Promise<IGetHolderResult[]>;
     /**

package/lib/chevre/repo/stockHolder.js

@@ -24,39 +24,47 @@ class StockHolderRepository {
         this.redisClient = redisClient;
         this.holdReservationModel = connection.model(holdReservation_1.modelName, holdReservation_1.schema);
     }
-    // public static GET_KEY(params: {
-    //     eventId: string;
-    //     startDate: Date;
-    // }) {
-    //     return StockHolderRepository.createKey(params);
-    // }
-    static offer2field(params) {
+    static offer2field(params, hasTicketedSeat) {
         var _a, _b;
-        // 予約IDをfieldにする場合
-        const serviceOutputId = (_b = (_a = params.itemOffered) === null || _a === void 0 ? void 0 : _a.serviceOutput) === null || _b === void 0 ? void 0 : _b.id;
-        if (typeof serviceOutputId === 'string') {
-            return serviceOutputId;
+        if (hasTicketedSeat) {
+            return `${params.seatSection}:${params.seatNumber}`;
+        }
+        else {
+            // 予約IDをfieldにする場合
+            const serviceOutputId = (_b = (_a = params.itemOffered) === null || _a === void 0 ? void 0 : _a.serviceOutput) === null || _b === void 0 ? void 0 : _b.id;
+            if (typeof serviceOutputId === 'string') {
+                return serviceOutputId;
+            }
+            else {
+                throw new factory.errors.ServiceUnavailable('offer2field requires itemOffered.serviceOutput.id');
+            }
         }
-        return `${params.seatSection}:${params.seatNumber}`;
     }
-    static offer2subReservation(params) {
+    static offer2subReservation(params, hasTicketedSeat) {
         var _a, _b;
-        const serviceOutputId = (_b = (_a = params.itemOffered) === null || _a === void 0 ? void 0 : _a.serviceOutput) === null || _b === void 0 ? void 0 : _b.id;
-        if (typeof serviceOutputId === 'string') {
+        if (hasTicketedSeat) {
             return {
-                id: serviceOutputId,
-                identifier: serviceOutputId
+                identifier: `${params.seatSection}:${params.seatNumber}`,
+                reservedTicket: {
+                    ticketedSeat: {
+                        seatSection: params.seatSection,
+                        seatNumber: params.seatNumber
+                    }
+                }
             };
         }
-        return {
-            identifier: `${params.seatSection}:${params.seatNumber}`,
-            reservedTicket: {
-                ticketedSeat: {
-                    seatSection: params.seatSection,
-                    seatNumber: params.seatNumber
-                }
+        else {
+            const serviceOutputId = (_b = (_a = params.itemOffered) === null || _a === void 0 ? void 0 : _a.serviceOutput) === null || _b === void 0 ? void 0 : _b.id;
+            if (typeof serviceOutputId === 'string') {
+                return {
+                    id: serviceOutputId,
+                    identifier: serviceOutputId
+                };
+            }
+            else {
+                throw new factory.errors.ServiceUnavailable('offer2subReservation requires itemOffered.serviceOutput.id');
             }
-        };
+        }
     }
     static createKey(params) {
         if (!(params.startDate instanceof Date)) {
@@ -81,12 +89,16 @@ class StockHolderRepository {
         if (params.useMongooseForcibly === true) {
             return true;
         }
+        // USE_NEW_STOCK_HOLDER_REPO_IDSに含まれれば強制的に使用
         if (settings_1.USE_NEW_STOCK_HOLDER_REPO_IDS.includes(params.eventId)) {
             return true;
         }
-        if (moment(params.startDate)
-            .isSameOrAfter(settings_1.USE_NEW_STOCK_HOLDER_REPO_FROM)) {
-            return true;
+        // 座席有の場合のみ、USE_NEW_STOCK_HOLDER_REPO_FROMを検証
+        if (params.hasTicketedSeat) {
+            if (moment(params.startDate)
+                .isSameOrAfter(settings_1.USE_NEW_STOCK_HOLDER_REPO_FROM)) {
+                return true;
+            }
         }
         return false;
     }
@@ -95,7 +107,11 @@ class StockHolderRepository {
      */
     lockIfNotLimitExceeded(lockKey, maximum) {
         return __awaiter(this, void 0, void 0, function* () {
-            const useMongoose = StockHolderRepository.useMongoose({ eventId: lockKey.eventId, startDate: lockKey.startDate });
+            const useMongoose = StockHolderRepository.useMongoose({
+                eventId: lockKey.eventId,
+                startDate: lockKey.startDate,
+                hasTicketedSeat: lockKey.hasTicketedSeat
+            });
             if (useMongoose) {
                 if (!(lockKey.expires instanceof Date)) {
                     throw new factory.errors.Argument('expires', 'must be Date');
@@ -105,7 +121,7 @@ class StockHolderRepository {
                 yield this.initializeHoldReservation({ project: lockKey.project, eventId: lockKey.eventId, startDate: lockKey.startDate });
                 const addedReservationCount = lockKey.offers.length;
                 const reservationCountLte = maximum - addedReservationCount;
-                const subReservations = lockKey.offers.map((offer) => StockHolderRepository.offer2subReservation(offer));
+                const subReservations = lockKey.offers.map((offer) => StockHolderRepository.offer2subReservation(offer, lockKey.hasTicketedSeat));
                 const reservationPackage = {
                     typeOf: factory.reservationType.ReservationPackage,
                     reservationNumber: lockKey.holder,
@@ -155,14 +171,15 @@ class StockHolderRepository {
             const useMongoose = StockHolderRepository.useMongoose({
                 eventId: lockKey.eventId,
                 startDate: lockKey.startDate,
-                useMongooseForcibly: lockKey.useMongooseForcibly
+                useMongooseForcibly: lockKey.useMongooseForcibly,
+                hasTicketedSeat: lockKey.hasTicketedSeat
             });
             const key = StockHolderRepository.createKey({ eventId: lockKey.eventId, startDate: lockKey.startDate });
             yield this.checkIfConflicted({ key, eventId: lockKey.eventId, useMongoose });
             if (useMongoose) {
                 yield this.initializeHoldReservation({ project: lockKey.project, eventId: lockKey.eventId, startDate: lockKey.startDate });
                 const addedReservationCount = lockKey.offers.length;
-                const subReservations = lockKey.offers.map((offer) => StockHolderRepository.offer2subReservation(offer));
+                const subReservations = lockKey.offers.map((offer) => StockHolderRepository.offer2subReservation(offer, lockKey.hasTicketedSeat));
                 const reservationPackage = {
                     typeOf: factory.reservationType.ReservationPackage,
                     reservationNumber: lockKey.holder,
@@ -189,7 +206,7 @@ class StockHolderRepository {
             else {
                 const value = lockKey.holder;
                 const multi = this.redisClient.multi();
-                const fields = lockKey.offers.map((offer) => StockHolderRepository.offer2field(offer));
+                const fields = lockKey.offers.map((offer) => StockHolderRepository.offer2field(offer, lockKey.hasTicketedSeat));
                 fields.forEach((field) => {
                     multi.hSetNX(key, field, value);
                 });
@@ -233,13 +250,17 @@ class StockHolderRepository {
      */
     unlock(params) {
         return __awaiter(this, void 0, void 0, function* () {
-            const useMongoose = StockHolderRepository.useMongoose({ eventId: params.eventId, startDate: params.startDate });
+            const useMongoose = StockHolderRepository.useMongoose({
+                eventId: params.eventId,
+                startDate: params.startDate,
+                hasTicketedSeat: params.hasTicketedSeat
+            });
             const key = StockHolderRepository.createKey({ eventId: params.eventId, startDate: params.startDate });
             yield this.checkIfConflicted({ key, eventId: params.eventId, useMongoose });
             if (useMongoose) {
                 // [id]あるいは[seatNumber+seatSection]でreservations.subReservationsから$pull+$incする
                 yield this.initializeHoldReservation({ project: params.project, eventId: params.eventId, startDate: params.startDate });
-                const subReservation = StockHolderRepository.offer2subReservation(params.offer);
+                const subReservation = StockHolderRepository.offer2subReservation(params.offer, params.hasTicketedSeat);
                 const reservationNumber = params.holder;
                 const updateResult = yield this.holdReservationModel.findOneAndUpdate({
                     'reservationFor.id': { $eq: params.eventId },
@@ -260,7 +281,7 @@ class StockHolderRepository {
                 // docが存在しなくてもよい
             }
             else {
-                const field = StockHolderRepository.offer2field(params.offer);
+                const field = StockHolderRepository.offer2field(params.offer, params.hasTicketedSeat);
                 yield this.redisClient.multi()
                     .hDel(key, field)
                     .exec();
@@ -289,7 +310,11 @@ class StockHolderRepository {
      */
     countUnavailableOffers(params) {
         return __awaiter(this, void 0, void 0, function* () {
-            if (StockHolderRepository.useMongoose({ eventId: params.event.id, startDate: params.event.startDate })) {
+            if (StockHolderRepository.useMongoose({
+                eventId: params.event.id,
+                startDate: params.event.startDate,
+                hasTicketedSeat: params.event.hasTicketedSeat
+            })) {
                 // reservationCountを返す
                 return this.holdReservationModel.findOne({
                     'reservationFor.id': { $eq: params.event.id }
@@ -322,10 +347,13 @@ class StockHolderRepository {
     getHolder(params) {
         var _a;
         return __awaiter(this, void 0, void 0, function* () {
-            if (StockHolderRepository.useMongoose({ eventId: params.eventId, startDate: params.startDate })) {
+            if (StockHolderRepository.useMongoose({
+                eventId: params.eventId,
+                startDate: params.startDate,
+                hasTicketedSeat: params.hasTicketedSeat
+            })) {
                 // [id]あるいは[seatNumber+seatSection]でreservationNumberを返す
-                // await this.initializeHoldReservation({ project: params.project, eventId: params.eventId, startDate: params.startDate });
-                const subReservation = StockHolderRepository.offer2subReservation(params.offer);
+                const subReservation = StockHolderRepository.offer2subReservation(params.offer, params.hasTicketedSeat);
                 const matchStages = [
                     {
                         $match: { 'reservationFor.id': { $eq: params.eventId } }
@@ -357,7 +385,7 @@ class StockHolderRepository {
             }
             else {
                 const key = StockHolderRepository.createKey({ eventId: params.eventId, startDate: params.startDate });
-                const field = StockHolderRepository.offer2field(params.offer);
+                const field = StockHolderRepository.offer2field(params.offer, params.hasTicketedSeat);
                 return this.redisClient.hGet(key, field);
             }
         });
@@ -396,10 +424,13 @@ class StockHolderRepository {
     // }
     searchHolders(params) {
         return __awaiter(this, void 0, void 0, function* () {
-            if (StockHolderRepository.useMongoose({ eventId: params.eventId, startDate: params.startDate })) {
+            if (StockHolderRepository.useMongoose({
+                eventId: params.eventId,
+                startDate: params.startDate,
+                hasTicketedSeat: params.hasTicketedSeat
+            })) {
                 // [id]あるいは[seatNumber+seatSection]のリストでreservationNumberのリストを返す
-                // await this.initializeHoldReservation({ project: params.project, eventId: params.eventId, startDate: params.startDate });
-                const subReservations = params.offers.map((offer) => StockHolderRepository.offer2subReservation(offer));
+                const subReservations = params.offers.map((offer) => StockHolderRepository.offer2subReservation(offer, params.hasTicketedSeat));
                 const matchStages = [
                     {
                         $match: { 'reservationFor.id': { $eq: params.eventId } }
@@ -432,7 +463,7 @@ class StockHolderRepository {
             else {
                 const key = StockHolderRepository.createKey({ eventId: params.eventId, startDate: params.startDate });
                 const fields = params.offers.map((o) => {
-                    return StockHolderRepository.offer2field(o);
+                    return StockHolderRepository.offer2field(o, params.hasTicketedSeat);
                 });
                 // 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);

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

@@ -392,6 +392,7 @@ function filterByEligibleSeatingType(params) {
                 eventId: params.event.id,
                 startDate: moment(params.event.startDate)
                     .toDate(),
+                hasTicketedSeat: true,
                 offers: eligibleSeatOffers
             });
             // remainingAttendeeCapacity = availabilities.filter((a) => a.availability === factory.itemAvailability.InStock).length;
@@ -426,7 +427,8 @@ function aggregateReservationByEvent(params) {
         if (typeof eventLocationMaximumAttendeeCapacity === 'number') {
             maximumAttendeeCapacity = eventLocationMaximumAttendeeCapacity;
         }
-        if (reservedSeatsAvailable({ event: params.event })) {
+        const hasTicketedSeat = reservedSeatsAvailable({ event: params.event });
+        if (hasTicketedSeat) {
             const screeningRoomSeatCount = (Array.isArray(params.screeningRoom.containsPlace))
                 // b.containsPlaceがundefinedの場合があるので注意(座席未登録)
                 ? params.screeningRoom.containsPlace.reduce((a, b) => a + ((Array.isArray(b.containsPlace)) ? b.containsPlace.length : 0), 0)
@@ -444,7 +446,8 @@ function aggregateReservationByEvent(params) {
                 event: {
                     id: params.event.id,
                     startDate: moment(params.event.startDate)
-                        .toDate()
+                        .toDate(),
+                    hasTicketedSeat
                 }
             });
             remainingAttendeeCapacity = maximumAttendeeCapacity - unavailableOfferCount;

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

@@ -243,6 +243,7 @@ function searchEventSeatOffers(params) {
                     eventId: params.event.id,
                     startDate: moment(params.event.startDate)
                         .toDate(),
+                    hasTicketedSeat: true,
                     offers: seats.map((s) => {
                         var _a;
                         return {
@@ -626,7 +627,7 @@ function processLockOfferRateLimit(params) {
  */
 function processLockSeats(params) {
     return (repos) => __awaiter(this, void 0, void 0, function* () {
-        var _a, _b;
+        var _a, _b, _c, _d, _e;
         const offers = [];
         params.reservations.forEach((r) => {
             var _a, _b;
@@ -675,13 +676,15 @@ function processLockSeats(params) {
         if (((_a = params.transaction.object) === null || _a === void 0 ? void 0 : _a.useHoldStockByTransactionNumber) === true) {
             holder = params.transaction.transactionNumber;
         }
-        const maximumAttendeeCapacity4event = (_b = params.event.location) === null || _b === void 0 ? void 0 : _b.maximumAttendeeCapacity;
+        const hasTicketedSeat = ((_d = (_c = (_b = params.event.offers.itemOffered.serviceOutput) === null || _b === void 0 ? void 0 : _b.reservedTicket) === null || _c === void 0 ? void 0 : _c.ticketedSeat) === null || _d === void 0 ? void 0 : _d.typeOf) === factory.placeType.Seat;
+        const maximumAttendeeCapacity4event = (_e = params.event.location) === null || _e === void 0 ? void 0 : _e.maximumAttendeeCapacity;
         if (typeof maximumAttendeeCapacity4event === 'number') {
             yield repos.stockHolder.lockIfNotLimitExceeded({
                 project: { id: params.event.project.id },
                 eventId: params.event.id,
                 startDate: moment(params.event.startDate)
                     .toDate(),
+                hasTicketedSeat,
                 offers,
                 expires,
                 holder
@@ -693,6 +696,7 @@ function processLockSeats(params) {
                 eventId: params.event.id,
                 startDate: moment(params.event.startDate)
                     .toDate(),
+                hasTicketedSeat,
                 offers,
                 expires,
                 holder

package/lib/chevre/service/event.js

@@ -448,7 +448,15 @@ function createScreeningEventFromCOA(params) {
             typeOf: 'WebAPI',
             identifier: factory.service.webAPI.Identifier.COA
         },
-        priceCurrency: factory.priceCurrency.JPY
+        priceCurrency: factory.priceCurrency.JPY,
+        itemOffered: {
+            serviceOutput: {
+                reservedTicket: {
+                    typeOf: 'Ticket',
+                    ticketedSeat: { typeOf: factory.placeType.Seat }
+                }
+            }
+        }
     };
     const { additionalProperty, coaInfo } = createScreeningEventAdditionalPropertyFromCOA(params);
     return {

package/lib/chevre/service/offer.js

@@ -95,6 +95,7 @@ function searchEventSeatOffersWithPaging(params) {
                     eventId: params.event.id,
                     startDate: moment(event.startDate)
                         .toDate(),
+                    hasTicketedSeat: true,
                     offers: seats.map((s) => {
                         var _a;
                         return {

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

@@ -350,6 +350,7 @@ function processUnlockSeat(params) {
             project: reservation.project,
             eventId: reservation.reservationFor.id,
             startDate: eventStartDate,
+            hasTicketedSeat: false,
             offer: {
                 itemOffered: { serviceOutput: { id: reservation.id } },
                 seatNumber: '',
@@ -368,6 +369,7 @@ function processUnlockSeat(params) {
                 project: reservation.project,
                 eventId: reservation.reservationFor.id,
                 startDate: eventStartDate,
+                hasTicketedSeat: true,
                 offer: {
                     seatNumber: ticketedSeat.seatNumber,
                     seatSection: ticketedSeat.seatSection
@@ -391,6 +393,7 @@ function processUnlockSeat(params) {
                         project: reservation.project,
                         eventId: reservation.reservationFor.id,
                         startDate: eventStartDate,
+                        hasTicketedSeat: true,
                         offer: {
                             seatNumber: seatNumber4sub,
                             seatSection: seatSection4sub

package/package.json

@@ -9,8 +9,8 @@
     }
   ],
   "dependencies": {
-    "@chevre/factory": "4.313.0-alpha.38",
-    "@cinerino/sdk": "3.157.0-alpha.13",
+    "@chevre/factory": "4.313.0-alpha.39",
+    "@cinerino/sdk": "3.157.0-alpha.16",
     "@motionpicture/coa-service": "9.2.0",
     "@motionpicture/gmo-service": "5.2.0",
     "@sendgrid/mail": "6.4.0",
@@ -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.129"
+  "version": "21.2.0-alpha.130"
 }