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

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

@@ -122,6 +122,8 @@ export declare class StockHolderRepository {
      * 汎用的な検索(mongooseのみ対応)
      */
     search(params: {
+        limit?: number;
+        page?: number;
         project?: {
             id?: {
                 $eq?: string;
@@ -138,6 +140,9 @@ export declare class StockHolderRepository {
         id?: {
             $eq?: string;
         };
+        identifier?: {
+            $eq?: string;
+        };
         reservedTicket?: {
             ticketedSeat?: {
                 seatNumber?: {
@@ -150,5 +155,6 @@ export declare class StockHolderRepository {
         };
     }): Promise<ISearchSubReservationResult[]>;
     private checkIfConflicted;
+    private checkIfConflictedBetweenRedisAndMongo;
     private initializeHoldReservation;
 }

package/lib/chevre/repo/stockHolder.js

@@ -86,6 +86,7 @@ class StockHolderRepository {
     lockIfNotLimitExceeded(lockKey, maximum) {
         return __awaiter(this, void 0, void 0, function* () {
             if (StockHolderRepository.useMongoose({ eventId: lockKey.eventId, startDate: lockKey.startDate })) {
+                yield this.checkIfConflictedBetweenRedisAndMongo({ key: '', eventId: lockKey.eventId });
                 // reservationCount<=nであれば$push+$incする
                 yield this.initializeHoldReservation({ project: lockKey.project, eventId: lockKey.eventId, startDate: lockKey.startDate });
                 const addedReservationCount = lockKey.offers.length;
@@ -135,6 +136,7 @@ class StockHolderRepository {
     lock(lockKey) {
         return __awaiter(this, void 0, void 0, function* () {
             if (StockHolderRepository.useMongoose({ eventId: lockKey.eventId, startDate: lockKey.startDate })) {
+                yield this.checkIfConflictedBetweenRedisAndMongo({ key: '', eventId: lockKey.eventId });
                 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));
@@ -214,6 +216,7 @@ class StockHolderRepository {
     unlock(params) {
         return __awaiter(this, void 0, void 0, function* () {
             if (StockHolderRepository.useMongoose({ eventId: params.eventId, startDate: params.startDate })) {
+                yield this.checkIfConflictedBetweenRedisAndMongo({ key: '', eventId: params.eventId });
                 // [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);
@@ -451,13 +454,9 @@ class StockHolderRepository {
      * 汎用的な検索(mongooseのみ対応)
      */
     search(params) {
-        var _a, _b, _c, _d, _e;
+        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o;
         return __awaiter(this, void 0, void 0, function* () {
-            const matchStages = [
-            // {
-            //     $match: { 'reservations.subReservation.identifier': { $in: subReservations.map((r) => r.identifier) } }
-            // }
-            ];
+            const matchStages = [];
             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 } } });
@@ -470,6 +469,43 @@ class StockHolderRepository {
             if (typeof reservationNumberEq === 'string') {
                 matchStages.push({ $match: { 'reservations.reservationNumber': { $eq: reservationNumberEq } } });
             }
+            const identifierEq = (_f = params.identifier) === null || _f === void 0 ? void 0 : _f.$eq;
+            if (typeof identifierEq === 'string') {
+                matchStages.push({ $match: { 'reservations.subReservation.identifier': { $eq: identifierEq } } });
+            }
+            const idEq = (_g = params.id) === null || _g === void 0 ? void 0 : _g.$eq;
+            if (typeof idEq === 'string') {
+                matchStages.push({
+                    $match: {
+                        'reservations.subReservation.id': {
+                            $exists: true,
+                            $eq: idEq
+                        }
+                    }
+                });
+            }
+            const seatNumberEq = (_k = (_j = (_h = params.reservedTicket) === null || _h === void 0 ? void 0 : _h.ticketedSeat) === null || _j === void 0 ? void 0 : _j.seatNumber) === null || _k === void 0 ? void 0 : _k.$eq;
+            if (typeof seatNumberEq === 'string') {
+                matchStages.push({
+                    $match: {
+                        'reservations.subReservation.reservedTicket.ticketedSeat.seatNumber': {
+                            $exists: true,
+                            $eq: seatNumberEq
+                        }
+                    }
+                });
+            }
+            const seatSectionEq = (_o = (_m = (_l = params.reservedTicket) === null || _l === void 0 ? void 0 : _l.ticketedSeat) === null || _m === void 0 ? void 0 : _m.seatSection) === null || _o === void 0 ? void 0 : _o.$eq;
+            if (typeof seatSectionEq === 'string') {
+                matchStages.push({
+                    $match: {
+                        'reservations.subReservation.reservedTicket.ticketedSeat.seatSection': {
+                            $exists: true,
+                            $eq: seatSectionEq
+                        }
+                    }
+                });
+            }
             const aggregate = this.holdReservationModel.aggregate([
                 { $unwind: '$reservations' },
                 { $unwind: '$reservations.subReservation' },
@@ -485,7 +521,13 @@ class StockHolderRepository {
                     }
                 }
             ]);
-            return aggregate.exec();
+            if (typeof params.limit === 'number' && params.limit > 0) {
+                const page = (typeof params.page === 'number' && params.page > 0) ? params.page : 1;
+                aggregate.limit(params.limit * page)
+                    .skip(params.limit * (page - 1));
+            }
+            return aggregate.option({ maxTimeMS: settings_1.MONGO_MAX_TIME_MS })
+                .exec();
         });
     }
     checkIfConflicted(params) {
@@ -511,6 +553,13 @@ class StockHolderRepository {
             }
         });
     }
+    // tslint:disable-next-line:prefer-function-over-method
+    checkIfConflictedBetweenRedisAndMongo(__) {
+        return __awaiter(this, void 0, void 0, function* () {
+            // tslint:disable-next-line:no-suspicious-comment
+            // TODO implement
+        });
+    }
     initializeHoldReservation(params) {
         return __awaiter(this, void 0, void 0, function* () {
             if (!(params.startDate instanceof Date)) {

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