@chevre/domain 23.2.0-alpha.8 → 23.2.0-alpha.9

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

@@ -1,6 +1,18 @@
 import type { AnyExpression, Connection, PipelineStage } from 'mongoose';
 import * as factory from '../../factory';
 type IMatchStage = PipelineStage.Match;
+type ICreatingSeat = Pick<factory.place.seat.IPlace, 'additionalProperty' | 'branchCode' | 'name' | 'maximumAttendeeCapacity' | 'seatingType'>;
+interface IUpdateOptions {
+    project: {
+        id: string;
+    };
+    parentOrganization?: {
+        id?: string;
+    };
+    movieTheaterCode: string;
+    roomCode: string;
+    sectionCode: string;
+}
 /**
  * 座席編集時レスポンス
  */
@@ -27,25 +39,8 @@ export declare class SeatRepo {
     static CREATE_MATCH_STAGES(params: factory.place.seat.ISearchConditions, options: {
         filterTypeOf: boolean;
     }): IMatchStage[];
-    createSeat(seat: factory.place.seat.IPlace & {
-        parentOrganization?: {
-            id?: string;
-        };
-    }): Promise<IUpdateSeatResult>;
-    updateSeat(seat: Omit<factory.place.seat.IPlace, 'containedInPlace'> & {
-        containedInPlace: {
-            branchCode: string;
-            containedInPlace: {
-                branchCode: string;
-                containedInPlace: {
-                    branchCode: string;
-                };
-            };
-        };
-        parentOrganization?: {
-            id?: string;
-        };
-    }, $unset: any): Promise<IUpdateSeatResult>;
+    createSeat(seat: ICreatingSeat, options: IUpdateOptions): Promise<IUpdateSeatResult>;
+    updateSeatByBranchCode(seat: ICreatingSeat, $unset: any, options: IUpdateOptions): Promise<IUpdateSeatResult>;
     searchSeats(params: factory.place.seat.ISearchConditions): Promise<factory.place.seat.IPlace[]>;
     projectSeatsByScreeningRoom(params: Pick<factory.place.seat.ISearchConditions, '$projection' | 'additionalProperty' | 'branchCode' | 'seatingType' | 'name' | 'limit' | 'page'> & {
         project: {
@@ -137,35 +132,11 @@ export declare class SeatRepo {
             };
         };
     }): Promise<string[]>;
-    deleteSeat(seat: {
-        project: {
-            id: string;
-        };
-        parentOrganization?: {
-            id?: string;
-        };
+    deleteSeatByBranchCode(seat: {
         /**
          * 座席コード
          */
         branchCode: string;
-        containedInPlace: {
-            /**
-             * セクションコード
-             */
-            branchCode: string;
-            containedInPlace: {
-                /**
-                 * ルームコード
-                 */
-                branchCode: string;
-                containedInPlace: {
-                    /**
-                     * 施設コード
-                     */
-                    branchCode: string;
-                };
-            };
-        };
-    }): Promise<IUpdateSeatResult>;
+    }, options: IUpdateOptions): Promise<IUpdateSeatResult>;
 }
 export {};

package/lib/chevre/repo/place/seat.js

@@ -226,24 +226,13 @@ class SeatRepo {
         return matchStages;
     }
     // tslint:disable-next-line:max-func-body-length
