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

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

@@ -24,6 +24,7 @@ export interface IUnlockKey {
     eventId: string;
     startDate: Date;
     offer: IOffer;
+    holder: string;
 }
 export type IGetHolderResult = string | null;
 export interface ISubReservation {
@@ -94,7 +95,7 @@ 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"となるので注意

package/lib/chevre/repo/stockHolder.js

@@ -217,17 +217,23 @@ class StockHolderRepository {
                 // [id]あるいは[seatNumber+seatSection]でreservations.subReservationsから$pull+$incする
                 yield this.initializeHoldReservation({ 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 {

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

@@ -350,7 +350,8 @@ function processUnlockSeat(params) {
                 itemOffered: { serviceOutput: { id: reservation.id } },
                 seatNumber: '',
                 seatSection: ''
-            }
+            },
+            holder: params.expectedHolder
         };
         let holder = yield repos.stockHolder.getHolder(lockKey);
         if (holder === params.expectedHolder) {
@@ -365,7 +366,8 @@ function processUnlockSeat(params) {
                 offer: {
                     seatNumber: ticketedSeat.seatNumber,
                     seatSection: ticketedSeat.seatSection
-                }
+                },
+                holder: params.expectedHolder
             };
             holder = yield repos.stockHolder.getHolder(lockKey);
             if (holder === params.expectedHolder) {
@@ -386,7 +388,8 @@ function processUnlockSeat(params) {
                         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.121"
 }