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

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

@@ -85,7 +85,12 @@ export declare class StockHolderRepository {
     /**
      * 座席をロックする
      */
-    lock(lockKey: ILockKey): Promise<void>;
+    lock(lockKey: ILockKey & {
+        /**
+         * テスト目的の強制オプション
+         */
+        useMongooseForcibly?: boolean;
+    }): Promise<void>;
     /**
      * 座席ロックを解除する
      */
@@ -155,6 +160,5 @@ export declare class StockHolderRepository {
         };
     }): Promise<ISearchSubReservationResult[]>;
     private checkIfConflicted;
-    private checkIfConflictedBetweenRedisAndMongo;
     private initializeHoldReservation;
 }

package/lib/chevre/repo/stockHolder.js

@@ -75,6 +75,9 @@ class StockHolderRepository {
      * 新リポジトリを使用するかどうか
      */
     static useMongoose(params) {
+        if (params.useMongooseForcibly === true) {
+            return true;
+        }
         if (settings_1.USE_NEW_STOCK_HOLDER_REPO_IDS.includes(params.eventId)) {
             return true;
         }
@@ -85,8 +88,12 @@ 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 });
+            const useMongoose = StockHolderRepository.useMongoose({ eventId: lockKey.eventId, startDate: lockKey.startDate });
+            if (useMongoose) {
+                if (!(lockKey.expires instanceof Date)) {
+                    throw new factory.errors.Argument('expires', 'must be Date');
+                }
+                yield this.checkIfConflicted({ key: '', eventId: lockKey.eventId, useMongoose });
                 // reservationCount<=nであれば$push+$incする
                 yield this.initializeHoldReservation({ project: lockKey.project, eventId: lockKey.eventId, startDate: lockKey.startDate });
                 const addedReservationCount = lockKey.offers.length;
@@ -135,8 +142,17 @@ 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 });
+            if (!(lockKey.expires instanceof Date)) {
+                throw new factory.errors.Argument('expires', 'must be Date');
+            }
+            const useMongoose = StockHolderRepository.useMongoose({
+                eventId: lockKey.eventId,
+                startDate: lockKey.startDate,
+                useMongooseForcibly: lockKey.useMongooseForcibly
+            });
+            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));
@@ -164,11 +180,6 @@ class StockHolderRepository {
                 });
             }
             else {
-                if (!(lockKey.expires instanceof Date)) {
-                    throw new factory.errors.Argument('expires', 'must be Date');
-                }
-                const key = StockHolderRepository.createKey({ eventId: lockKey.eventId, startDate: lockKey.startDate });
-                yield this.checkIfConflicted({ key, eventId: lockKey.eventId });
                 const value = lockKey.holder;
                 const multi = this.redisClient.multi();
                 const fields = lockKey.offers.map((offer) => StockHolderRepository.offer2field(offer));
@@ -215,8 +226,10 @@ 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 });
+            const useMongoose = StockHolderRepository.useMongoose({ eventId: params.eventId, startDate: params.startDate });
+            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);
@@ -240,8 +253,6 @@ class StockHolderRepository {
                 // docが存在しなくてもよい
             }
             else {
-                const key = StockHolderRepository.createKey({ eventId: params.eventId, startDate: params.startDate });
-                yield this.checkIfConflicted({ key, eventId: params.eventId });
                 const field = StockHolderRepository.offer2field(params.offer);
                 yield this.redisClient.multi()
                     .hDel(key, field)
@@ -306,7 +317,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({ project: params.project, eventId: params.eventId, startDate: params.startDate });
+                // await this.initializeHoldReservation({ project: params.project, eventId: params.eventId, startDate: params.startDate });
                 const subReservation = StockHolderRepository.offer2subReservation(params.offer);
                 const matchStages = [
                     {
@@ -380,7 +391,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({ project: params.project, eventId: params.eventId, startDate: params.startDate });
+                // await this.initializeHoldReservation({ project: params.project, eventId: params.eventId, startDate: params.startDate });
                 const subReservations = params.offers.map((offer) => StockHolderRepository.offer2subReservation(offer));
                 const matchStages = [
                     {
@@ -535,29 +546,46 @@ class StockHolderRepository {
             // 旧キーと新キーの両方存在検証(念のため)
             const oldKey = StockHolderRepository.createKey({ eventId: params.eventId, startDate: new Date('2020-01-01T00:00:00Z') });
             const newKey = StockHolderRepository.createKey({ eventId: params.eventId, startDate: new Date('2030-01-01T00:00:00Z') });
-            if (params.key !== oldKey) {
+            if (params.useMongoose) {
+                // newもoldも存在するはずがない
                 // newの場合oldが存在するはずがない
                 const existingOldKeyCount = yield this.redisClient.exists(oldKey);
                 debug('existingOldKeyCount:', existingOldKeyCount);
                 if (existingOldKeyCount > 0) {
-                    throw new factory.errors.ServiceUnavailable('stockHolder keys conflicted');
+                    throw new factory.errors.ServiceUnavailable(`stockHolder storage conflicted. eventId:${params.eventId}`);
                 }
-            }
-            if (params.key !== newKey) {
                 //  oldの場合newが存在するはずがない
                 const existingNewKeyCount = yield this.redisClient.exists(newKey);
                 debug('existingNewKeyCount:', existingNewKeyCount);
                 if (existingNewKeyCount > 0) {
-                    throw new factory.errors.ServiceUnavailable('stockHolder keys conflicted');
+                    throw new factory.errors.ServiceUnavailable(`stockHolder storage conflicted. eventId:${params.eventId}`);
+                }
+            }
+            else {
+                // collectionにdocumentが存在するはずがない
+                const existingHoldReservationCount = yield this.holdReservationModel.count({ 'reservationFor.id': { $eq: params.eventId } })
+                    .exec();
+                debug('existingHoldReservationCount:', existingHoldReservationCount);
+                if (existingHoldReservationCount > 0) {
+                    throw new factory.errors.ServiceUnavailable(`stockHolder storage conflicted. eventId:${params.eventId}`);
+                }
+                if (params.key !== oldKey) {
+                    // newの場合oldが存在するはずがない
+                    const existingOldKeyCount = yield this.redisClient.exists(oldKey);
+                    debug('existingOldKeyCount:', existingOldKeyCount);
+                    if (existingOldKeyCount > 0) {
+                        throw new factory.errors.ServiceUnavailable(`stockHolder keys conflicted. eventId:${params.eventId}`);
+                    }
+                }
+                if (params.key !== newKey) {
+                    //  oldの場合newが存在するはずがない
+                    const existingNewKeyCount = yield this.redisClient.exists(newKey);
+                    debug('existingNewKeyCount:', existingNewKeyCount);
+                    if (existingNewKeyCount > 0) {
+                        throw new factory.errors.ServiceUnavailable(`stockHolder keys conflicted. eventId:${params.eventId}`);
+                    }
                 }
             }
-        });
-    }
-    // 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) {
@@ -575,12 +603,11 @@ class StockHolderRepository {
                 },
                 reservations: []
             };
-            const initializedHoldReservation = yield this.holdReservationModel.findOneAndUpdate({ 'reservationFor.id': { $eq: params.eventId } }, {
+            const initializedResult = yield this.holdReservationModel.updateOne({ 'reservationFor.id': { $eq: params.eventId } }, {
                 $setOnInsert: aggregateReservation
-            }, { new: true, upsert: true })
-                .select({ _id: 1 })
+            }, { upsert: true })
                 .exec();
-            debug('holdReservation initialized', initializedHoldReservation, params.eventId);
+            debug('holdReservation initialized', initializedResult, params.eventId);
         });
     }
 }

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