@chevre/domain 21.2.0-alpha.135 → 21.2.0-alpha.136

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

@@ -208,4 +208,8 @@ export declare class StockHolderRepository {
     }[]>;
     private checkIfConflicted;
     private initializeHoldReservation;
+    /**
+     * 仮で追加したholdReservationsが重複していないかどうか検証する
+     */
+    private checkIfAlreadyInUse;
 }

package/lib/chevre/repo/stockHolder.js

@@ -12,6 +12,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.StockHolderRepository = void 0;
 const createDebug = require("debug");
 const moment = require("moment");
+const mongoose_1 = require("mongoose");
 const factory = require("../factory");
 const holdReservation_1 = require("./mongoose/schemas/holdReservation");
 const settings_1 = require("../settings");
@@ -129,12 +130,12 @@ class StockHolderRepository {
                 };
                 yield this.holdReservationModel.findOneAndUpdate({
                     _id: { $eq: id },
-                    reservationCount: { $lte: reservationCountLte },
+                    reservationCount: { $lte: reservationCountLte }
                     // 'reservationFor.id': { $eq: lockKey.eventId },
                     // 座席有無に関わらずsubReservation.identifierはuniqueであるはず
-                    'reservations.subReservation.identifier': {
-                        $nin: subReservations.map((r) => r.identifier)
-                    }
+                    // 'reservations.subReservation.identifier': {
+                    //     $nin: subReservations.map((r) => r.identifier)
+                    // }
                 }, {
                     $inc: { reservationCount: addedReservationCount },
                     $push: { reservations: reservationPackage }
@@ -146,6 +147,8 @@ class StockHolderRepository {
                         throw new factory.errors.Argument('Event', 'maximumAttendeeCapacity exceeded');
                     }
                 });
