@chevre/domain 21.2.0-alpha.132 → 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/mongoose/schemas/place.d.ts

@@ -73,6 +73,8 @@ declare const schema: Schema<any, import("mongoose").Model<any, any, any, any, a
     smokingAllowed?: boolean | undefined;
     sameAs?: string | undefined;
     parentOrganization?: any;
+    openSeatingAllowed?: any;
+    amenityFeature?: any;
 }, import("mongoose").Document<unknown, {}, import("mongoose").FlatRecord<{
     typeOf: string;
     additionalProperty: any[];
@@ -95,6 +97,8 @@ declare const schema: Schema<any, import("mongoose").Model<any, any, any, any, a
     smokingAllowed?: boolean | undefined;
     sameAs?: string | undefined;
     parentOrganization?: any;
+    openSeatingAllowed?: any;
+    amenityFeature?: any;
 }>> & Omit<import("mongoose").FlatRecord<{
     typeOf: string;
     additionalProperty: any[];
@@ -117,6 +121,8 @@ declare const schema: Schema<any, import("mongoose").Model<any, any, any, any, a
     smokingAllowed?: boolean | undefined;
     sameAs?: string | undefined;
     parentOrganization?: any;
+    openSeatingAllowed?: any;
+    amenityFeature?: any;
 }> & {
     _id: import("mongoose").Types.ObjectId;
 }, never>>;

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

@@ -32,7 +32,10 @@ const schema = new mongoose_1.Schema({
     kanaName: String,
     offers: mongoose_1.SchemaTypes.Mixed,
     additionalProperty: [mongoose_1.SchemaTypes.Mixed],
-    parentOrganization: mongoose_1.SchemaTypes.Mixed
+    parentOrganization: mongoose_1.SchemaTypes.Mixed,
+    // ↓ルームの施設からの分離に伴い属性追加(2023-06-22~)
+    openSeatingAllowed: mongoose_1.SchemaTypes.Mixed,
+    amenityFeature: mongoose_1.SchemaTypes.Mixed
 }, {
     collection: 'places',
     id: true,
@@ -132,3 +135,15 @@ schema.index({ 'containsPlace.containsPlace.containsPlace.additionalProperty': 1
         'containsPlace.containsPlace.containsPlace.additionalProperty': { $exists: true }
     }
 });
+schema.index({ 'containedInPlace.id': 1, branchCode: 1 }, {
+    name: 'searchByContainedInPlaceId',
+    partialFilterExpression: {
+        'containedInPlace.id': { $exists: true }
+    }
+});
+schema.index({ 'containedInPlace.branchCode': 1, branchCode: 1 }, {
+    name: 'searchByContainedInPlaceBranchCode',
+    partialFilterExpression: {
+        'containedInPlace.branchCode': { $exists: true }
+    }
+});

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/lib/chevre/service/aggregation/event/aggregateUseActionsOnEvent.js

@@ -56,16 +56,25 @@ function findEntranceGates(params) {
     return (repos) => __awaiter(this, void 0, void 0, function* () {
         let movieTheater;
         try {
-            movieTheater = yield repos.place.findById({ id: params.event.superEvent.location.id }, 
-            // 不要な属性を取得しない
-            ['hasEntranceGate'], []
-            // {
-            //     containsPlace: 0,
-            //     hasPOS: 0,
-            //     offers: 0,
-            //     parentOrganization: 0
-            // }
-            );
+            const searchMovieTheatersResult = yield repos.place.searchMovieTheaters({
+                limit: 1,
+                page: 1,
+                id: { $eq: params.event.superEvent.location.id },
+                $projection: {
+                    containsPlace: 0,
+                    hasPOS: 0,
+                    offers: 0,
+                    parentOrganization: 0,
+                    name: 0
+                }
+            });
+            movieTheater = searchMovieTheatersResult.shift();
+            // movieTheater = await repos.place.findById(
+            //     { id: params.event.superEvent.location.id },
+            //     // 不要な属性を取得しない
+            //     ['hasEntranceGate'],
+            //     []
+            // );
         }
         catch (error) {
             let throwsError = true;

package/lib/chevre/service/task/onResourceUpdated.js

@@ -66,6 +66,13 @@ function onResourceUpdated(params) {
                         ids: params.id,
                         typeOf: params.typeOf
                     })(repos);
+                    // tslint:disable-next-line:no-suspicious-comment
+                    // TODO ルーム同期タスクを作成
+                    yield syncScreeningRooms({
+                        project: { id: params.project.id },
+                        ids: params.id,
+                        typeOf: params.typeOf
+                    })(repos);
                     break;
                 case 'AccountTitle':
                     yield createInformAccountTitleTasks({
@@ -235,17 +242,29 @@ function createInformMovieTheaterTasks(params) {
             'project',
             'telephone',
             'url',
-            'typeOf',
-            'containsPlace.branchCode',
-            'containsPlace.name',
-            'containsPlace.typeOf',
-            'containsPlace.additionalProperty',
-            'containsPlace.address'
+            'typeOf'
+            // 'containsPlace.branchCode',
+            // 'containsPlace.name',
+            // 'containsPlace.typeOf',
+            // 'containsPlace.additionalProperty',
+            // 'containsPlace.address'
         ], []);
         if (movieTheater.project.id !== params.project.id) {
             throw new factory.errors.Argument('project.id', 'project.id not matched');
         }
-        const movieTheaters4inform = [movieTheater];
+        // ルームを検索
+        const screeningRooms = yield repos.place.searchScreeningRooms({
+            containedInPlace: { id: { $eq: movieTheater.id } }
+        });
+        const movieTheaters4inform = [Object.assign(Object.assign({}, movieTheater), { containsPlace: screeningRooms.map((room) => {
+                    return {
+                        branchCode: room.branchCode,
+                        name: room.name,
+                        typeOf: room.typeOf,
+                        additionalProperty: room.additionalProperty,
+                        address: room.address
+                    };
+                }) })];
         if (movieTheaters4inform.length > 0) {
             const taskRunsAt = new Date();
             const informTasks = [];
@@ -350,3 +369,35 @@ function createInformAccountTitleTasks(params) {
         }
     });
 }
+function syncScreeningRooms(__) {
+    return (__2) => __awaiter(this, void 0, void 0, function* () {
+        // if (params.ids.length !== 1) {
+        //     throw new factory.errors.Argument('id', 'id.length must be 1');
+        // }
+        // const movieTheater = await repos.place.findById(
+        //     { id: params.ids[0] },
+        //     [
+        //         'additionalProperty',
+        //         'branchCode',
+        //         'hasEntranceGate',
+        //         'hasPOS',
+        //         'kanaName',
+        //         'name',
+        //         'parentOrganization',
+        //         'project',
+        //         'telephone',
+        //         'url',
+        //         'typeOf',
+        //         'containsPlace.branchCode',
+        //         'containsPlace.name',
+        //         'containsPlace.typeOf',
+        //         'containsPlace.additionalProperty',
+        //         'containsPlace.address'
+        //     ],
+        //     []
+        // );
+        // if (movieTheater.project.id !== params.project.id) {
+        //     throw new factory.errors.Argument('project.id', 'project.id not matched');
+        // }
+    });
+}

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