-    createSeat(seat) {
+    createSeat(seat, options) {
         return __awaiter(this, void 0, void 0, function* () {
-            var _a, _b, _c;
-            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');
-            }
+            var _a, _b;
+            const { project, parentOrganization, movieTheaterCode, roomCode, sectionCode } = options;
             // 施設存在確認
-            const movieTheaterDoc = yield this.civicStructureModel.findOne(Object.assign({ typeOf: { $eq: factory.placeType.MovieTheater }, 'project.id': { $eq: seat.project.id }, branchCode: { $eq: movieTheater.branchCode } }, (typeof ((_a = seat.parentOrganization) === null || _a === void 0 ? void 0 : _a.id) === 'string')
-                ? { 'parentOrganization.id': { $exists: true, $eq: seat.parentOrganization.id } }
+            const movieTheaterDoc = yield this.civicStructureModel.findOne(Object.assign({ typeOf: { $eq: factory.placeType.MovieTheater }, 'project.id': { $eq: project.id }, branchCode: { $eq: movieTheaterCode } }, (typeof (parentOrganization === null || parentOrganization === void 0 ? void 0 : parentOrganization.id) === 'string')
+                ? { 'parentOrganization.id': { $exists: true, $eq: parentOrganization.id } }
                 : undefined), { _id: 1 })
                 .lean()
                 .exec();
@@ -252,19 +241,19 @@ class SeatRepo {
             }
             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 }
+                'project.id': { $eq: project.id },
+                'containedInPlace.branchCode': { $exists: true, $eq: movieTheaterCode },
+                branchCode: { $eq: roomCode },
+                'containsPlace.branchCode': { $eq: sectionCode }
             }, {
                 $push: {
-                    'containsPlace.$[screeningRoomSection].containsPlace': Object.assign(Object.assign(Object.assign({ typeOf: seat.typeOf, branchCode: seat.branchCode, additionalProperty: seat.additionalProperty }, (typeof ((_b = seat.name) === null || _b === void 0 ? void 0 : _b.ja) === 'string' || typeof ((_c = seat.name) === null || _c === void 0 ? void 0 : _c.en) === 'string') ? { name: seat.name } : undefined), (Array.isArray(seat.seatingType)) ? { seatingType: seat.seatingType } : undefined), (seat.maximumAttendeeCapacity === 0) ? { maximumAttendeeCapacity: seat.maximumAttendeeCapacity } : undefined)
+                    'containsPlace.$[screeningRoomSection].containsPlace': Object.assign(Object.assign(Object.assign({ typeOf: factory.placeType.Seat, 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), (seat.maximumAttendeeCapacity === 0) ? { maximumAttendeeCapacity: seat.maximumAttendeeCapacity } : undefined)
                 }
             }, {
                 new: true,
                 arrayFilters: [
                     {
-                        'screeningRoomSection.branchCode': { $eq: screeningRoomSection.branchCode },
+                        'screeningRoomSection.branchCode': { $eq: sectionCode },
                         'screeningRoomSection.containsPlace.branchCode': { $ne: seat.branchCode }
                     }
                 ],
@@ -279,24 +268,13 @@ class SeatRepo {
         });
     }
     // tslint:disable-next-line:cyclomatic-complexity max-func-body-length
-    updateSeat(seat, $unset) {
+    updateSeatByBranchCode(seat, $unset, options) {
         return __awaiter(this, void 0, void 0, function* () {
-            var _a, _b, _c;
-            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(Object.assign({ 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 } }, (typeof ((_a = seat.parentOrganization) === null || _a === void 0 ? void 0 : _a.id) === 'string')
-                ? { 'parentOrganization.id': { $exists: true, $eq: seat.parentOrganization.id } }
-                : undefined), Object.assign(Object.assign(Object.assign(Object.assign(Object.assign({ 'containsPlace.$[screeningRoomSection].containsPlace.$[seat].branchCode': seat.branchCode }, (typeof ((_b = seat.name) === null || _b === void 0 ? void 0 : _b.ja) === 'string' || typeof ((_c = seat.name) === null || _c === void 0 ? void 0 : _c.en) === 'string')
+            var _a, _b;
+            const { project, parentOrganization, movieTheaterCode, roomCode, sectionCode } = options;
+            const doc = yield this.placeModel.findOneAndUpdate(Object.assign({ typeOf: { $eq: factory.placeType.ScreeningRoom }, 'project.id': { $eq: project.id }, 'containedInPlace.branchCode': { $exists: true, $eq: movieTheaterCode }, branchCode: { $eq: roomCode }, 'containsPlace.branchCode': { $eq: sectionCode }, 'containsPlace.containsPlace.branchCode': { $eq: seat.branchCode } }, (typeof (parentOrganization === null || parentOrganization === void 0 ? void 0 : parentOrganization.id) === 'string')
+                ? { 'parentOrganization.id': { $exists: true, $eq: parentOrganization.id } }
+                : undefined), Object.assign(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
                 }
@@ -333,7 +311,7 @@ class SeatRepo {
                     : undefined) }), {
                 new: true,
                 arrayFilters: [
-                    { 'screeningRoomSection.branchCode': { $eq: screeningRoomSection.branchCode } },
+                    { 'screeningRoomSection.branchCode': { $eq: sectionCode } },
                     { 'seat.branchCode': { $eq: seat.branchCode } }
                 ],
                 projection: { 'containedInPlace.id': 1, typeOf: 1 }
@@ -585,14 +563,14 @@ class SeatRepo {
             return (result !== undefined) ? result.seatingTypes : [];
         });
     }
-    deleteSeat(seat) {
+    deleteSeatByBranchCode(seat, options) {
         return __awaiter(this, void 0, void 0, function* () {
-            var _a;
-            const doc = yield this.placeModel.findOneAndUpdate(Object.assign({ typeOf: { $eq: factory.placeType.ScreeningRoom }, 'project.id': { $eq: seat.project.id }, 'containedInPlace.branchCode': {
+            const { project, parentOrganization, movieTheaterCode, roomCode, sectionCode } = options;
+            const doc = yield this.placeModel.findOneAndUpdate(Object.assign({ typeOf: { $eq: factory.placeType.ScreeningRoom }, 'project.id': { $eq: 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 } }, (typeof ((_a = seat.parentOrganization) === null || _a === void 0 ? void 0 : _a.id) === 'string')
-                ? { 'parentOrganization.id': { $exists: true, $eq: seat.parentOrganization.id } }
+                    $eq: movieTheaterCode
+                }, branchCode: { $eq: roomCode }, 'containsPlace.branchCode': { $eq: sectionCode }, 'containsPlace.containsPlace.branchCode': { $eq: seat.branchCode } }, (typeof (parentOrganization === null || parentOrganization === void 0 ? void 0 : parentOrganization.id) === 'string')
+                ? { 'parentOrganization.id': { $exists: true, $eq: parentOrganization.id } }
                 : undefined), {
                 $pull: {
                     'containsPlace.$[screeningRoomSection].containsPlace': {
@@ -602,7 +580,7 @@ class SeatRepo {
             }, {
                 new: true,
                 arrayFilters: [
-                    { 'screeningRoomSection.branchCode': { $eq: seat.containedInPlace.branchCode } }
+                    { 'screeningRoomSection.branchCode': { $eq: sectionCode } }
                 ],
                 projection: { 'containedInPlace.id': 1, typeOf: 1 }
             })

package/package.json

@@ -115,5 +115,5 @@
     "postversion": "git push origin --tags",
     "prepublishOnly": "npm run clean && npm run build && npm test && npm run doc"
   },
-  "version": "23.2.0-alpha.8"
+  "version": "23.2.0-alpha.9"
 }