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

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/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.133"
 }