@chevre/domain 23.2.0-alpha.2 → 23.2.0-alpha.20

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 }
                     }
                 ],
@@ -278,25 +267,131 @@ class SeatRepo {
             return doc.toObject();
         });
     }
-    // tslint:disable-next-line:cyclomatic-complexity max-func-body-length
-    updateSeat(seat, $unset) {
+    /**
+     * コードをキーにして冪等追加
+     */
+    addSeatsByBranchCodeIfNotExist(params, 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 { project, parentOrganization, movieTheaterCode, roomCode, sectionCode } = options;
+            // 施設存在確認
+            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();
+            if (movieTheaterDoc === null) {
+                throw new factory.errors.NotFound(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 bulkWriteOps = [];
+            if (Array.isArray(params)) {
+                // セクションの存在するドキュメントでフィルター
+                const filter = {
+                    typeOf: { $eq: factory.placeType.ScreeningRoom },
+                    'project.id': { $eq: project.id },
+                    'containedInPlace.branchCode': { $exists: true, $eq: movieTheaterCode },
+                    branchCode: { $eq: roomCode },
+                    'containsPlace.branchCode': { $eq: sectionCode }
+                };
+                params.forEach(({ $set }) => {
+                    var _a, _b;
+                    const setFields = __rest($set, []);
+                    const pushingSeat = Object.assign(Object.assign(Object.assign(Object.assign({ typeOf: factory.placeType.Seat, branchCode: setFields.branchCode }, (typeof ((_a = setFields.name) === null || _a === void 0 ? void 0 : _a.ja) === 'string' || typeof ((_b = setFields.name) === null || _b === void 0 ? void 0 : _b.en) === 'string')
+                        ? { name: setFields.name }
+                        : undefined), (Array.isArray(setFields.seatingType)) ? { seatingType: setFields.seatingType } : undefined), (Array.isArray(setFields.additionalProperty)) ? { additionalProperty: setFields.additionalProperty } : undefined), (setFields.maximumAttendeeCapacity === 0)
+                        ? { maximumAttendeeCapacity: setFields.maximumAttendeeCapacity }
+                        : undefined);
+                    const updateFilter = {
+                        $push: { 'containsPlace.$[screeningRoomSection].containsPlace': pushingSeat }
+                    };
+                    const arrayFilters = [
+                        {
+                            'screeningRoomSection.branchCode': { $eq: sectionCode }, // セクションに
+                            'screeningRoomSection.containsPlace.branchCode': { $ne: pushingSeat.branchCode } // 座席が存在しなければ
+                        }
+                    ];
+                    const updateOne = {
+                        filter,
+                        update: updateFilter,
+                        arrayFilters
+                    };
+                    bulkWriteOps.push({ updateOne });
+                });
             }
-            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 (bulkWriteOps.length > 0) {
+                const bulkWriteResult = yield this.placeModel.bulkWrite(bulkWriteOps, { ordered: false });
+                return { bulkWriteResult };
             }
-            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')
+        });
+    }
+    /**
+     * コードをキーにして冪等編集
+     */
+    updateSeatsByBranchCode(params, options) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const { project, parentOrganization, movieTheaterCode, roomCode, sectionCode } = options;
+            const bulkWriteOps = [];
+            if (Array.isArray(params)) {
+                params.forEach(({ $set, $unset }) => {
+                    var _a, _b;
+                    // 座席の存在するドキュメントでフィルター
+                    const filter = 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: $set.branchCode } }, (typeof (parentOrganization === null || parentOrganization === void 0 ? void 0 : parentOrganization.id) === 'string')
+                        ? { 'parentOrganization.id': { $exists: true, $eq: parentOrganization.id } }
+                        : undefined);
+                    const setFields = __rest($set, []);
+                    const updateFilter = {
+                        $set: Object.assign(Object.assign(Object.assign(Object.assign({ 'containsPlace.$[screeningRoomSection].containsPlace.$[seat].branchCode': setFields.branchCode }, (typeof ((_a = setFields.name) === null || _a === void 0 ? void 0 : _a.ja) === 'string' || typeof ((_b = setFields.name) === null || _b === void 0 ? void 0 : _b.en) === 'string')
+                            ? {
+                                'containsPlace.$[screeningRoomSection].containsPlace.$[seat].name': setFields.name
+                            }
+                            : undefined), (Array.isArray(setFields.seatingType))
+                            ? {
+                                'containsPlace.$[screeningRoomSection].containsPlace.$[seat].seatingType': setFields.seatingType
+                            }
+                            : undefined), (Array.isArray(setFields.additionalProperty))
+                            ? {
+                                // tslint:disable-next-line:max-line-length
+                                'containsPlace.$[screeningRoomSection].containsPlace.$[seat].additionalProperty': setFields.additionalProperty
+                            }
+                            : undefined), (setFields.maximumAttendeeCapacity === 0)
+                            ? {
+                                // tslint:disable-next-line:max-line-length
+                                'containsPlace.$[screeningRoomSection].containsPlace.$[seat].maximumAttendeeCapacity': setFields.maximumAttendeeCapacity
+                            }
+                            : undefined),
+                        $unset: Object.assign(Object.assign(Object.assign({}, (($unset === null || $unset === void 0 ? void 0 : $unset.name) === 1)
+                            ? { 'containsPlace.$[screeningRoomSection].containsPlace.$[seat].name': 1 }
+                            : undefined), (($unset === null || $unset === void 0 ? void 0 : $unset.seatingType) === 1)
+                            ? { 'containsPlace.$[screeningRoomSection].containsPlace.$[seat].seatingType': 1 }
+                            : undefined), (($unset === null || $unset === void 0 ? void 0 : $unset.maximumAttendeeCapacity) === 1)
+                            ? { 'containsPlace.$[screeningRoomSection].containsPlace.$[seat].maximumAttendeeCapacity': 1 }
+                            : undefined)
+                    };
+                    const arrayFilters = [
+                        { 'screeningRoomSection.branchCode': { $eq: sectionCode } },
+                        { 'seat.branchCode': { $eq: setFields.branchCode } }
+                    ];
+                    const updateOne = {
+                        filter,
+                        update: updateFilter,
+                        arrayFilters
+                    };
+                    bulkWriteOps.push({ updateOne });
+                });
+            }
+            if (bulkWriteOps.length > 0) {
+                const bulkWriteResult = yield this.placeModel.bulkWrite(bulkWriteOps, { ordered: false });
+                return { bulkWriteResult };
+            }
+        });
+    }
+    // tslint:disable-next-line:cyclomatic-complexity max-func-body-length
+    updateSeatByBranchCode(seat, $unset, options) {
+        return __awaiter(this, void 0, void 0, function* () {
+            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 +428,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 +680,49 @@ class SeatRepo {
             return (result !== undefined) ? result.seatingTypes : [];
         });
     }
-    deleteSeat(seat) {
+    /**
+     * コードをキーにして冪等削除
+     */
+    deleteSeatsByBranchCode(params, options) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const { project, parentOrganization, movieTheaterCode, roomCode, sectionCode } = options;
+            const bulkWriteOps = [];
+            if (Array.isArray(params)) {
+                params.forEach(({ branchCode }) => {
+                    // 座席の存在するドキュメントでフィルター
+                    const filter = 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: branchCode } }, (typeof (parentOrganization === null || parentOrganization === void 0 ? void 0 : parentOrganization.id) === 'string')
+                        ? { 'parentOrganization.id': { $exists: true, $eq: parentOrganization.id } }
+                        : undefined);
+                    const updateFilter = {
+                        $pull: {
+                            'containsPlace.$[screeningRoomSection].containsPlace': { branchCode }
+                        }
+                    };
+                    const arrayFilters = [
+                        { 'screeningRoomSection.branchCode': { $eq: sectionCode } }
+                    ];
+                    const updateOne = {
+                        filter,
+                        update: updateFilter,
+                        arrayFilters
+                    };
+                    bulkWriteOps.push({ updateOne });
+                });
+            }
+            if (bulkWriteOps.length > 0) {
+                const bulkWriteResult = yield this.placeModel.bulkWrite(bulkWriteOps, { ordered: false });
+                return { bulkWriteResult };
+            }
+        });
+    }
+    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 +732,7 @@ class SeatRepo {
             }, {
                 new: true,
                 arrayFilters: [
-                    { 'screeningRoomSection.branchCode': { $eq: seat.containedInPlace.branchCode } }
+                    { 'screeningRoomSection.branchCode': { $eq: sectionCode } }
                 ],
                 projection: { 'containedInPlace.id': 1, typeOf: 1 }
             })

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

