@chevre/domain 24.0.0-alpha.8 → 24.0.0-alpha.81

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

@@ -1,30 +1,7 @@
 "use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || function (mod) {
-    if (mod && mod.__esModule) return mod;
-    var result = {};
-    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
-    __setModuleDefault(result, mod);
-    return result;
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ScreeningRoomRepo = void 0;
-const factory = __importStar(require("../../factory"));
+const factory_1 = require("../../factory");
 const settings_1 = require("../../settings");
 const civicStructure_1 = require("../mongoose/schemas/civicStructure");
 const place_1 = require("../mongoose/schemas/place");
@@ -39,7 +16,7 @@ class ScreeningRoomRepo {
         this.placeModel = connection.model(place_1.modelName, (0, place_1.createSchema)());
     }
     static CREATE_ROOM_MONGO_CONDITIONS(searchConditions) {
-        const matchStages = [{ $match: { typeOf: { $eq: factory.placeType.ScreeningRoom } } }];
+        const matchStages = [{ $match: { typeOf: { $eq: factory_1.factory.placeType.ScreeningRoom } } }];
         const projectIdEq = searchConditions.project?.id?.$eq;
         if (typeof projectIdEq === 'string') {
             matchStages.push({
@@ -151,16 +128,16 @@ class ScreeningRoomRepo {
         return matchStages;
     }
     async saveScreeningRooms4coa(params) {
-        const { containsPlace, ...movieTheater4update } = params;
+        const { containsPlace, ...movieTheater4update } = params; // eslint-disable-line @typescript-eslint/no-unused-vars
         const movieTheater = await this.civicStructureModel.findOne({
-            typeOf: { $eq: factory.placeType.MovieTheater },
+            typeOf: { $eq: factory_1.factory.placeType.MovieTheater },
             'project.id': { $eq: params.project.id },
             branchCode: { $eq: movieTheater4update.branchCode }
         }, { _id: 0, id: { $toString: '$_id' } })
             .lean()
             .exec();
         if (movieTheater === null) {
-            throw new factory.errors.NotFound(factory.placeType.MovieTheater);
+            throw new factory_1.factory.errors.NotFound(factory_1.factory.placeType.MovieTheater);
         }
         const creatingScreeningRooms = params.containsPlace.map((place) => {
             return {
@@ -176,10 +153,10 @@ class ScreeningRoomRepo {
             };
         });
         await Promise.all(creatingScreeningRooms.map(async (createScreeningRoom) => {
-            const { typeOf, project, branchCode, ...setFields } = createScreeningRoom;
+            const { typeOf, project, branchCode, ...setFields } = createScreeningRoom; // eslint-disable-line @typescript-eslint/no-unused-vars
             if (typeof branchCode === 'string' && branchCode.length > 0) {
                 await this.placeModel.findOneAndUpdate({
-                    typeOf: { $eq: factory.placeType.ScreeningRoom },
+                    typeOf: { $eq: factory_1.factory.placeType.ScreeningRoom },
                     'project.id': { $eq: createScreeningRoom.project.id },
                     'containedInPlace.id': { $exists: true, $eq: createScreeningRoom.containedInPlace.id },
                     branchCode: { $eq: createScreeningRoom.branchCode }
@@ -203,7 +180,7 @@ class ScreeningRoomRepo {
         const { project, parentOrganization, movieTheaterCode } = options;
         // 施設存在確認
         const movieTheater = await this.civicStructureModel.findOne({
-            typeOf: { $eq: factory.placeType.MovieTheater },
+            typeOf: { $eq: factory_1.factory.placeType.MovieTheater },
             'project.id': { $eq: project.id },
             branchCode: { $eq: movieTheaterCode },
             ...(typeof parentOrganization?.id === 'string')
@@ -213,10 +190,10 @@ class ScreeningRoomRepo {
             .lean()
             .exec();
         if (movieTheater === null) {
-            throw new factory.errors.NotFound(factory.placeType.MovieTheater);
+            throw new factory_1.factory.errors.NotFound(factory_1.factory.placeType.MovieTheater);
         }
         const creatingScreeningRoom = {
-            typeOf: factory.placeType.ScreeningRoom,
+            typeOf: factory_1.factory.placeType.ScreeningRoom,
             branchCode: screeningRoom.branchCode,
             name: screeningRoom.name,
             address: screeningRoom.address,
@@ -228,7 +205,7 @@ class ScreeningRoomRepo {
                 name: movieTheater.name
             },
             containsPlace: [],
-            project: { id: project.id, typeOf: factory.organizationType.Project },
+            project: { id: project.id, typeOf: factory_1.factory.organizationType.Project },
             // 必須化(2023-07-14~)
             parentOrganization: movieTheater.parentOrganization,
             ...(typeof screeningRoom.openSeatingAllowed === 'boolean')
@@ -236,7 +213,7 @@ class ScreeningRoomRepo {
                 : undefined
         };
         const upsertScreeningRoomResult = await this.placeModel.updateOne({
-            typeOf: { $eq: factory.placeType.ScreeningRoom },
+            typeOf: { $eq: factory_1.factory.placeType.ScreeningRoom },
             'project.id': { $eq: creatingScreeningRoom.project.id },
             'containedInPlace.id': { $exists: true, $eq: creatingScreeningRoom.containedInPlace.id },
             branchCode: { $eq: creatingScreeningRoom.branchCode }
@@ -246,17 +223,17 @@ class ScreeningRoomRepo {
             .exec();
         // 既存であればコード重複
         if (upsertScreeningRoomResult.matchedCount > 0) {
-            throw new factory.errors.AlreadyInUse(factory.placeType.ScreeningRoom, ['branchCode']);
+            throw new factory_1.factory.errors.AlreadyInUse(factory_1.factory.placeType.ScreeningRoom, ['branchCode']);
         }
         return {
             containedInPlace: { id: creatingScreeningRoom.containedInPlace.id },
-            typeOf: factory.placeType.ScreeningRoom
+            typeOf: factory_1.factory.placeType.ScreeningRoom
         };
     }
     async updateRoomByBranchCode(screeningRoom, $unset, options) {
         const { project, parentOrganization, movieTheaterCode } = options;
         const doc = await this.placeModel.findOneAndUpdate({
-            typeOf: { $eq: factory.placeType.ScreeningRoom },
+            typeOf: { $eq: factory_1.factory.placeType.ScreeningRoom },
             'project.id': { $eq: project.id },
             'containedInPlace.branchCode': { $exists: true, $eq: movieTheaterCode },
             branchCode: screeningRoom.branchCode,
@@ -290,14 +267,14 @@ class ScreeningRoomRepo {
         })
             .exec();
         if (doc === null) {
-            throw new factory.errors.NotFound(factory.placeType.ScreeningRoom);
+            throw new factory_1.factory.errors.NotFound(factory_1.factory.placeType.ScreeningRoom);
         }
         return doc.toObject();
     }
     async updateScreeningRoomsByContainedInPlaceId(screeningRoom) {
         if (typeof screeningRoom.containedInPlace.name?.ja === 'string') {
             await this.placeModel.updateMany({
-                typeOf: { $eq: factory.placeType.ScreeningRoom },
+                typeOf: { $eq: factory_1.factory.placeType.ScreeningRoom },
                 'project.id': { $eq: screeningRoom.project.id },
                 'containedInPlace.id': { $exists: true, $eq: screeningRoom.containedInPlace.id }
             }, {
@@ -314,7 +291,7 @@ class ScreeningRoomRepo {
         const { project, parentOrganization, movieTheaterId } = options;
         // 施設存在確認
         const movieTheater = await this.civicStructureModel.findOne({
-            typeOf: { $eq: factory.placeType.MovieTheater },
+            typeOf: { $eq: factory_1.factory.placeType.MovieTheater },
             'project.id': { $eq: project.id },
             _id: { $eq: movieTheaterId },
             ...(typeof parentOrganization?.id === 'string')
@@ -324,7 +301,7 @@ class ScreeningRoomRepo {
             .lean()
             .exec();
         if (movieTheater === null) {
-            throw new factory.errors.NotFound(factory.placeType.MovieTheater);
+            throw new factory_1.factory.errors.NotFound(factory_1.factory.placeType.MovieTheater);
         }
         const containedInPlace = {
             id: movieTheater.id,
@@ -337,18 +314,18 @@ class ScreeningRoomRepo {
             params.forEach(({ $set, $unset }) => {
                 const { branchCode, ...setFields } = $set;
                 if (typeof branchCode !== 'string' || branchCode === '') {
-                    throw new factory.errors.ArgumentNull('branchCode');
+                    throw new factory_1.factory.errors.ArgumentNull('branchCode');
                 }
                 // リソースのユニークネスを保証するfilter
                 const filter = {
-                    typeOf: { $eq: factory.placeType.ScreeningRoom },
+                    typeOf: { $eq: factory_1.factory.placeType.ScreeningRoom },
                     'project.id': { $eq: project.id },
                     'containedInPlace.id': { $eq: movieTheaterId },
                     branchCode: { $eq: branchCode }
                 };
                 const initialRoom = {
-                    typeOf: factory.placeType.ScreeningRoom,
-                    project: { id: project.id, typeOf: factory.organizationType.Project },
+                    typeOf: factory_1.factory.placeType.ScreeningRoom,
+                    project: { id: project.id, typeOf: factory_1.factory.organizationType.Project },
                     branchCode,
                     containedInPlace,
                     containsPlace: [],
@@ -377,7 +354,7 @@ class ScreeningRoomRepo {
     async deleteRoomByBranchCode(screeningRoom, options) {
         const { project, parentOrganization, movieTheaterCode } = options;
         const doc = await this.placeModel.findOneAndDelete({
-            typeOf: { $eq: factory.placeType.ScreeningRoom },
+            typeOf: { $eq: factory_1.factory.placeType.ScreeningRoom },
             'project.id': { $eq: project.id },
             'containedInPlace.branchCode': { $exists: true, $eq: movieTheaterCode },
             branchCode: screeningRoom.branchCode,
@@ -389,13 +366,13 @@ class ScreeningRoomRepo {
         })
             .exec();
         if (doc === null) {
-            throw new factory.errors.NotFound(factory.placeType.ScreeningRoom);
+            throw new factory_1.factory.errors.NotFound(factory_1.factory.placeType.ScreeningRoom);
         }
         return doc.toObject();
     }
     async deleteScreeningRoomsByMovieTheaterId(params) {
         return this.placeModel.deleteMany({
-            typeOf: { $eq: factory.placeType.ScreeningRoom },
+            typeOf: { $eq: factory_1.factory.placeType.ScreeningRoom },
             'project.id': { $eq: params.project.id },
             'containedInPlace.id': { $exists: true, $eq: params.containedInPlace.id }
         })
@@ -403,7 +380,7 @@ class ScreeningRoomRepo {
     }
     async searchScreeningRooms(searchConditions) {
         const aggregate = this.placeModel.aggregate([
-            { $sort: { branchCode: factory.sortType.Ascending } },
+            { $sort: { branchCode: factory_1.factory.sortType.Ascending } },
             ...ScreeningRoomRepo.CREATE_ROOM_MONGO_CONDITIONS(searchConditions),
             {
                 $project: {
@@ -477,7 +454,7 @@ class ScreeningRoomRepo {
                     maximumAttendeeCapacity: '$maximumAttendeeCapacity'
                 }
             },
-            { $sort: { branchCode: factory.sortType.Ascending } }
+            { $sort: { branchCode: factory_1.factory.sortType.Ascending } }
         ]);
         const { limit, page } = params;
         if (typeof limit === 'number' && limit > 0) {
@@ -494,7 +471,7 @@ class ScreeningRoomRepo {
      */
     async findScreeningRoomsByBranchCode(params) {
         const matchStages = [
-            { $match: { typeOf: { $eq: factory.placeType.ScreeningRoom } } },
+            { $match: { typeOf: { $eq: factory_1.factory.placeType.ScreeningRoom } } },
             { $match: { 'project.id': { $eq: params.project.id } } },
             { $match: { 'containedInPlace.id': { $exists: true, $eq: params.containedInPlace.id.$eq } } },
             { $match: { branchCode: { $eq: params.branchCode.$eq } } }
@@ -529,7 +506,7 @@ class ScreeningRoomRepo {
             .option({ maxTimeMS: settings_1.MONGO_MAX_TIME_MS })
             .exec();
         if (docs.length < 1) {
-            throw new factory.errors.NotFound(factory.placeType.ScreeningRoom);
+            throw new factory_1.factory.errors.NotFound(factory_1.factory.placeType.ScreeningRoom);
         }
         return docs[0];
     }
@@ -538,7 +515,7 @@ class ScreeningRoomRepo {
      */
     async deleteScreeningRoomsByParentOrganizationId(params) {
         return this.placeModel.deleteMany({
-            typeOf: { $eq: factory.placeType.ScreeningRoom },
+            typeOf: { $eq: factory_1.factory.placeType.ScreeningRoom },
             'project.id': { $eq: params.project.id },
             'parentOrganization.id': { $exists: true, $eq: params.parentOrganization.id }
         })
@@ -549,14 +526,14 @@ class ScreeningRoomRepo {
      */
     async deleteScreeningRoomsByProject(params) {
         await this.placeModel.deleteMany({
-            typeOf: { $eq: factory.placeType.ScreeningRoom },
+            typeOf: { $eq: factory_1.factory.placeType.ScreeningRoom },
             'project.id': { $eq: params.project.id }
         })
             .exec();
     }
     getCursor(conditions, projection) {
         return this.placeModel.find(conditions, projection)
-            .sort({ branchCode: factory.sortType.Ascending })
+            .sort({ branchCode: factory_1.factory.sortType.Ascending })
             .cursor();
     }
 }

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

@@ -1,6 +1,6 @@
 import type { BulkWriteResult } from 'mongodb';
 import { AnyExpression, Connection, PipelineStage } from 'mongoose';
-import * as factory from '../../factory';
+import { factory } from '../../factory';
 type IMatchStage = PipelineStage.Match;
 type ICreatingSeat = Pick<factory.place.seat.IPlace, 'additionalProperty' | 'branchCode' | 'name' | 'maximumAttendeeCapacity' | 'seatingType'>;
 interface IUpdateOptions {
@@ -26,7 +26,7 @@ interface IUpdateSeatResult {
     };
     typeOf: factory.placeType.ScreeningRoom;
 }
-export declare const DEFAULT_ROOM_MAXIMUM_CAPACITY: number;
+export declare const DEFAULT_ROOM_MAXIMUM_CAPACITY = 10000;
 /**
  * 座席リポジトリ
  */
@@ -34,9 +34,7 @@ export declare class SeatRepo {
     private readonly civicStructureModel;
     private readonly placeModel;
     constructor(connection: Connection);
-    static CREATE_SEARCH_SEATS_PROJECTION(params: factory.place.seat.IProjection): {
-        [field: string]: AnyExpression;
-    };
+    static CREATE_SEARCH_SEATS_PROJECTION(params: factory.place.seat.IProjection): Record<string, AnyExpression>;
     static CREATE_MATCH_STAGES(params: factory.place.seat.ISearchConditions, options: {
         filterTypeOf: boolean;
     }): IMatchStage[];
@@ -47,8 +45,8 @@ export declare class SeatRepo {
     addSeatsByBranchCodeIfNotExist(params: {
         $set: ICreatingSeat;
     }[], options: IUpdateOptions): Promise<{
-        bulkWriteResult: BulkWriteResult;
-    } | void>;
+        bulkWriteResult?: BulkWriteResult;
+    }>;
     /**
      * コードをキーにして冪等編集
      */
@@ -58,8 +56,8 @@ export declare class SeatRepo {
             [key in keyof ICreatingSeat]?: 1;
         };
     }[], options: IUpdateOptions): Promise<{
-        bulkWriteResult: BulkWriteResult;
-    } | void>;
+        bulkWriteResult?: BulkWriteResult;
+    }>;
     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'> & {
@@ -130,23 +128,29 @@ export declare class SeatRepo {
         /**
          * 座席コード
          */
-        branchCode?: {
-            $in?: string[];
+        branchCode: {
+            $in: string[];
         };
-        containedInPlace?: {
+        containedInPlace: {
             /**
              * セクションコード
              */
-            branchCode?: {
-                $in?: string[];
+            branchCode: {
+                $in: string[];
             };
-            containedInPlace?: {
-                branchCode?: {
-                    $eq?: string;
+            containedInPlace: {
+                /**
+                 * ルームコード
+                 */
+                branchCode: {
+                    $eq: string;
                 };
-                containedInPlace?: {
-                    branchCode?: {
-                        $eq?: string;
+                containedInPlace: {
+                    /**
+                     * 施設コード
+                     */
+                    branchCode: {
+                        $eq: string;
                     };
                 };
             };
@@ -161,8 +165,8 @@ export declare class SeatRepo {
          */
         branchCode: string;
     }[], options: IUpdateOptions): Promise<{
-        bulkWriteResult: BulkWriteResult;
-    } | void>;
+        bulkWriteResult?: BulkWriteResult;
+    }>;
     deleteSeatByBranchCode(seat: {
         /**
          * 座席コード

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

@@ -1,30 +1,7 @@
 "use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || function (mod) {
-    if (mod && mod.__esModule) return mod;
-    var result = {};
-    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
-    __setModuleDefault(result, mod);
-    return result;
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.SeatRepo = exports.DEFAULT_ROOM_MAXIMUM_CAPACITY = void 0;
-const factory = __importStar(require("../../factory"));
+const factory_1 = require("../../factory");
 const settings_1 = require("../../settings");
 const civicStructure_1 = require("../mongoose/schemas/civicStructure");
 const place_1 = require("../mongoose/schemas/place");
@@ -93,7 +70,7 @@ class SeatRepo {
         const { filterTypeOf } = options;
         const matchStages = [];
         if (filterTypeOf) {
-            matchStages.push({ $match: { typeOf: { $eq: factory.placeType.ScreeningRoom } } });
+            matchStages.push({ $match: { typeOf: { $eq: factory_1.factory.placeType.ScreeningRoom } } });
         }
         const projectIdEq = params.project?.id?.$eq;
         if (typeof projectIdEq === 'string') {
@@ -245,7 +222,7 @@ class SeatRepo {
         const { project, parentOrganization, movieTheaterCode, roomCode, sectionCode } = options;
         // 施設存在確認
         const movieTheaterDoc = await this.civicStructureModel.findOne({
-            typeOf: { $eq: factory.placeType.MovieTheater },
+            typeOf: { $eq: factory_1.factory.placeType.MovieTheater },
             'project.id': { $eq: project.id },
             branchCode: { $eq: movieTheaterCode },
             ...(typeof parentOrganization?.id === 'string')
@@ -255,10 +232,10 @@ class SeatRepo {
             .lean()
             .exec();
         if (movieTheaterDoc === null) {
-            throw new factory.errors.NotFound(factory.placeType.MovieTheater);
+            throw new factory_1.factory.errors.NotFound(factory_1.factory.placeType.MovieTheater);
         }
         const doc = await this.placeModel.findOneAndUpdate({
-            typeOf: { $eq: factory.placeType.ScreeningRoom },
+            typeOf: { $eq: factory_1.factory.placeType.ScreeningRoom },
             'project.id': { $eq: project.id },
             'containedInPlace.branchCode': { $exists: true, $eq: movieTheaterCode },
             branchCode: { $eq: roomCode },
@@ -266,7 +243,7 @@ class SeatRepo {
         }, {
             $push: {
                 'containsPlace.$[screeningRoomSection].containsPlace': {
-                    typeOf: factory.placeType.Seat,
+                    typeOf: factory_1.factory.placeType.Seat,
                     branchCode: seat.branchCode,
                     additionalProperty: seat.additionalProperty,
                     ...(typeof seat.name?.ja === 'string' || typeof seat.name?.en === 'string') ? { name: seat.name } : undefined,
@@ -288,7 +265,7 @@ class SeatRepo {
             .exec();
         // 存在しなければコード重複
         if (doc === null) {
-            throw new factory.errors.AlreadyInUse(factory.placeType.Seat, ['branchCode']);
+            throw new factory_1.factory.errors.AlreadyInUse(factory_1.factory.placeType.Seat, ['branchCode']);
         }
         return doc.toObject();
     }
@@ -299,7 +276,7 @@ class SeatRepo {
         const { project, parentOrganization, movieTheaterCode, roomCode, sectionCode } = options;
         // 施設存在確認
         const movieTheaterDoc = await this.civicStructureModel.findOne({
-            typeOf: { $eq: factory.placeType.MovieTheater },
+            typeOf: { $eq: factory_1.factory.placeType.MovieTheater },
             'project.id': { $eq: project.id },
             branchCode: { $eq: movieTheaterCode },
             ...(typeof parentOrganization?.id === 'string')
@@ -309,13 +286,13 @@ class SeatRepo {
             .lean()
             .exec();
         if (movieTheaterDoc === null) {
-            throw new factory.errors.NotFound(factory.placeType.MovieTheater);
+            throw new factory_1.factory.errors.NotFound(factory_1.factory.placeType.MovieTheater);
         }
         const bulkWriteOps = [];
         if (Array.isArray(params)) {
             // セクションの存在するドキュメントでフィルター
             const filter = {
-                typeOf: { $eq: factory.placeType.ScreeningRoom },
+                typeOf: { $eq: factory_1.factory.placeType.ScreeningRoom },
                 'project.id': { $eq: project.id },
                 'containedInPlace.branchCode': { $exists: true, $eq: movieTheaterCode },
                 branchCode: { $eq: roomCode },
@@ -324,7 +301,7 @@ class SeatRepo {
             params.forEach(({ $set }) => {
                 const { ...setFields } = $set;
                 const pushingSeat = {
-                    typeOf: factory.placeType.Seat,
+                    typeOf: factory_1.factory.placeType.Seat,
                     branchCode: setFields.branchCode,
                     ...(typeof setFields.name?.ja === 'string' || typeof setFields.name?.en === 'string')
                         ? { name: setFields.name }
@@ -356,6 +333,7 @@ class SeatRepo {
             const bulkWriteResult = await this.placeModel.bulkWrite(bulkWriteOps, { ordered: false });
             return { bulkWriteResult };
         }
+        return {};
     }
     /**
      * コードをキーにして冪等編集
@@ -367,7 +345,7 @@ class SeatRepo {
             params.forEach(({ $set, $unset }) => {
                 // 座席の存在するドキュメントでフィルター
                 const filter = {
-                    typeOf: { $eq: factory.placeType.ScreeningRoom },
+                    typeOf: { $eq: factory_1.factory.placeType.ScreeningRoom },
                     'project.id': { $eq: project.id },
                     'containedInPlace.branchCode': { $exists: true, $eq: movieTheaterCode },
                     branchCode: { $eq: roomCode },
@@ -432,11 +410,12 @@ class SeatRepo {
             const bulkWriteResult = await this.placeModel.bulkWrite(bulkWriteOps, { ordered: false });
             return { bulkWriteResult };
         }
+        return {};
     }
     async updateSeatByBranchCode(seat, $unset, options) {
         const { project, parentOrganization, movieTheaterCode, roomCode, sectionCode } = options;
         const doc = await this.placeModel.findOneAndUpdate({
-            typeOf: { $eq: factory.placeType.ScreeningRoom },
+            typeOf: { $eq: factory_1.factory.placeType.ScreeningRoom },
             'project.id': { $eq: project.id },
             'containedInPlace.branchCode': { $exists: true, $eq: movieTheaterCode },
             branchCode: { $eq: roomCode },
@@ -505,7 +484,7 @@ class SeatRepo {
         })
             .exec();
         if (doc === null) {
-            throw new factory.errors.NotFound(factory.placeType.Seat);
+            throw new factory_1.factory.errors.NotFound(factory_1.factory.placeType.Seat);
         }
         return doc.toObject();
     }
@@ -540,9 +519,15 @@ class SeatRepo {
     // ルーム指定の座席検索として再定義(2025-04-28~)
     async projectSeatsByScreeningRoom(params) {
         const { limit, page, project, containedInPlace, screeningRoom, $projection, ...searchSeatsConditions } = params;
+        if (typeof screeningRoom.branchCode.$eq !== 'string' || screeningRoom.branchCode.$eq === '') {
+            throw new factory_1.factory.errors.ArgumentNull('screeningRoom.branchCode.$eq');
+        }
+        if (typeof screeningRoom.containedInPlace.branchCode.$eq !== 'string' || screeningRoom.containedInPlace.branchCode.$eq === '') {
+            throw new factory_1.factory.errors.ArgumentNull('screeningRoom.containedInPlace.branchCode.$eq');
+        }
         // まずルーム検索
         const screeningRoomDoc = await this.placeModel.findOne({
-            typeOf: { $eq: factory.placeType.ScreeningRoom },
+            typeOf: { $eq: factory_1.factory.placeType.ScreeningRoom },
             'project.id': { $eq: project.id.$eq },
             'containedInPlace.branchCode': { $exists: true, $eq: screeningRoom.containedInPlace.branchCode.$eq },
             branchCode: { $eq: screeningRoom.branchCode.$eq }
@@ -617,7 +602,7 @@ class SeatRepo {
         const { limit, page, projectId, sellerId, movieTheaterCode, roomCode, sectionCode } = params;
         // まずルーム検索
         const screeningRoomDoc = await this.placeModel.findOne({
-            typeOf: { $eq: factory.placeType.ScreeningRoom },
+            typeOf: { $eq: factory_1.factory.placeType.ScreeningRoom },
             'project.id': { $eq: projectId },
             'parentOrganization.id': { $exists: true, $eq: sellerId },
             'containedInPlace.branchCode': { $exists: true, $eq: movieTheaterCode },
@@ -649,7 +634,7 @@ class SeatRepo {
             limitStage = { $limit: limit };
         }
         else {
-            throw new factory.errors.Argument('limit', 'must be number > 0');
+            throw new factory_1.factory.errors.Argument('limit', 'must be number > 0');
         }
         const pipeline = [
             // uniwind前はドキュメントの_id指定
@@ -698,16 +683,22 @@ class SeatRepo {
      * 座席区分集計検索
      */
     async aggregateSeatingTypes(params) {
-        const matchStages = [{ $match: { typeOf: { $eq: factory.placeType.ScreeningRoom } } }];
+        const matchStages = [{ $match: { typeOf: { $eq: factory_1.factory.placeType.ScreeningRoom } } }];
         const projectIdEq = params.project?.id?.$eq;
         if (typeof projectIdEq === 'string') {
             matchStages.push({ $match: { 'project.id': { $eq: projectIdEq } } });
         }
         const branchCodeEq = params.containedInPlace?.containedInPlace?.branchCode?.$eq;
+        if (typeof branchCodeEq !== 'string' || branchCodeEq === '') {
+            throw new factory_1.factory.errors.ArgumentNull('containedInPlace.containedInPlace.branchCode.$eq');
+        }
         if (typeof branchCodeEq === 'string') {
             matchStages.push({ $match: { branchCode: { $eq: branchCodeEq } } });
         }
         const containedInPlaceBranchCodeEq = params.containedInPlace?.containedInPlace?.containedInPlace?.branchCode?.$eq;
+        if (typeof containedInPlaceBranchCodeEq !== 'string' || containedInPlaceBranchCodeEq === '') {
+            throw new factory_1.factory.errors.ArgumentNull('containedInPlace.containedInPlace.containedInPlace.branchCode.$eq');
+        }
         if (typeof containedInPlaceBranchCodeEq === 'string') {
             matchStages.push({
                 $match: { 'containedInPlace.branchCode': { $exists: true, $eq: containedInPlaceBranchCodeEq } }
@@ -758,7 +749,7 @@ class SeatRepo {
             params.forEach(({ branchCode }) => {
                 // 座席の存在するドキュメントでフィルター
                 const filter = {
-                    typeOf: { $eq: factory.placeType.ScreeningRoom },
+                    typeOf: { $eq: factory_1.factory.placeType.ScreeningRoom },
                     'project.id': { $eq: project.id },
                     'containedInPlace.branchCode': { $exists: true, $eq: movieTheaterCode },
                     branchCode: { $eq: roomCode },
@@ -788,11 +779,12 @@ class SeatRepo {
             const bulkWriteResult = await this.placeModel.bulkWrite(bulkWriteOps, { ordered: false });
             return { bulkWriteResult };
         }
+        return {};
     }
     async deleteSeatByBranchCode(seat, options) {
         const { project, parentOrganization, movieTheaterCode, roomCode, sectionCode } = options;
         const doc = await this.placeModel.findOneAndUpdate({
-            typeOf: { $eq: factory.placeType.ScreeningRoom },
+            typeOf: { $eq: factory_1.factory.placeType.ScreeningRoom },
             'project.id': { $eq: project.id },
             'containedInPlace.branchCode': {
                 $exists: true,
@@ -819,7 +811,7 @@ class SeatRepo {
         })
             .exec();
         if (doc === null) {
-            throw new factory.errors.NotFound(factory.placeType.Seat);
+            throw new factory_1.factory.errors.NotFound(factory_1.factory.placeType.Seat);
         }
         return doc.toObject();
     }

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

@@ -1,6 +1,6 @@
 import type { BulkWriteResult } from 'mongodb';
 import type { Connection, PipelineStage } from 'mongoose';
-import * as factory from '../../factory';
+import { 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;