@chevre/domain 21.2.0-alpha.120 → 21.2.0-alpha.122

package/example/src/chevre/lockStockHolder.ts

@@ -5,7 +5,7 @@ import * as redis from 'redis';
 
 import { chevre } from '../../../lib/index';
 
-// const project = { id: String(process.env.PROJECT_ID) };
+const project = { id: String(process.env.PROJECT_ID) };
 
 // tslint:disable-next-line:max-func-body-length
 async function main() {
@@ -22,6 +22,7 @@ async function main() {
 
     const stockHolderRepo = new chevre.repository.StockHolder(client, mongoose.connection);
     await stockHolderRepo.lock({
+        project,
         eventId: 'sampleEventId',
         startDate: startDate.toDate(),
         offers: [

package/example/src/chevre/searchEventSeats.ts

@@ -4,7 +4,7 @@ import * as redis from 'redis';
 
 import { chevre } from '../../../lib/index';
 
-// const project = { id: String(process.env.PROJECT_ID) };
+const project = { id: String(process.env.PROJECT_ID) };
 
 // tslint:disable-next-line:max-func-body-length
 async function main() {
@@ -20,6 +20,7 @@ async function main() {
     const itemAvailabilityRepo = new chevre.repository.StockHolder(client, mongoose.connection);
 
     const result = await itemAvailabilityRepo.searchHolders({
+        project,
         eventId: 'alckc9mlx',
         startDate: new Date(),
         offers: [

package/lib/chevre/repo/mongoose/schemas/holdReservation.d.ts

@@ -53,22 +53,22 @@ declare const schema: Schema<any, import("mongoose").Model<any, any, any, any, a
     };
 }, {
     typeOf: string;
+    project: any;
+    reservationFor: any;
     reservations: any[];
     reservationCount: number;
-    project?: any;
-    reservationFor?: any;
 }, import("mongoose").Document<unknown, {}, import("mongoose").FlatRecord<{
     typeOf: string;
+    project: any;
+    reservationFor: any;
     reservations: any[];
     reservationCount: number;
-    project?: any;
-    reservationFor?: any;
 }>> & Omit<import("mongoose").FlatRecord<{
     typeOf: string;
+    project: any;
+    reservationFor: any;
     reservations: any[];
     reservationCount: number;
-    project?: any;
-    reservationFor?: any;
 }> & {
     _id: import("mongoose").Types.ObjectId;
 }, never>>;

package/lib/chevre/repo/mongoose/schemas/holdReservation.js

@@ -9,12 +9,18 @@ exports.modelName = modelName;
  * 保留予約スキーマ
  */
 const schema = new mongoose_1.Schema({
-    project: mongoose_1.SchemaTypes.Mixed,
+    project: {
+        type: mongoose_1.SchemaTypes.Mixed,
+        required: true
+    },
     typeOf: {
         type: String,
         required: true
     },
-    reservationFor: mongoose_1.SchemaTypes.Mixed,
+    reservationFor: {
+        type: mongoose_1.SchemaTypes.Mixed,
+        required: true
+    },
     reservationCount: {
         type: Number,
         default: 0,

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

@@ -14,6 +14,9 @@ export interface IOffer {
     seatNumber: string;
 }
 export interface ILockKey {
+    project: {
+        id: string;
+    };
     eventId: string;
     startDate: Date;
     offers: IOffer[];
@@ -21,9 +24,13 @@ export interface ILockKey {
     holder: string;
 }
 export interface IUnlockKey {
+    project: {
+        id: string;
+    };
     eventId: string;
     startDate: Date;
     offer: IOffer;
+    holder: string;
 }
 export type IGetHolderResult = string | null;
 export interface ISubReservation {
@@ -39,6 +46,10 @@ export interface IReservationPackage {
     subReservation: ISubReservation[];
 }
 export interface IAggregateReservation {
+    project: {
+        id: string;
+        typeOf: factory.organizationType.Project;
+    };
     typeOf: 'AggregateReservation';
     reservationCount: number;
     reservationFor: {
@@ -94,16 +105,50 @@ export declare class StockHolderRepository {
     /**
      * 保持者を取得する
      */
-    getHolder(params: IUnlockKey): Promise<string | null | undefined>;
+    getHolder(params: Omit<IUnlockKey, 'holder'>): Promise<string | null | undefined>;
     /**
      * 在庫状況を検索する
      * offers.lengthが0だと"ERR wrong number of arguments for 'hmget' command"となるので注意
      */
     searchHolders(params: {
+        project: {
+            id: string;
+        };
         eventId: string;
         startDate: Date;
         offers: IOffer[];
     }): Promise<IGetHolderResult[]>;
+    /**
+     * 汎用的な検索(mongooseのみ対応)
+     */
+    search(params: {
+        project?: {
+            id?: {
+                $eq?: string;
+            };
+        };
+        reservationFor?: {
+            id?: {
+                $eq?: string;
+            };
+        };
+        reservationNumber?: {
+            $eq?: string;
+        };
+        id?: {
+            $eq?: string;
+        };
+        reservedTicket?: {
+            ticketedSeat?: {
+                seatNumber?: {
+                    $eq?: string;
+                };
+                seatSection?: {
+                    $eq?: string;
+                };
+            };
+        };
+    }): Promise<ISearchSubReservationResult[]>;
     private checkIfConflicted;
     private initializeHoldReservation;
 }

package/lib/chevre/repo/stockHolder.js

@@ -15,7 +15,7 @@ const moment = require("moment");
 const factory = require("../factory");
 const holdReservation_1 = require("./mongoose/schemas/holdReservation");
 const settings_1 = require("../settings");
-const debug = createDebug('chevre-domain:repo');
+const debug = createDebug('chevre-domain:repo:stockHolder');
 /**
  * イベントストックホルダーリポジトリ
  */
@@ -87,7 +87,7 @@ class StockHolderRepository {
         return __awaiter(this, void 0, void 0, function* () {
             if (StockHolderRepository.useMongoose({ eventId: lockKey.eventId, startDate: lockKey.startDate })) {
                 // reservationCount<=nであれば$push+$incする
-                yield this.initializeHoldReservation({ eventId: lockKey.eventId, startDate: lockKey.startDate });
+                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));
@@ -135,7 +135,7 @@ class StockHolderRepository {
     lock(lockKey) {
         return __awaiter(this, void 0, void 0, function* () {
             if (StockHolderRepository.useMongoose({ eventId: lockKey.eventId, startDate: lockKey.startDate })) {
-                yield this.initializeHoldReservation({ eventId: lockKey.eventId, startDate: lockKey.startDate });
+                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 reservationPackage = {
@@ -215,19 +215,25 @@ class StockHolderRepository {
         return __awaiter(this, void 0, void 0, function* () {
             if (StockHolderRepository.useMongoose({ eventId: params.eventId, startDate: params.startDate })) {
                 // [id]あるいは[seatNumber+seatSection]でreservations.subReservationsから$pull+$incする
-                yield this.initializeHoldReservation({ eventId: params.eventId, startDate: params.startDate });
+                yield this.initializeHoldReservation({ project: params.project, eventId: params.eventId, startDate: params.startDate });
                 const subReservation = StockHolderRepository.offer2subReservation(params.offer);
-                yield this.holdReservationModel.findOneAndUpdate({
+                const reservationNumber = params.holder;
+                const updateResult = yield this.holdReservationModel.findOneAndUpdate({
                     'reservationFor.id': { $eq: params.eventId },
-                    'reservations.subReservation.identifier': {
-                        $eq: subReservation.identifier
-                    }
+                    'reservations.reservationNumber': { $eq: reservationNumber },
+                    'reservations.subReservation.identifier': { $eq: subReservation.identifier }
                 }, {
                     $inc: { reservationCount: -1 },
-                    $pull: { 'reservations.subReservation': { identifier: { $eq: subReservation.identifier } } }
-                }, { new: true })
+                    $pull: { 'reservations.$[reservationPackage].subReservation': { identifier: { $eq: subReservation.identifier } } }
+                }, {
+                    new: true,
+                    arrayFilters: [
+                        { 'reservationPackage.reservationNumber': reservationNumber }
+                    ]
+                })
                     .select({ _id: 1 })
                     .exec();
+                debug('unlock processed. updateResult:', updateResult, 'reservationNumber:', reservationNumber, 'identifier:', subReservation.identifier);
                 // docが存在しなくてもよい
             }
             else {
@@ -297,7 +303,7 @@ class StockHolderRepository {
         return __awaiter(this, void 0, void 0, function* () {
             if (StockHolderRepository.useMongoose({ eventId: params.eventId, startDate: params.startDate })) {
                 // [id]あるいは[seatNumber+seatSection]でreservationNumberを返す
-                yield this.initializeHoldReservation({ eventId: params.eventId, startDate: params.startDate });
+                yield this.initializeHoldReservation({ project: params.project, eventId: params.eventId, startDate: params.startDate });
                 const subReservation = StockHolderRepository.offer2subReservation(params.offer);
                 const matchStages = [
                     {
@@ -371,7 +377,7 @@ class StockHolderRepository {
         return __awaiter(this, void 0, void 0, function* () {
             if (StockHolderRepository.useMongoose({ eventId: params.eventId, startDate: params.startDate })) {
                 // [id]あるいは[seatNumber+seatSection]のリストでreservationNumberのリストを返す
-                yield this.initializeHoldReservation({ eventId: params.eventId, startDate: params.startDate });
+                yield this.initializeHoldReservation({ project: params.project, eventId: params.eventId, startDate: params.startDate });
                 const subReservations = params.offers.map((offer) => StockHolderRepository.offer2subReservation(offer));
                 const matchStages = [
                     {
@@ -441,6 +447,47 @@ class StockHolderRepository {
     //         }
     //     }
     // }
+    /**
+     * 汎用的な検索(mongooseのみ対応)
+     */
+    search(params) {
+        var _a, _b, _c, _d, _e;
+        return __awaiter(this, void 0, void 0, function* () {
+            const matchStages = [
+            // {
+            //     $match: { 'reservations.subReservation.identifier': { $in: subReservations.map((r) => r.identifier) } }
+            // }
+            ];
+            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 reservationForIdEq = (_d = (_c = params.reservationFor) === null || _c === void 0 ? void 0 : _c.id) === null || _d === void 0 ? void 0 : _d.$eq;
+            if (typeof reservationForIdEq === 'string') {
+                matchStages.push({ $match: { 'reservationFor.id': { $eq: reservationForIdEq } } });
+            }
+            const reservationNumberEq = (_e = params.reservationNumber) === null || _e === void 0 ? void 0 : _e.$eq;
+            if (typeof reservationNumberEq === 'string') {
+                matchStages.push({ $match: { 'reservations.reservationNumber': { $eq: reservationNumberEq } } });
+            }
+            const aggregate = this.holdReservationModel.aggregate([
+                { $unwind: '$reservations' },
+                { $unwind: '$reservations.subReservation' },
+                ...matchStages,
+                {
+                    $project: {
+                        _id: 0,
+                        id: '$reservations.subReservation.id',
+                        identifier: '$reservations.subReservation.identifier',
+                        reservationFor: '$reservationFor',
+                        reservationNumber: '$reservations.reservationNumber',
+                        reservedTicket: '$reservations.subReservation.reservedTicket'
+                    }
+                }
+            ]);
+            return aggregate.exec();
+        });
+    }
     checkIfConflicted(params) {
         return __awaiter(this, void 0, void 0, function* () {
             // 旧キーと新キーの両方存在検証(念のため)
@@ -470,6 +517,7 @@ class StockHolderRepository {
                 throw new factory.errors.Argument('startDate', 'must be Date');
             }
             const aggregateReservation = {
+                project: { id: params.project.id, typeOf: factory.organizationType.Project },
                 typeOf: 'AggregateReservation',
                 reservationCount: 0,
                 reservationFor: {

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

@@ -388,6 +388,7 @@ function filterByEligibleSeatingType(params) {
         let remainingAttendeeCapacity;
         if (maximumAttendeeCapacity > 0) {
             const availabilities = yield repos.stockHolder.searchHolders({
+                project: { id: params.event.project.id },
                 eventId: params.event.id,
                 startDate: moment(params.event.startDate)
                     .toDate(),

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

@@ -239,6 +239,7 @@ function searchEventSeatOffers(params) {
             });
             if (seats.length > 0) {
                 const availabilities = yield repos.stockHolder.searchHolders({
+                    project: { id: params.event.project.id },
                     eventId: params.event.id,
                     startDate: moment(params.event.startDate)
                         .toDate(),
@@ -677,6 +678,7 @@ function processLockSeats(params) {
         const maximumAttendeeCapacity4event = (_b = params.event.location) === null || _b === void 0 ? void 0 : _b.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(),
@@ -687,6 +689,7 @@ function processLockSeats(params) {
         }
         else {
             yield repos.stockHolder.lock({
+                project: { id: params.event.project.id },
                 eventId: params.event.id,
                 startDate: moment(params.event.startDate)
                     .toDate(),

package/lib/chevre/service/offer.js

@@ -91,6 +91,7 @@ function searchEventSeatOffersWithPaging(params) {
                 } }));
             if (seats.length > 0) {
                 const availabilities = yield repos.stockHolder.searchHolders({
+                    project: { id: event.project.id },
                     eventId: params.event.id,
                     startDate: moment(event.startDate)
                         .toDate(),

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

@@ -98,6 +98,7 @@ function cancelPengindIfNotYet(params, now) {
                                 yield processUnlockSeat({
                                     reservation: {
                                         id: cancelingSubReservation.id,
+                                        project: { id: reserveTransaction.project.id },
                                         reservedTicket: cancelingSubReservation.reservedTicket,
                                         subReservation: cancelingSubReservation.subReservation,
                                         reservationFor: {
@@ -204,6 +205,7 @@ function cancelReservation(actionAttributesList) {
                                 yield processUnlockSeat({
                                     reservation: {
                                         id: cancelingSubReservation.id,
+                                        project: { id: reserveTransaction.project.id },
                                         reservedTicket: cancelingSubReservation.reservedTicket,
                                         subReservation: cancelingSubReservation.subReservation,
                                         reservationFor: {
@@ -255,6 +257,7 @@ function cancelReservation(actionAttributesList) {
                             yield processUnlockSeat({
                                 reservation: {
                                     id: reservation.id,
+                                    project: { id: reservation.project.id },
                                     reservedTicket: reservation.reservedTicket,
                                     subReservation: reservation.subReservation,
                                     reservationFor: {
@@ -344,13 +347,15 @@ function processUnlockSeat(params) {
             .toDate();
         // 予約IDでロックされていれば解除
         let lockKey = {
+            project: reservation.project,
             eventId: reservation.reservationFor.id,
             startDate: eventStartDate,
             offer: {
                 itemOffered: { serviceOutput: { id: reservation.id } },
                 seatNumber: '',
                 seatSection: ''
-            }
+            },
+            holder: params.expectedHolder
         };
         let holder = yield repos.stockHolder.getHolder(lockKey);
         if (holder === params.expectedHolder) {
@@ -360,12 +365,14 @@ function processUnlockSeat(params) {
         const ticketedSeat = reservation.reservedTicket.ticketedSeat;
         if (ticketedSeat !== undefined) {
             lockKey = {
+                project: reservation.project,
                 eventId: reservation.reservationFor.id,
                 startDate: eventStartDate,
                 offer: {
                     seatNumber: ticketedSeat.seatNumber,
                     seatSection: ticketedSeat.seatSection
-                }
+                },
+                holder: params.expectedHolder
             };
             holder = yield repos.stockHolder.getHolder(lockKey);
             if (holder === params.expectedHolder) {
@@ -381,12 +388,14 @@ function processUnlockSeat(params) {
                 const seatNumber4sub = (_d = (_c = subReservation.reservedTicket) === null || _c === void 0 ? void 0 : _c.ticketedSeat) === null || _d === void 0 ? void 0 : _d.seatNumber;
                 if (typeof seatSection4sub === 'string' && typeof seatNumber4sub === 'string') {
                     const lockKey4sub = {
+                        project: reservation.project,
                         eventId: reservation.reservationFor.id,
                         startDate: eventStartDate,
                         offer: {
                             seatNumber: seatNumber4sub,
                             seatSection: seatSection4sub
-                        }
+                        },
+                        holder: params.expectedHolder
                     };
                     const holder4sub = yield repos.stockHolder.getHolder(lockKey4sub);
                     if (holder4sub === params.expectedHolder) {

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.120"
+  "version": "21.2.0-alpha.122"
 }