@@ -1,6 +1,18 @@
-import type { Connection } from 'mongoose';
+import type { Connection, PipelineStage } from 'mongoose';
 import * as factory from '../../factory';
 type IScreeningRoomSectionWithoutContainsPlace = Omit<factory.place.screeningRoomSection.IPlace, 'containsPlace'>;
+type ICreatingSection = Pick<factory.place.screeningRoomSection.IPlace, 'additionalProperty' | 'branchCode' | 'name'>;
+type IMatchStage = PipelineStage.Match;
+interface IUpdateOptions {
+    project: {
+        id: string;
+    };
+    parentOrganization?: {
+        id?: string;
+    };
+    movieTheaterCode: string;
+    roomCode: string;
+}
 /**
  * セクション編集時レスポンス
  */
@@ -20,22 +32,34 @@ export declare class SectionRepo {
     private readonly civicStructureModel;
     private readonly placeModel;
     constructor(connection: Connection);
-    createScreeningRoomSection(screeningRoomSection: IScreeningRoomSectionWithoutContainsPlace & {
-        parentOrganization?: {
-            id?: string;
+    static CREATE_SECTION_MONGO_CONDITIONS(searchConditions: Omit<factory.place.screeningRoomSection.ISearchConditions, '$projection' | 'limit' | 'page'>): IMatchStage[];
+    createSection(screeningRoomSection: ICreatingSection, options: IUpdateOptions): Promise<IUpdateSectionResult>;
+    /**
+     * セクションの名称と追加特性を編集する
+     */
+    updateSectionByBranchCode(screeningRoomSection: ICreatingSection, $unset: any, options: IUpdateOptions): Promise<IUpdateSectionResult>;
+    /**
+     * セクションの座席を上書きする
+     */
+    overwriteSeats(screeningRoomSection: Pick<factory.place.screeningRoomSection.IPlace, 'branchCode' | 'containsPlace'>, options: IUpdateOptions): Promise<IUpdateSectionResult>;
+    migrateSectionIdentifier(screeningRoomSection: {
+        project: {
+            id: string;
         };
-    }): Promise<IUpdateSectionResult>;
-    updateScreeningRoomSection(screeningRoomSection: Omit<factory.place.screeningRoomSection.IPlace, 'containedInPlace'> & {
+        identifier: string;
+        branchCode: string;
         containedInPlace: {
             branchCode: string;
             containedInPlace: {
                 branchCode: string;
             };
         };
-        parentOrganization?: {
-            id?: string;
-        };
-    }, $unset: any): Promise<IUpdateSectionResult>;
+    }): Promise<IUpdateSectionResult>;
+    /**
+     * 最小限のprojectionでセクション検索を再定義
+     * 2026-01-08~
+     */
+    findSections(params: Omit<factory.place.screeningRoomSection.ISearchConditions, '$projection'>): Promise<Pick<factory.place.screeningRoomSection.IPlace, 'additionalProperty' | 'branchCode' | 'name'>[]>;
     searchScreeningRoomSections(searchConditions: factory.place.screeningRoomSection.ISearchConditions): Promise<IScreeningRoomSectionWithoutContainsPlace[]>;
     /**
      * ルーム指定のセクション検索として再定義(2025-12-07~)
@@ -57,29 +81,11 @@ export declare class SectionRepo {
          */
         roomCode: string;
     }): Promise<Pick<IScreeningRoomSectionWithoutContainsPlace, 'additionalProperty' | 'branchCode' | 'name'>[]>;
-    deleteScreeningRoomSection(screeningRoomSection: {
-        project: {
-            id: string;
-        };
-        parentOrganization?: {
-            id?: string;
-        };
+    deleteSectionByBranchCode(screeningRoomSection: {
         /**
          * セクションコード
          */
         branchCode: string;
-        containedInPlace: {
-            /**
-             * ルームコード
-             */
-            branchCode: string;
-            containedInPlace: {
-                /**
-                 * 施設コード
-                 */
-                branchCode: string;
-            };
-        };
-    }): Promise<IUpdateSectionResult>;
+    }, options: IUpdateOptions): Promise<IUpdateSectionResult>;
 }
 export {};