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

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

@@ -128,17 +128,19 @@ export declare class MongoRepository {
             id: string;
         };
     }): Promise<void>;
-    createScreeningRoomSection(screeningRoomSection: IScreeningRoomSectionWithoutContainsPlace, useScreeningRoomType?: boolean): Promise<{
+    createScreeningRoomSection(screeningRoomSection: IScreeningRoomSectionWithoutContainsPlace, useScreeningRoomType: boolean): Promise<{
         /**
          * 施設ID
          */
         id: string;
         typeOf: factory.placeType.MovieTheater;
     } | {
-        /**
-         * ルームID
-         */
-        id: string;
+        containedInPlace: {
+            /**
+             * 施設ID
+             */
+            id: string;
+        };
         typeOf: factory.placeType.ScreeningRoom;
     }>;
     updateScreeningRoomSection(screeningRoomSection: Omit<factory.place.screeningRoomSection.IPlace, 'containedInPlace'> & {
@@ -148,17 +150,19 @@ export declare class MongoRepository {
                 branchCode: string;
             };
         };
-    }, $unset: any, useScreeningRoomType?: boolean): Promise<{
+    }, $unset: any, useScreeningRoomType: boolean): Promise<{
         /**
          * 施設ID
          */
         id: string;
         typeOf: factory.placeType.MovieTheater;
     } | {
-        /**
-         * ルームID
-         */
-        id: string;
+        containedInPlace: {
+            /**
+             * 施設ID
+             */
+            id: string;
+        };
         typeOf: factory.placeType.ScreeningRoom;
     }>;
     searchScreeningRoomSections(searchConditions: factory.place.screeningRoomSection.ISearchConditions & {
@@ -186,12 +190,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;
     }>;
     searchScreeningRooms(searchConditions: factory.place.screeningRoom.ISearchConditions, useScreeningRoomType: boolean): Promise<Omit<factory.place.screeningRoom.IPlace, 'containsPlace'>[]>;
     findScreeningRoomsByBranchCode(params: {
@@ -205,12 +217,20 @@ export declare class MongoRepository {
         };
         useScreeningRoomType: boolean;
     }): Promise<IScreeningRoomFoundByBranchCode>;
-    createSeat(seat: factory.place.seat.IPlace, useScreeningRoomType?: boolean): Promise<{
+    createSeat(seat: factory.place.seat.IPlace, useScreeningRoomType: boolean): Promise<{
         /**
          * 施設ID
          */
         id: string;
         typeOf: factory.placeType.MovieTheater;
+    } | {
+        containedInPlace: {
+            /**
+             * 施設ID
+             */
+            id: string;
+        };
+        typeOf: factory.placeType.ScreeningRoom;
     }>;
     updateSeat(seat: Omit<factory.place.seat.IPlace, 'containedInPlace'> & {
         containedInPlace: {
@@ -222,12 +242,20 @@ export declare class MongoRepository {
                 };
             };
         };
-    }, $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;
     }>;
     searchSeats(params: factory.place.seat.ISearchConditions, useScreeningRoomType: boolean): Promise<factory.place.seat.IPlace[]>;
     deleteSeat(seat: {
@@ -256,12 +284,20 @@ export declare class MongoRepository {
                 };
             };
         };
-    }, useScreeningRoomType?: boolean): Promise<{
+    }, useScreeningRoomType: boolean): Promise<{
         /**
          * 施設ID
          */
         id: string;
         typeOf: factory.placeType.MovieTheater;
+    } | {
+        containedInPlace: {
+            /**
+             * 施設ID
+             */
+            id: string;
+        };
+        typeOf: factory.placeType.ScreeningRoom;
     }>;
     syncScreeningRooms(params: {
         /**

package/lib/chevre/repo/place.js

@@ -631,7 +631,7 @@ class MongoRepository {
                     typeOf: { $eq: factory.placeType.ScreeningRoom },
                     'project.id': { $eq: screeningRoomSection.project.id },
                     'containedInPlace.branchCode': { $exists: true, $eq: movieTheater.branchCode },
-                    branchCode: screeningRoom.branchCode,
+                    branchCode: { $eq: screeningRoom.branchCode },
                     'containsPlace.branchCode': { $ne: screeningRoomSection.branchCode }
                 }, {
                     $push: {
@@ -641,7 +641,7 @@ class MongoRepository {
                     }
                 }, {
                     new: true,
-                    projection: { _id: 1, typeOf: 1 }
+                    projection: { 'containedInPlace.id': 1, typeOf: 1 }
                 })
                     .exec();
                 // 存在しなければコード重複
@@ -721,7 +721,7 @@ class MongoRepository {
                     arrayFilters: [
                         { 'screeningRoomSection.branchCode': screeningRoomSection.branchCode }
                     ],
-                    projection: { _id: 1, typeOf: 1 }
+                    projection: { 'containedInPlace.id': 1, typeOf: 1 }
                 })
                     .exec();
                 if (doc === null) {
@@ -1025,9 +1025,30 @@ class MongoRepository {
     deleteScreeningRoomSection(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 doc = yield this.placeModel.findOneAndUpdate({
+                    typeOf: { $eq: factory.placeType.ScreeningRoom },
+                    'project.id': { $eq: screeningRoomSection.project.id },
+                    'containedInPlace.branchCode': {
+                        $exists: true,
+                        $eq: screeningRoomSection.containedInPlace.containedInPlace.branchCode
+                    },
+                    branchCode: { $eq: screeningRoomSection.containedInPlace.branchCode },
+                    'containsPlace.branchCode': { $eq: screeningRoomSection.branchCode }
+                }, {
+                    $pull: {
+                        containsPlace: {
+                            branchCode: screeningRoomSection.branchCode
+                        }
+                    }
+                }, {
+                    new: true,
+                    projection: { 'containedInPlace.id': 1, typeOf: 1 }
+                })
+                    .exec();
+                if (doc === null) {
+                    throw new factory.errors.NotFound(factory.placeType.ScreeningRoomSection);
+                }
+                return doc.toObject();
             }
             else {
                 const doc = yield this.placeModel.findOneAndUpdate({
@@ -1462,41 +1483,65 @@ class MongoRepository {
             }
         });
     }
+    // tslint:disable-next-line:max-func-body-length
     createSeat(seat, useScreeningRoomType) {
-        var _a, _b;
+        var _a, _b, _c, _d;
         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 screeningRoomSection = seat.containedInPlace;
+            if (typeof (screeningRoomSection === null || screeningRoomSection === void 0 ? void 0 : screeningRoomSection.branchCode) !== 'string') {
+                throw new factory.errors.ArgumentNull('containedInPlace.branchCode');
             }
-            else {
-                const screeningRoomSection = seat.containedInPlace;
-                if (typeof (screeningRoomSection === null || screeningRoomSection === void 0 ? void 0 : screeningRoomSection.branchCode) !== 'string') {
-                    throw new factory.errors.ArgumentNull('containedInPlace.branchCode');
-                }
-                const screeningRoom = screeningRoomSection.containedInPlace;
-                if (typeof (screeningRoom === null || screeningRoom === void 0 ? void 0 : screeningRoom.branchCode) !== 'string') {
-                    throw new factory.errors.ArgumentNull('containedInPlace.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.containedInPlace.branchCode');
-                }
-                // 施設存在確認
-                let doc = yield this.placeModel.findOne({
-                    typeOf: { $eq: factory.placeType.MovieTheater },
+            const screeningRoom = screeningRoomSection.containedInPlace;
+            if (typeof (screeningRoom === null || screeningRoom === void 0 ? void 0 : screeningRoom.branchCode) !== 'string') {
+                throw new factory.errors.ArgumentNull('containedInPlace.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.containedInPlace.branchCode');
+            }
+            // 施設存在確認
+            let doc = yield this.placeModel.findOne({
+                typeOf: { $eq: factory.placeType.MovieTheater },
+                'project.id': { $eq: seat.project.id },
+                branchCode: movieTheater.branchCode,
+                'containsPlace.branchCode': screeningRoom.branchCode,
+                'containsPlace.containsPlace.branchCode': screeningRoomSection.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: seat.project.id },
-                    branchCode: movieTheater.branchCode,
-                    'containsPlace.branchCode': screeningRoom.branchCode,
-                    'containsPlace.containsPlace.branchCode': screeningRoomSection.branchCode
+                    'containedInPlace.branchCode': { $exists: true, $eq: movieTheater.branchCode },
+                    branchCode: { $eq: screeningRoom.branchCode },
+                    'containsPlace.branchCode': { $eq: screeningRoomSection.branchCode }
+                }, {
+                    $push: {
+                        'containsPlace.$[screeningRoomSection].containsPlace': Object.assign(Object.assign({ typeOf: seat.typeOf, branchCode: seat.branchCode, additionalProperty: seat.additionalProperty }, (typeof ((_a = seat.name) === null || _a === void 0 ? void 0 : _a.ja) === 'string' || typeof ((_b = seat.name) === null || _b === void 0 ? void 0 : _b.en) === 'string') ? { name: seat.name } : undefined), (Array.isArray(seat.seatingType)) ? { seatingType: seat.seatingType } : undefined)
+                    }
                 }, {
-                    _id: 1
+                    new: true,
+                    arrayFilters: [
+                        {
+                            'screeningRoomSection.branchCode': { $eq: screeningRoomSection.branchCode },
+                            'screeningRoomSection.containsPlace.branchCode': { $ne: seat.branchCode }
+                        }
+                    ],
+                    projection: { 'containedInPlace.id': 1, typeOf: 1 }
                 })
                     .exec();
+                // 存在しなければコード重複
                 if (doc === null) {
-                    throw new factory.errors.NotFound(factory.placeType.MovieTheater);
+                    throw new factory.errors.AlreadyInUse(factory.placeType.Seat, ['branchCode']);
                 }
+                return doc.toObject();
+            }
+            else {
                 doc = yield this.placeModel.findOneAndUpdate({
                     typeOf: { $eq: factory.placeType.MovieTheater },
                     'project.id': { $eq: seat.project.id },
@@ -1505,7 +1550,7 @@ class MongoRepository {
                     'containsPlace.containsPlace.branchCode': screeningRoomSection.branchCode
                 }, {
                     $push: {
-                        'containsPlace.$[screeningRoom].containsPlace.$[screeningRoomSection].containsPlace': Object.assign(Object.assign({ typeOf: seat.typeOf, branchCode: seat.branchCode, additionalProperty: seat.additionalProperty }, (typeof ((_a = seat.name) === null || _a === void 0 ? void 0 : _a.ja) === 'string' || typeof ((_b = seat.name) === null || _b === void 0 ? void 0 : _b.en) === 'string') ? { name: seat.name } : undefined), (Array.isArray(seat.seatingType)) ? { seatingType: seat.seatingType } : undefined)
+                        'containsPlace.$[screeningRoom].containsPlace.$[screeningRoomSection].containsPlace': Object.assign(Object.assign({ typeOf: seat.typeOf, branchCode: seat.branchCode, additionalProperty: seat.additionalProperty }, (typeof ((_c = seat.name) === null || _c === void 0 ? void 0 : _c.ja) === 'string' || typeof ((_d = seat.name) === null || _d === void 0 ? void 0 : _d.en) === 'string') ? { name: seat.name } : undefined), (Array.isArray(seat.seatingType)) ? { seatingType: seat.seatingType } : undefined)
                     }
                 }, {
                     new: true,
@@ -1518,7 +1563,6 @@ class MongoRepository {
                     ],
                     projection: {
                         _id: 1,
-                        // 'project.id': 1,
                         branchCode: 1,
                         typeOf: 1
                     }
@@ -1532,27 +1576,69 @@ class MongoRepository {
             }
         });
     }
+    // tslint:disable-next-line:cyclomatic-complexity max-func-body-length
     updateSeat(seat, $unset, useScreeningRoomType) {
-        var _a, _b;
+        var _a, _b, _c, _d;
         return __awaiter(this, void 0, void 0, function* () {
+            const screeningRoomSection = seat.containedInPlace;
+            if (typeof (screeningRoomSection === null || screeningRoomSection === void 0 ? void 0 : screeningRoomSection.branchCode) !== 'string') {
+                throw new factory.errors.ArgumentNull('containedInPlace.branchCode');
+            }
+            const screeningRoom = screeningRoomSection.containedInPlace;
+            if (typeof (screeningRoom === null || screeningRoom === void 0 ? void 0 : screeningRoom.branchCode) !== 'string') {
+                throw new factory.errors.ArgumentNull('containedInPlace.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.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: seat.project.id },
+                    'containedInPlace.branchCode': { $exists: true, $eq: movieTheater.branchCode },
+                    branchCode: { $eq: screeningRoom.branchCode },
+                    'containsPlace.branchCode': { $eq: screeningRoomSection.branchCode },
+                    'containsPlace.containsPlace.branchCode': { $eq: seat.branchCode }
+                }, Object.assign(Object.assign(Object.assign(Object.assign({ 'containsPlace.$[screeningRoomSection].containsPlace.$[seat].branchCode': seat.branchCode }, (typeof ((_a = seat.name) === null || _a === void 0 ? void 0 : _a.ja) === 'string' || typeof ((_b = seat.name) === null || _b === void 0 ? void 0 : _b.en) === 'string')
+                    ? {
+                        'containsPlace.$[screeningRoomSection].containsPlace.$[seat].name': seat.name
+                    }
+                    : undefined), (Array.isArray(seat.seatingType))
+                    ? {
+                        'containsPlace.$[screeningRoomSection].containsPlace.$[seat].seatingType': seat.seatingType
+                    }
+                    : undefined), (Array.isArray(seat.additionalProperty))
+                    ? {
+                        'containsPlace.$[screeningRoomSection].containsPlace.$[seat].additionalProperty': seat.additionalProperty
+                    }
+                    : undefined), { $unset: Object.assign(Object.assign({ noExistingAttributeName: 1 }, (($unset === null || $unset === void 0 ? void 0 : $unset['containsPlace.$[screeningRoom].containsPlace.$[screeningRoomSection].containsPlace.$[seat].name'])
+                        === 1
+                        || ($unset === null || $unset === void 0 ? void 0 : $unset['containsPlace.$[screeningRoomSection].containsPlace.$[seat].name']) === 1)
+                        ? {
+                            'containsPlace.$[screeningRoomSection].containsPlace.$[seat].name': 1
+                        }
+                        : undefined), (($unset === null || $unset === void 0 ? void 0 : $unset['containsPlace.$[screeningRoom].containsPlace.$[screeningRoomSection].containsPlace.$[seat].seatingType'])
+                        === 1
+                        || ($unset === null || $unset === void 0 ? void 0 : $unset['containsPlace.$[screeningRoomSection].containsPlace.$[seat].seatingType']) === 1)
+                        ? {
+                            'containsPlace.$[screeningRoomSection].containsPlace.$[seat].seatingType': 1
+                        }
+                        : undefined) }), {
+                    new: true,
+                    arrayFilters: [
+                        { 'screeningRoomSection.branchCode': { $eq: screeningRoomSection.branchCode } },
+                        { 'seat.branchCode': { $eq: seat.branchCode } }
+                    ],
+                    projection: { 'containedInPlace.id': 1, typeOf: 1 }
+                })
+                    .exec();
+                if (doc === null) {
+                    throw new factory.errors.NotFound(factory.placeType.Seat);
+                }
+                return doc.toObject();
             }
             else {
-                const screeningRoomSection = seat.containedInPlace;
-                if (typeof (screeningRoomSection === null || screeningRoomSection === void 0 ? void 0 : screeningRoomSection.branchCode) !== 'string') {
-                    throw new factory.errors.ArgumentNull('containedInPlace.branchCode');
-                }
-                const screeningRoom = screeningRoomSection.containedInPlace;
-                if (typeof (screeningRoom === null || screeningRoom === void 0 ? void 0 : screeningRoom.branchCode) !== 'string') {
-                    throw new factory.errors.ArgumentNull('containedInPlace.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.containedInPlace.branchCode');
-                }
                 const doc = yield this.placeModel.findOneAndUpdate({
                     typeOf: { $eq: factory.placeType.MovieTheater },
                     'project.id': { $eq: seat.project.id },
@@ -1560,7 +1646,7 @@ class MongoRepository {
                     'containsPlace.branchCode': screeningRoom.branchCode,
                     'containsPlace.containsPlace.branchCode': screeningRoomSection.branchCode,
                     'containsPlace.containsPlace.containsPlace.branchCode': seat.branchCode
-                }, Object.assign(Object.assign(Object.assign(Object.assign({ 'containsPlace.$[screeningRoom].containsPlace.$[screeningRoomSection].containsPlace.$[seat].branchCode': seat.branchCode }, (typeof ((_a = seat.name) === null || _a === void 0 ? void 0 : _a.ja) === 'string' || typeof ((_b = seat.name) === null || _b === void 0 ? void 0 : _b.en) === 'string')
+                }, Object.assign(Object.assign(Object.assign(Object.assign({ 'containsPlace.$[screeningRoom].containsPlace.$[screeningRoomSection].containsPlace.$[seat].branchCode': seat.branchCode }, (typeof ((_c = seat.name) === null || _c === void 0 ? void 0 : _c.ja) === 'string' || typeof ((_d = seat.name) === null || _d === void 0 ? void 0 : _d.en) === 'string')
                     ? {
                         'containsPlace.$[screeningRoom].containsPlace.$[screeningRoomSection].containsPlace.$[seat].name': seat.name
                     }
@@ -1965,9 +2051,34 @@ class MongoRepository {
     deleteSeat(seat, 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: seat.project.id },
+                    'containedInPlace.branchCode': {
+                        $exists: true,
+                        $eq: seat.containedInPlace.containedInPlace.containedInPlace.branchCode
+                    },
+                    branchCode: { $eq: seat.containedInPlace.containedInPlace.branchCode },
+                    'containsPlace.branchCode': { $eq: seat.containedInPlace.branchCode },
+                    'containsPlace.containsPlace.branchCode': { $eq: seat.branchCode }
+                }, {
+                    $pull: {
+                        'containsPlace.$[screeningRoomSection].containsPlace': {
+                            branchCode: seat.branchCode
+                        }
+                    }
+                }, {
+                    new: true,
+                    arrayFilters: [
+                        { 'screeningRoomSection.branchCode': { $eq: seat.containedInPlace.branchCode } }
+                    ],
+                    projection: { 'containedInPlace.id': 1, typeOf: 1 }
+                })
+                    .exec();
+                if (doc === null) {
+                    throw new factory.errors.NotFound(factory.placeType.Seat);
+                }
+                return doc.toObject();
             }
             else {
                 const doc = yield this.placeModel.findOneAndUpdate({

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