+                // 重複検証
+                yield this.checkIfAlreadyInUse({ reservationPackage, id });
             }
             else {
                 const key = StockHolderRepository.createKey({ eventId: lockKey.eventId, startDate: lockKey.startDate });
@@ -164,6 +167,7 @@ class StockHolderRepository {
     /**
      * 座席をロックする
      */
+    // tslint:disable-next-line:max-func-body-length
     lock(lockKey) {
         return __awaiter(this, void 0, void 0, function* () {
             if (!(lockKey.expires instanceof Date)) {
@@ -186,24 +190,20 @@ class StockHolderRepository {
                     reservationNumber: lockKey.holder,
                     subReservation: subReservations
                 };
-                yield this.holdReservationModel.findOneAndUpdate({
-                    _id: { $eq: id },
+                yield this.holdReservationModel.updateOne({
+                    _id: { $eq: id }
                     // 'reservationFor.id': { $eq: lockKey.eventId },
                     // 座席有無に関わらずsubReservation.identifierはuniqueであるはず
-                    'reservations.subReservation.identifier': {
-                        $nin: subReservations.map((r) => r.identifier)
-                    }
+                    // 'reservations.subReservation.identifier': {
+                    //     $nin: subReservations.map((r) => r.identifier)
+                    // }
                 }, {
                     $inc: { reservationCount: addedReservationCount },
                     $push: { reservations: reservationPackage }
-                }, { new: true })
-                    .select({ _id: 1 })
-                    .exec()
-                    .then((doc) => {
-                    if (doc === null) {
-                        throw new factory.errors.AlreadyInUse(factory.reservationType.EventReservation, ['ticketedSeat'], 'Already hold');
-                    }
-                });
+                })
+                    .exec();
+                // 重複検証
+                yield this.checkIfAlreadyInUse({ reservationPackage, id });
             }
             else {
                 const value = lockKey.holder;
@@ -261,11 +261,12 @@ class StockHolderRepository {
             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 { id } = yield this.initializeHoldReservation({ project: params.project, eventId: params.eventId, startDate: params.startDate });
                 const subReservation = StockHolderRepository.offer2subReservation(params.offer, params.hasTicketedSeat);
                 const reservationNumber = params.holder;
                 const updateResult = yield this.holdReservationModel.findOneAndUpdate({
-                    'reservationFor.id': { $eq: params.eventId },
+                    _id: { $eq: id },
+                    // 'reservationFor.id': { $eq: params.eventId },
                     'reservations.reservationNumber': {
                         $exists: true,
                         $eq: reservationNumber
@@ -289,7 +290,8 @@ class StockHolderRepository {
                 debug('unlock processed. updateResult:', updateResult, 'reservationNumber:', reservationNumber, 'identifier:', subReservation.identifier);
                 // subReservationがemptyのreservationsをpull
                 const pullReservationPackageResult = yield this.holdReservationModel.findOneAndUpdate({
-                    'reservationFor.id': { $eq: params.eventId },
+                    _id: { $eq: id },
+                    // 'reservationFor.id': { $eq: params.eventId },
                     'reservations.reservationNumber': { $exists: true, $eq: reservationNumber }
                 }, {
                     $pull: {
@@ -738,6 +740,54 @@ class StockHolderRepository {
             return { id: initializedResult.id };
         });
     }
+    /**
+     * 仮で追加したholdReservationsが重複していないかどうか検証する
+     */
+    checkIfAlreadyInUse(params) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const objectId = new mongoose_1.Types.ObjectId(params.id);
+            const matchStages = [
+                { $match: { _id: { $eq: objectId } } },
+                {
+                    $match: {
+                        'reservations.subReservation.identifier': {
+                            $exists: true,
+                            $in: params.reservationPackage.subReservation.map((r) => r.identifier)
+                        }
+                    }
+                }
+            ];
+            const aggregate = this.holdReservationModel.aggregate([
+                { $unwind: '$reservations' },
+                { $unwind: '$reservations.subReservation' },
+                ...matchStages,
+                {
+                    $project: {
+                        _id: 0,
+                        reservationNumber: '$reservations.reservationNumber'
+                    }
+                },
+                {
+                    $group: {
+                        _id: '$reservationNumber'
+                    }
+                }
+            ]);
+            const subReservationsByDoc = yield aggregate.exec();
+            debug('checkIfAlreadyInUse:subReservationsByDoc:', subReservationsByDoc);
+            if (subReservationsByDoc.length > 1) {
+                // 仮追加したsubReservationsを削除
+                debug('canceling hold reservationPackage...reservationNumber:', params.reservationPackage.reservationNumber);
+                const updateOneResult = yield this.holdReservationModel.updateOne({ _id: { $eq: objectId } }, {
+                    $inc: { reservationCount: -params.reservationPackage.subReservation.length },
+                    $pull: { reservations: { reservationNumber: { $eq: params.reservationPackage.reservationNumber } } }
+                })
+                    .exec();
+                debug('hold reservationPackage canceled. reservationNumber:', params.reservationPackage.reservationNumber, updateOneResult);
+                throw new factory.errors.AlreadyInUse(factory.reservationType.EventReservation, ['ticketedSeat'], 'Already hold');
+            }
+        });
+    }
 }
 StockHolderRepository.KEY_PREFIX_NEW = 'stockHolder';
 StockHolderRepository.KEY_PREFIX = 'chevre:itemAvailability:screeningEvent';

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

package/example/src/chevre/findMovieTheaterById.ts

@@ -1,40 +0,0 @@
-// tslint:disable:no-console
-import * as mongoose from 'mongoose';
-
-import { chevre } from '../../../lib/index';
-
-// const PROJECT_ID = process.env.PROJECT_ID;
-
-async function main() {
-    await mongoose.connect(<string>process.env.MONGOLAB_URI, { autoIndex: false });
-
-    const placeRepo = new chevre.repository.Place(mongoose.connection);
-
-    const movieTheater = await placeRepo.findById(
-        { id: '5d1da6853736344e714efbb8' },
-        [
-            'additionalProperty',
-            'branchCode',
-            'hasEntranceGate',
-            'hasPOS',
-            'kanaName',
-            'name',
-            'parentOrganization',
-            'project',
-            'telephone',
-            'url',
-            'typeOf',
-            'containsPlace.branchCode',
-            'containsPlace.name',
-            'containsPlace.typeOf',
-            'containsPlace.additionalProperty',
-            'containsPlace.address'
-        ],
-        []
-    );
-    console.log('place found', movieTheater);
-}
-
-main()
-    .then(console.log)
-    .catch(console.error);