@chevre/domain 21.2.0-alpha.133 → 21.2.0-alpha.134

package/example/src/chevre/searchHoldReservations.ts

@@ -6,7 +6,7 @@ import * as redis from 'redis';
 import { chevre } from '../../../lib/index';
 
 async function main() {
-    await mongoose.connect(<string>process.env.MONGOLAB_URI, { autoIndex: false });
+    await mongoose.connect(<string>process.env.MONGOLAB_URI, { autoIndex: true });
     const client = redis.createClient<redis.RedisDefaultModules, Record<string, never>, Record<string, never>>({
         socket: {
             host: process.env.REDIS_HOST,

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

@@ -60,6 +60,7 @@ schema.index({ 'reservationFor.startDate': -1 }, { name: 'searchByReservationFor
 schema.index({ 'reservationFor.id': 1 }, { name: 'uniqueReservationForId', unique: true });
 schema.index({ 'reservationFor.id': 1, 'reservationFor.startDate': -1 }, { name: 'searchByReservationForId' });
 schema.index({ 'project.id': 1, 'reservationFor.startDate': -1 }, { name: 'searchByProjectId' });
+schema.index({ reservationCount: 1, 'reservationFor.startDate': -1 }, { name: 'searchByReservationCount' });
 schema.index({ 'reservations.reservationNumber': 1, 'reservationFor.startDate': -1 }, {
     name: 'searchByReservationNumber',
     partialFilterExpression: {

package/lib/chevre/repo/stockHolder.js

@@ -118,7 +118,7 @@ class StockHolderRepository {
                 }
                 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 { id } = 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, lockKey.hasTicketedSeat));
@@ -128,8 +128,9 @@ class StockHolderRepository {
                     subReservation: subReservations
                 };
                 yield this.holdReservationModel.findOneAndUpdate({
+                    _id: { $eq: id },
                     reservationCount: { $lte: reservationCountLte },
-                    'reservationFor.id': { $eq: lockKey.eventId },
+                    // 'reservationFor.id': { $eq: lockKey.eventId },
                     // 座席有無に関わらずsubReservation.identifierはuniqueであるはず
                     'reservations.subReservation.identifier': {
                         $nin: subReservations.map((r) => r.identifier)
@@ -177,7 +178,7 @@ class StockHolderRepository {
             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 { id } = 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, lockKey.hasTicketedSeat));
                 const reservationPackage = {
@@ -186,7 +187,8 @@ class StockHolderRepository {
                     subReservation: subReservations
                 };
                 yield this.holdReservationModel.findOneAndUpdate({
-                    'reservationFor.id': { $eq: lockKey.eventId },
+                    _id: { $eq: id },
+                    // 'reservationFor.id': { $eq: lockKey.eventId },
                     // 座席有無に関わらずsubReservation.identifierはuniqueであるはず
                     'reservations.subReservation.identifier': {
                         $nin: subReservations.map((r) => r.identifier)
@@ -727,11 +729,13 @@ class StockHolderRepository {
                 },
                 reservations: []
             };
-            const initializedResult = yield this.holdReservationModel.updateOne({ 'reservationFor.id': { $eq: params.eventId } }, {
+            const initializedResult = yield this.holdReservationModel.findOneAndUpdate({ 'reservationFor.id': { $eq: params.eventId } }, {
                 $setOnInsert: aggregateReservation
-            }, { upsert: true })
+            }, { new: true, upsert: true })
+                .select({ _id: 1 })
                 .exec();
             debug('holdReservation initialized', initializedResult, params.eventId);
+            return { id: initializedResult.id };
         });
     }
 }

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