@chevre/domain 21.2.0-alpha.146 → 21.2.0-alpha.148

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

@@ -50,23 +50,43 @@ export declare class MongoRepository {
     deleteMovieTheaterById(params: {
         id: string;
     }): Promise<void>;
-    createScreeningRoom(screeningRoom: Omit<factory.place.screeningRoom.IPlace, 'containsPlace'>, useScreeningRoomType?: boolean): Promise<{
+    createScreeningRoom(screeningRoom: Omit<factory.place.screeningRoom.IPlace, 'containedInPlace' | 'containsPlace'> & {
+        containedInPlace: {
+            branchCode: string;
+        };
+    }, useScreeningRoomType: boolean): Promise<{
         /**
          * 施設ID
          */
         id: string;
         typeOf: factory.placeType.MovieTheater;
+    } | {
+        containedInPlace: {
+            /**
+             * 施設ID
+             */
+            id: string;
+        };
+        typeOf: factory.placeType.ScreeningRoom;
     }>;
     updateScreeningRoom(screeningRoom: Omit<factory.place.screeningRoom.IPlace, 'containedInPlace' | 'containsPlace'> & {
         containedInPlace: {
             branchCode: string;
         };
-    }, $unset: any, useScreeningRoomType?: boolean): Promise<{
+    }, $unset: any, useScreeningRoomType: boolean): Promise<{
         /**
          * 施設ID
          */
         id: string;
         typeOf: factory.placeType.MovieTheater;
+    } | {
+        containedInPlace: {
+            /**
+             * 施設ID
+             */
+            id: string;
+        };
+        typeOf: factory.placeType.ScreeningRoom;
     }>;
     deleteScreeningRoom(screeningRoom: {
         project: {
@@ -82,12 +102,20 @@ export declare class MongoRepository {
              */
             branchCode: string;
         };
-    }, useScreeningRoomType?: boolean): Promise<{
+    }, useScreeningRoomType: boolean): Promise<{
         /**
          * 施設ID
          */
         id: string;
         typeOf: factory.placeType.MovieTheater;
+    } | {
+        containedInPlace: {
+            /**
+             * 施設ID
+             */
+            id: string;
+        };
+        typeOf: factory.placeType.ScreeningRoom;
     }>;
     deleteScreeningRoomsByMovieTheaterId(params: {
         project: {
@@ -106,6 +134,12 @@ export declare class MongoRepository {
          */
         id: string;
         typeOf: factory.placeType.MovieTheater;
+    } | {
+        /**
+         * ルームID
+         */
+        id: string;
+        typeOf: factory.placeType.ScreeningRoom;
     }>;
     updateScreeningRoomSection(screeningRoomSection: Omit<factory.place.screeningRoomSection.IPlace, 'containedInPlace'> & {
         containedInPlace: {
@@ -120,6 +154,12 @@ export declare class MongoRepository {
          */
         id: string;
         typeOf: factory.placeType.MovieTheater;
+    } | {
+        /**
+         * ルームID
+         */
+        id: string;
+        typeOf: factory.placeType.ScreeningRoom;
     }>;
     searchScreeningRoomSections(searchConditions: factory.place.screeningRoomSection.ISearchConditions & {
         $projection?: {

package/lib/chevre/repo/place.js

@@ -416,24 +416,45 @@ class MongoRepository {
     }
     createScreeningRoom(screeningRoom, useScreeningRoomType) {
         return __awaiter(this, void 0, void 0, function* () {
-            if (useScreeningRoomType === true) {
-                // tslint:disable-next-line:no-suspicious-comment
-                // TODO implement
-                throw new factory.errors.NotImplemented('useScreeningRoomType not implemented');
+            // 施設存在確認
+            let doc = yield this.placeModel.findOne({
+                typeOf: { $eq: factory.placeType.MovieTheater },
+                'project.id': { $eq: screeningRoom.project.id },
+                branchCode: { $eq: screeningRoom.containedInPlace.branchCode }
+            }, { _id: 1, typeOf: 1, branchCode: 1, name: 1 })
+                .exec();
+            if (doc === null) {
+                throw new factory.errors.NotFound(factory.placeType.MovieTheater);
             }
-            else {
-                // 施設存在確認
-                let doc = yield this.placeModel.findOne({
-                    typeOf: { $eq: factory.placeType.MovieTheater },
-                    'project.id': { $eq: screeningRoom.project.id },
-                    branchCode: screeningRoom.containedInPlace.branchCode
-                }, {
-                    _id: 1
-                })
+            if (useScreeningRoomType === true) {
+                const movieTheater = doc.toObject();
+                const creatingScreeningRoom = Object.assign({ typeOf: screeningRoom.typeOf, branchCode: screeningRoom.branchCode, name: screeningRoom.name, address: screeningRoom.address, additionalProperty: (Array.isArray(screeningRoom.additionalProperty)) ? screeningRoom.additionalProperty : [], containedInPlace: {
+                        id: movieTheater.id,
+                        typeOf: movieTheater.typeOf,
+                        branchCode: movieTheater.branchCode,
+                        name: movieTheater.name
+                    }, containsPlace: [], project: screeningRoom.project }, (typeof screeningRoom.openSeatingAllowed === 'boolean')
+                    ? { openSeatingAllowed: screeningRoom.openSeatingAllowed }
+                    : undefined);
+                const upsertScreeningRoomResult = yield this.placeModel.updateOne({
+                    typeOf: { $eq: factory.placeType.ScreeningRoom },
+                    'project.id': { $eq: creatingScreeningRoom.project.id },
+                    'containedInPlace.id': { $exists: true, $eq: creatingScreeningRoom.containedInPlace.id },
+                    branchCode: { $eq: creatingScreeningRoom.branchCode }
+                }, 
+                // 既存であれば何もしない
+                { $setOnInsert: creatingScreeningRoom }, { upsert: true })
                     .exec();
-                if (doc === null) {
-                    throw new factory.errors.NotFound('containedInPlace');
+                // 既存であればコード重複
+                if (upsertScreeningRoomResult.matchedCount > 0) {
+                    throw new factory.errors.AlreadyInUse(factory.placeType.ScreeningRoom, ['branchCode']);
                 }
+                return {
+                    containedInPlace: { id: creatingScreeningRoom.containedInPlace.id },
+                    typeOf: factory.placeType.ScreeningRoom
+                };
+            }
+            else {
                 // ルームコードが存在しなければ追加する
                 doc = yield this.placeModel.findOneAndUpdate({
                     typeOf: { $eq: factory.placeType.MovieTheater },
@@ -454,7 +475,6 @@ class MongoRepository {
                     new: true,
                     projection: {
                         _id: 1,
-                        // 'project.id': 1,
                         branchCode: 1,
                         typeOf: 1
                     }
@@ -471,9 +491,33 @@ class MongoRepository {
     updateScreeningRoom(screeningRoom, $unset, useScreeningRoomType) {
         return __awaiter(this, void 0, void 0, function* () {
             if (useScreeningRoomType === true) {
-                // tslint:disable-next-line:no-suspicious-comment
-                // TODO implement
-                throw new factory.errors.NotImplemented('useScreeningRoomType not implemented');
+                const doc = yield this.placeModel.findOneAndUpdate({
+                    typeOf: { $eq: factory.placeType.ScreeningRoom },
+                    'project.id': { $eq: screeningRoom.project.id },
+                    'containedInPlace.branchCode': { $exists: true, $eq: screeningRoom.containedInPlace.branchCode },
+                    branchCode: screeningRoom.branchCode
+                }, Object.assign(Object.assign(Object.assign(Object.assign({ name: screeningRoom.name }, (screeningRoom.address !== undefined && screeningRoom.address !== null)
+                    ? { address: screeningRoom.address }
+                    : undefined), (typeof screeningRoom.openSeatingAllowed === 'boolean')
+                    ? { openSeatingAllowed: screeningRoom.openSeatingAllowed }
+                    : undefined), (Array.isArray(screeningRoom.additionalProperty))
+                    ? { additionalProperty: screeningRoom.additionalProperty }
+                    : undefined), (($unset === null || $unset === void 0 ? void 0 : $unset['containsPlace.$[screeningRoom].openSeatingAllowed']) === 1
+                    || $unset.openSeatingAllowed === 1)
+                    ? {
+                        $unset: {
+                            openSeatingAllowed: 1
+                        }
+                    }
+                    : undefined), {
+                    new: true,
+                    projection: { 'containedInPlace.id': 1, typeOf: 1 }
+                })
+                    .exec();
+                if (doc === null) {
+                    throw new factory.errors.NotFound(factory.placeType.ScreeningRoom);
+                }
+                return doc.toObject();
             }
             else {
                 const doc = yield this.placeModel.findOneAndUpdate({
@@ -496,7 +540,6 @@ class MongoRepository {
                     ],
                     projection: {
                         _id: 1,
-                        // 'project.id': 1,
                         branchCode: 1,
                         typeOf: 1
                     }
@@ -512,9 +555,19 @@ class MongoRepository {
     deleteScreeningRoom(screeningRoom, useScreeningRoomType) {
         return __awaiter(this, void 0, void 0, function* () {
             if (useScreeningRoomType === true) {
-                // tslint:disable-next-line:no-suspicious-comment
-                // TODO implement
-                throw new factory.errors.NotImplemented('useScreeningRoomType not implemented');
+                const doc = yield this.placeModel.findOneAndDelete({
+                    typeOf: { $eq: factory.placeType.ScreeningRoom },
+                    'project.id': { $eq: screeningRoom.project.id },
+                    'containedInPlace.branchCode': { $exists: true, $eq: screeningRoom.containedInPlace.branchCode },
+                    branchCode: screeningRoom.branchCode
+                }, {
+                    projection: { 'containedInPlace.id': 1, typeOf: 1 }
+                })
+                    .exec();
+                if (doc === null) {
+                    throw new factory.errors.NotFound(factory.placeType.ScreeningRoom);
+                }
+                return doc.toObject();
             }
             else {
                 const doc = yield this.placeModel.findOneAndUpdate({
@@ -550,39 +603,59 @@ class MongoRepository {
                 .exec();
         });
     }
+    // tslint:disable-next-line:max-func-body-length
     createScreeningRoomSection(screeningRoomSection, useScreeningRoomType) {
         return __awaiter(this, void 0, void 0, function* () {
-            if (useScreeningRoomType === true) {
-                // tslint:disable-next-line:no-suspicious-comment
-                // TODO implement
-                throw new factory.errors.NotImplemented('useScreeningRoomType not implemented');
+            const screeningRoom = screeningRoomSection.containedInPlace;
+            if (typeof (screeningRoom === null || screeningRoom === void 0 ? void 0 : screeningRoom.branchCode) !== 'string') {
+                throw new factory.errors.ArgumentNull('containedInPlace.branchCode');
             }
-            else {
-                const screeningRoom = screeningRoomSection.containedInPlace;
-                if (typeof (screeningRoom === null || screeningRoom === void 0 ? void 0 : screeningRoom.branchCode) !== 'string') {
-                    throw new factory.errors.ArgumentNull('containedInPlace.branchCode');
-                }
-                const movieTheater = screeningRoom.containedInPlace;
-                if (typeof (movieTheater === null || movieTheater === void 0 ? void 0 : movieTheater.branchCode) !== 'string') {
-                    throw new factory.errors.ArgumentNull('containedInPlace.containedInPlace.branchCode');
-                }
-                // 施設存在確認
-                let doc = yield this.placeModel.findOne({
-                    typeOf: { $eq: factory.placeType.MovieTheater },
+            const movieTheater = screeningRoom.containedInPlace;
+            if (typeof (movieTheater === null || movieTheater === void 0 ? void 0 : movieTheater.branchCode) !== 'string') {
+                throw new factory.errors.ArgumentNull('containedInPlace.containedInPlace.branchCode');
+            }
+            // 施設存在確認
+            let doc = yield this.placeModel.findOne({
+                typeOf: { $eq: factory.placeType.MovieTheater },
+                'project.id': { $eq: screeningRoomSection.project.id },
+                branchCode: movieTheater.branchCode,
+                'containsPlace.branchCode': screeningRoom.branchCode
+            }, { _id: 1 })
+                .exec();
+            if (doc === null) {
+                throw new factory.errors.NotFound(factory.placeType.MovieTheater);
+            }
+            if (useScreeningRoomType === true) {
+                // セクションコードが存在しなければ追加する
+                doc = yield this.placeModel.findOneAndUpdate({
+                    typeOf: { $eq: factory.placeType.ScreeningRoom },
                     'project.id': { $eq: screeningRoomSection.project.id },
-                    branchCode: movieTheater.branchCode,
-                    'containsPlace.branchCode': screeningRoom.branchCode
-                }, { _id: 1 })
+                    'containedInPlace.branchCode': { $exists: true, $eq: movieTheater.branchCode },
+                    branchCode: screeningRoom.branchCode,
+                    'containsPlace.branchCode': { $ne: screeningRoomSection.branchCode }
+                }, {
+                    $push: {
+                        containsPlace: Object.assign({ typeOf: screeningRoomSection.typeOf, branchCode: screeningRoomSection.branchCode, name: screeningRoomSection.name }, (Array.isArray(screeningRoomSection.additionalProperty))
+                            ? { additionalProperty: screeningRoomSection.additionalProperty }
+                            : undefined)
+                    }
+                }, {
+                    new: true,
+                    projection: { _id: 1, typeOf: 1 }
+                })
                     .exec();
+                // 存在しなければコード重複
                 if (doc === null) {
-                    throw new factory.errors.NotFound(factory.placeType.MovieTheater);
+                    throw new factory.errors.AlreadyInUse(factory.placeType.ScreeningRoomSection, ['branchCode']);
                 }
+                return doc.toObject();
+            }
+            else {
                 doc = yield this.placeModel.findOneAndUpdate({
                     typeOf: { $eq: factory.placeType.MovieTheater },
                     'project.id': { $eq: screeningRoomSection.project.id },
                     branchCode: movieTheater.branchCode,
                     'containsPlace.branchCode': screeningRoom.branchCode
-                    // 'containsPlace.containsPlace.branchCode': { $ne: screeningRoomSection.branchCode }
                 }, {
                     $push: {
                         'containsPlace.$[screeningRoom].containsPlace': Object.assign({ typeOf: screeningRoomSection.typeOf, branchCode: screeningRoomSection.branchCode, name: screeningRoomSection.name }, (Array.isArray(screeningRoomSection.additionalProperty))
@@ -611,22 +684,52 @@ class MongoRepository {
             }
         });
     }
+    // tslint:disable-next-line:max-func-body-length
     updateScreeningRoomSection(screeningRoomSection, $unset, useScreeningRoomType) {
         return __awaiter(this, void 0, void 0, function* () {
+            const screeningRoom = screeningRoomSection.containedInPlace;
+            if (typeof (screeningRoom === null || screeningRoom === void 0 ? void 0 : screeningRoom.branchCode) !== 'string') {
+                throw new factory.errors.ArgumentNull('containedInPlace.branchCode');
+            }
+            const movieTheater = screeningRoom.containedInPlace;
+            if (typeof (movieTheater === null || movieTheater === void 0 ? void 0 : movieTheater.branchCode) !== 'string') {
+                throw new factory.errors.ArgumentNull('containedInPlace.containedInPlace.branchCode');
+            }
             if (useScreeningRoomType === true) {
-                // tslint:disable-next-line:no-suspicious-comment
-                // TODO implement
-                throw new factory.errors.NotImplemented('useScreeningRoomType not implemented');
+                const doc = yield this.placeModel.findOneAndUpdate({
+                    typeOf: { $eq: factory.placeType.ScreeningRoom },
+                    'project.id': { $eq: screeningRoomSection.project.id },
+                    'containedInPlace.branchCode': { $exists: true, $eq: movieTheater.branchCode },
+                    branchCode: { $eq: screeningRoom.branchCode },
+                    'containsPlace.branchCode': { $eq: screeningRoomSection.branchCode }
+                }, Object.assign(Object.assign(Object.assign(Object.assign({ 'containsPlace.$[screeningRoomSection].branchCode': screeningRoomSection.branchCode }, (screeningRoomSection.name !== undefined && screeningRoomSection !== null)
+                    ? {
+                        'containsPlace.$[screeningRoomSection].name': screeningRoomSection.name
+                    }
+                    : undefined), (Array.isArray(screeningRoomSection.additionalProperty))
+                    ? {
+                        'containsPlace.$[screeningRoomSection].additionalProperty': screeningRoomSection.additionalProperty
+                    }
+                    : undefined), (Array.isArray(screeningRoomSection.containsPlace) && screeningRoomSection.containsPlace.length > 0)
+                    ? {
+                        'containsPlace.$[screeningRoomSection].containsPlace': screeningRoomSection.containsPlace.map((p) => {
+                            return Object.assign(Object.assign(Object.assign({ typeOf: p.typeOf, branchCode: p.branchCode }, (p.name !== undefined && p.name !== null) ? { name: p.name } : undefined), (Array.isArray(p.seatingType)) ? { seatingType: p.seatingType } : undefined), (Array.isArray(p.additionalProperty)) ? { additionalProperty: p.additionalProperty } : undefined);
+                        })
+                    }
+                    : undefined), ($unset !== undefined && $unset !== null) ? { $unset } : undefined), {
+                    new: true,
+                    arrayFilters: [
+                        { 'screeningRoomSection.branchCode': screeningRoomSection.branchCode }
+                    ],
+                    projection: { _id: 1, typeOf: 1 }
+                })
+                    .exec();
+                if (doc === null) {
+                    throw new factory.errors.NotFound(factory.placeType.ScreeningRoomSection);
+                }
+                return doc.toObject();
             }
             else {
-                const screeningRoom = screeningRoomSection.containedInPlace;
-                if (typeof (screeningRoom === null || screeningRoom === void 0 ? void 0 : screeningRoom.branchCode) !== 'string') {
-                    throw new factory.errors.ArgumentNull('containedInPlace.branchCode');
-                }
-                const movieTheater = screeningRoom.containedInPlace;
-                if (typeof (movieTheater === null || movieTheater === void 0 ? void 0 : movieTheater.branchCode) !== 'string') {
-                    throw new factory.errors.ArgumentNull('containedInPlace.containedInPlace.branchCode');
-                }
                 const doc = yield this.placeModel.findOneAndUpdate({
                     typeOf: { $eq: factory.placeType.MovieTheater },
                     'project.id': { $eq: screeningRoomSection.project.id },
@@ -1270,8 +1373,6 @@ class MongoRepository {
     findScreeningRoomsByBranchCode(params) {
         return __awaiter(this, void 0, void 0, function* () {
             if (params.useScreeningRoomType === true) {
-                // tslint:disable-next-line:no-suspicious-comment
-                // TODO implement
                 const matchStages = [
                     { $match: { typeOf: { $eq: factory.placeType.ScreeningRoom } } },
                     {

package/lib/chevre/settings.js

@@ -67,7 +67,7 @@ exports.USE_NEW_EVENT_AVAILABILITY_KEY_FROM = (typeof process.env.USE_NEW_EVENT_
     : moment('2023-08-31T15:00:00Z');
 exports.USE_NEW_STOCK_HOLDER_REPO_FROM = (typeof process.env.USE_NEW_STOCK_HOLDER_REPO_FROM === 'string')
     ? moment(process.env.USE_NEW_STOCK_HOLDER_REPO_FROM)
-    : moment('2023-11-30T15:00:00Z');
+    : moment('2024-11-30T15:00:00Z');
 exports.USE_NEW_STOCK_HOLDER_REPO_IDS = (typeof process.env.USE_NEW_STOCK_HOLDER_REPO_IDS === 'string')
     ? process.env.USE_NEW_STOCK_HOLDER_REPO_IDS.split(' ')
     : [];

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