@chevre/domain 23.2.0-alpha.1 → 23.2.0-alpha.10

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

@@ -79,29 +79,24 @@ class ScreeningRoomRepo {
             })));
         });
     }
-    createScreeningRoom(screeningRoom) {
+    createRoom(screeningRoom, options) {
         return __awaiter(this, void 0, void 0, function* () {
-            var _a;
+            const { project, parentOrganization, movieTheaterCode } = options;
             // 施設存在確認
-            const movieTheaterDoc = yield this.civicStructureModel.findOne(Object.assign({ typeOf: { $eq: factory.placeType.MovieTheater }, 'project.id': { $eq: screeningRoom.project.id }, branchCode: { $eq: screeningRoom.containedInPlace.branchCode } }, (typeof ((_a = screeningRoom.parentOrganization) === null || _a === void 0 ? void 0 : _a.id) === 'string')
-                ? { 'parentOrganization.id': { $exists: true, $eq: screeningRoom.parentOrganization.id } }
+            const movieTheater = 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: 0, id: { $toString: '$_id' }, typeOf: 1, branchCode: 1, name: 1, parentOrganization: 1 })
                 .lean()
                 .exec();
-            if (movieTheaterDoc === null) {
+            if (movieTheater === null) {
                 throw new factory.errors.NotFound(factory.placeType.MovieTheater);
             }
-            // const movieTheater = <Pick<
-            //     factory.place.movieTheater.IPlace,
-            //     'id' | 'typeOf' | 'branchCode' | 'name' | 'parentOrganization'
-            // >>movieTheaterDoc.toObject();
-            const movieTheater = movieTheaterDoc;
-            const creatingScreeningRoom = Object.assign({ typeOf: screeningRoom.typeOf, branchCode: screeningRoom.branchCode, name: screeningRoom.name, address: screeningRoom.address, additionalProperty: (Array.isArray(screeningRoom.additionalProperty)) ? screeningRoom.additionalProperty : [], containedInPlace: {
+            const creatingScreeningRoom = Object.assign({ typeOf: factory.placeType.ScreeningRoom, branchCode: screeningRoom.branchCode, name: screeningRoom.name, address: screeningRoom.address, additionalProperty: (Array.isArray(screeningRoom.additionalProperty)) ? screeningRoom.additionalProperty : [], containedInPlace: {
                     id: movieTheater.id,
                     typeOf: movieTheater.typeOf,
                     branchCode: movieTheater.branchCode,
                     name: movieTheater.name
-                }, containsPlace: [], project: screeningRoom.project, 
+                }, containsPlace: [], project: { id: project.id, typeOf: factory.organizationType.Project }, 
                 // 必須化(2023-07-14~)
                 parentOrganization: movieTheater.parentOrganization }, (typeof screeningRoom.openSeatingAllowed === 'boolean')
                 ? { openSeatingAllowed: screeningRoom.openSeatingAllowed }
@@ -125,11 +120,11 @@ class ScreeningRoomRepo {
             };
         });
     }
-    updateScreeningRoom(screeningRoom, $unset) {
+    updateRoomByBranchCode(screeningRoom, $unset, 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: screeningRoom.project.id }, 'containedInPlace.branchCode': { $exists: true, $eq: screeningRoom.containedInPlace.branchCode }, branchCode: screeningRoom.branchCode }, (typeof ((_a = screeningRoom.parentOrganization) === null || _a === void 0 ? void 0 : _a.id) === 'string')
-                ? { 'parentOrganization.id': { $exists: true, $eq: screeningRoom.parentOrganization.id } }
+            const { project, parentOrganization, movieTheaterCode } = 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: screeningRoom.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({ name: screeningRoom.name }, (screeningRoom.address !== undefined && screeningRoom.address !== null)
                 ? { address: screeningRoom.address }
                 : undefined), (typeof screeningRoom.openSeatingAllowed === 'boolean')
@@ -169,11 +164,11 @@ class ScreeningRoomRepo {
             }
         });
     }
-    deleteScreeningRoom(screeningRoom) {
+    deleteRoomByBranchCode(screeningRoom, options) {
         return __awaiter(this, void 0, void 0, function* () {
-            var _a;
-            const doc = yield this.placeModel.findOneAndDelete(Object.assign({ typeOf: { $eq: factory.placeType.ScreeningRoom }, 'project.id': { $eq: screeningRoom.project.id }, 'containedInPlace.branchCode': { $exists: true, $eq: screeningRoom.containedInPlace.branchCode }, branchCode: screeningRoom.branchCode }, (typeof ((_a = screeningRoom.parentOrganization) === null || _a === void 0 ? void 0 : _a.id) === 'string')
-                ? { 'parentOrganization.id': { $exists: true, $eq: screeningRoom.parentOrganization.id } }
+            const { project, parentOrganization, movieTheaterCode } = options;
+            const doc = yield this.placeModel.findOneAndDelete(Object.assign({ typeOf: { $eq: factory.placeType.ScreeningRoom }, 'project.id': { $eq: project.id }, 'containedInPlace.branchCode': { $exists: true, $eq: movieTheaterCode }, branchCode: screeningRoom.branchCode }, (typeof (parentOrganization === null || parentOrganization === void 0 ? void 0 : parentOrganization.id) === 'string')
+                ? { 'parentOrganization.id': { $exists: true, $eq: parentOrganization.id } }
                 : undefined), {
                 projection: { 'containedInPlace.id': 1, typeOf: 1 }
             })
@@ -430,5 +425,10 @@ class ScreeningRoomRepo {
                 .exec();
         });
     }
+    getCursor(conditions, projection) {
+        return this.placeModel.find(conditions, projection)
+            .sort({ branchCode: factory.sortType.Ascending })
+            .cursor();
+    }
 }
 exports.ScreeningRoomRepo = ScreeningRoomRepo;

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/lib/chevre/repo/place/section.d.ts

@@ -1,6 +1,17 @@
 import type { Connection } 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'>;
+interface IUpdateOptions {
+    project: {
+        id: string;
+    };
+    parentOrganization?: {
+        id?: string;
+    };
+    movieTheaterCode: string;
+    roomCode: string;
+}
 /**
  * セクション編集時レスポンス
  */
@@ -20,22 +31,28 @@ export declare class SectionRepo {
     private readonly civicStructureModel;
     private readonly placeModel;
     constructor(connection: Connection);
-    createScreeningRoomSection(screeningRoomSection: IScreeningRoomSectionWithoutContainsPlace & {
-        parentOrganization?: {
-            id?: string;
+    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>;
     searchScreeningRoomSections(searchConditions: factory.place.screeningRoomSection.ISearchConditions): Promise<IScreeningRoomSectionWithoutContainsPlace[]>;
     /**
      * ルーム指定のセクション検索として再定義(2025-12-07~)
@@ -57,29 +74,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 {};

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

@@ -23,20 +23,12 @@ class SectionRepo {
         this.placeModel = connection.model(place_1.modelName, (0, place_1.createSchema)());
     }
     // tslint:disable-next-line:max-func-body-length
-    createScreeningRoomSection(screeningRoomSection) {
+    createSection(screeningRoomSection, options) {
         return __awaiter(this, void 0, void 0, function* () {
-            var _a;
-            const screeningRoom = screeningRoomSection.containedInPlace;
-            if (typeof (screeningRoom === null || screeningRoom === void 0 ? void 0 : screeningRoom.branchCode) !== 'string') {
-                throw new factory.errors.ArgumentNull('containedInPlace.branchCode');
-            }
-            const movieTheater = screeningRoom.containedInPlace;
-            if (typeof (movieTheater === null || movieTheater === void 0 ? void 0 : movieTheater.branchCode) !== 'string') {
-                throw new factory.errors.ArgumentNull('containedInPlace.containedInPlace.branchCode');
-            }
+            const { project, parentOrganization, movieTheaterCode, roomCode } = options;
             // 施設存在確認
-            const movieTheaterDoc = yield this.civicStructureModel.findOne(Object.assign({ typeOf: { $eq: factory.placeType.MovieTheater }, 'project.id': { $eq: screeningRoomSection.project.id }, branchCode: { $eq: movieTheater.branchCode } }, (typeof ((_a = screeningRoomSection.parentOrganization) === null || _a === void 0 ? void 0 : _a.id) === 'string')
-                ? { 'parentOrganization.id': { $exists: true, $eq: screeningRoomSection.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();
@@ -46,13 +38,13 @@ class SectionRepo {
             // セクションコードが存在しなければ追加する
             const doc = yield this.placeModel.findOneAndUpdate({
                 typeOf: { $eq: factory.placeType.ScreeningRoom },
-                'project.id': { $eq: screeningRoomSection.project.id },
-                'containedInPlace.branchCode': { $exists: true, $eq: movieTheater.branchCode },
-                branchCode: { $eq: screeningRoom.branchCode },
+                'project.id': { $eq: project.id },
+                'containedInPlace.branchCode': { $exists: true, $eq: movieTheaterCode },
+                branchCode: { $eq: roomCode },
                 'containsPlace.branchCode': { $ne: screeningRoomSection.branchCode }
             }, {
                 $push: {
-                    containsPlace: Object.assign({ typeOf: screeningRoomSection.typeOf, branchCode: screeningRoomSection.branchCode, name: screeningRoomSection.name }, (Array.isArray(screeningRoomSection.additionalProperty))
+                    containsPlace: Object.assign({ typeOf: factory.placeType.ScreeningRoomSection, branchCode: screeningRoomSection.branchCode, name: screeningRoomSection.name }, (Array.isArray(screeningRoomSection.additionalProperty))
                         ? { additionalProperty: screeningRoomSection.additionalProperty }
                         : undefined)
                 }
@@ -68,21 +60,16 @@ class SectionRepo {
             return doc.toObject();
         });
     }
+    /**
+     * セクションの名称と追加特性を編集する
+     */
     // tslint:disable-next-line:max-func-body-length
-    updateScreeningRoomSection(screeningRoomSection, $unset) {
+    updateSectionByBranchCode(screeningRoomSection, $unset, options) {
         return __awaiter(this, void 0, void 0, function* () {
-            var _a;
-            const screeningRoom = screeningRoomSection.containedInPlace;
-            if (typeof (screeningRoom === null || screeningRoom === void 0 ? void 0 : screeningRoom.branchCode) !== 'string') {
-                throw new factory.errors.ArgumentNull('containedInPlace.branchCode');
-            }
-            const movieTheater = screeningRoom.containedInPlace;
-            if (typeof (movieTheater === null || movieTheater === void 0 ? void 0 : movieTheater.branchCode) !== 'string') {
-                throw new factory.errors.ArgumentNull('containedInPlace.containedInPlace.branchCode');
-            }
-            const doc = yield this.placeModel.findOneAndUpdate(Object.assign({ typeOf: { $eq: factory.placeType.ScreeningRoom }, 'project.id': { $eq: screeningRoomSection.project.id }, 'containedInPlace.branchCode': { $exists: true, $eq: movieTheater.branchCode }, branchCode: { $eq: screeningRoom.branchCode }, 'containsPlace.branchCode': { $eq: screeningRoomSection.branchCode } }, (typeof ((_a = screeningRoomSection.parentOrganization) === null || _a === void 0 ? void 0 : _a.id) === 'string')
-                ? { 'parentOrganization.id': { $exists: true, $eq: screeningRoomSection.parentOrganization.id } }
-                : undefined), Object.assign(Object.assign(Object.assign(Object.assign({ 'containsPlace.$[screeningRoomSection].branchCode': screeningRoomSection.branchCode }, (screeningRoomSection.name !== undefined && screeningRoomSection !== null)
+            const { project, parentOrganization, movieTheaterCode, roomCode } = 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: screeningRoomSection.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({ 'containsPlace.$[screeningRoomSection].branchCode': screeningRoomSection.branchCode }, (screeningRoomSection.name !== undefined && screeningRoomSection !== null)
                 ? {
                     'containsPlace.$[screeningRoomSection].name': screeningRoomSection.name
                 }
@@ -90,13 +77,73 @@ class SectionRepo {
                 ? {
                     'containsPlace.$[screeningRoomSection].additionalProperty': screeningRoomSection.additionalProperty
                 }
-                : undefined), (Array.isArray(screeningRoomSection.containsPlace) && screeningRoomSection.containsPlace.length > 0)
+                : undefined), ($unset !== undefined && $unset !== null) ? { $unset } : undefined), {
+                new: true,
+                arrayFilters: [
+                    { 'screeningRoomSection.branchCode': screeningRoomSection.branchCode }
+                ],
+                projection: { 'containedInPlace.id': 1, typeOf: 1 }
+            })
+                .exec();
+            if (doc === null) {
+                throw new factory.errors.NotFound(factory.placeType.ScreeningRoomSection);
+            }
+            return doc.toObject();
+        });
+    }
+    /**
+     * セクションの座席を上書きする
+     */
+    // tslint:disable-next-line:max-func-body-length
+    overwriteSeats(screeningRoomSection, options) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const { project, parentOrganization, movieTheaterCode, roomCode } = options;
+            const { containsPlace } = screeningRoomSection;
+            if (!Array.isArray(containsPlace)) {
+                throw new factory.errors.ArgumentNull('containsPlace');
+            }
+            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: screeningRoomSection.branchCode } }, (typeof (parentOrganization === null || parentOrganization === void 0 ? void 0 : parentOrganization.id) === 'string')
+                ? { 'parentOrganization.id': { $exists: true, $eq: parentOrganization.id } }
+                : undefined), Object.assign({}, (containsPlace.length > 0)
                 ? {
-                    'containsPlace.$[screeningRoomSection].containsPlace': screeningRoomSection.containsPlace.map((p) => {
+                    'containsPlace.$[screeningRoomSection].containsPlace': containsPlace.map((p) => {
                         return Object.assign(Object.assign(Object.assign({ typeOf: p.typeOf, branchCode: p.branchCode }, (p.name !== undefined && p.name !== null) ? { name: p.name } : undefined), (Array.isArray(p.seatingType)) ? { seatingType: p.seatingType } : undefined), (Array.isArray(p.additionalProperty)) ? { additionalProperty: p.additionalProperty } : undefined);
                     })
                 }
-                : undefined), ($unset !== undefined && $unset !== null) ? { $unset } : undefined), {
+                : undefined), {
+                new: true,
+                arrayFilters: [
+                    { 'screeningRoomSection.branchCode': screeningRoomSection.branchCode }
+                ],
+                projection: { 'containedInPlace.id': 1, typeOf: 1 }
+            })
+                .exec();
+            if (doc === null) {
+                throw new factory.errors.NotFound(factory.placeType.ScreeningRoomSection);
+            }
+            return doc.toObject();
+        });
+    }
+    // tslint:disable-next-line:max-func-body-length
+    migrateSectionIdentifier(screeningRoomSection) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const screeningRoom = screeningRoomSection.containedInPlace;
+            if (typeof (screeningRoom === null || screeningRoom === void 0 ? void 0 : screeningRoom.branchCode) !== 'string') {
+                throw new factory.errors.ArgumentNull('containedInPlace.branchCode');
+            }
+            const movieTheater = screeningRoom.containedInPlace;
+            if (typeof (movieTheater === null || movieTheater === void 0 ? void 0 : movieTheater.branchCode) !== 'string') {
+                throw new factory.errors.ArgumentNull('containedInPlace.containedInPlace.branchCode');
+            }
+            const doc = yield this.placeModel.findOneAndUpdate({
+                typeOf: { $eq: factory.placeType.ScreeningRoom },
+                'project.id': { $eq: screeningRoomSection.project.id },
+                'containedInPlace.branchCode': { $exists: true, $eq: movieTheater.branchCode },
+                branchCode: { $eq: screeningRoom.branchCode },
+                'containsPlace.branchCode': { $eq: screeningRoomSection.branchCode }
+            }, {
+                'containsPlace.$[screeningRoomSection].identifier': screeningRoomSection.identifier
+            }, {
                 new: true,
                 arrayFilters: [
                     { 'screeningRoomSection.branchCode': screeningRoomSection.branchCode }
@@ -209,7 +256,7 @@ class SectionRepo {
                 { $unwind: '$containsPlace' },
                 ...matchStages,
                 {
-                    $project: Object.assign(Object.assign({ _id: 0, typeOf: '$containsPlace.typeOf', branchCode: '$containsPlace.branchCode', name: '$containsPlace.name', additionalProperty: '$containsPlace.additionalProperty' }, (((_p = searchConditions.$projection) === null || _p === void 0 ? void 0 : _p.containedInPlace) === 1)
+                    $project: Object.assign(Object.assign({ _id: 0, typeOf: '$containsPlace.typeOf', branchCode: '$containsPlace.branchCode', identifier: '$containsPlace.identifier', name: '$containsPlace.name', additionalProperty: '$containsPlace.additionalProperty' }, (((_p = searchConditions.$projection) === null || _p === void 0 ? void 0 : _p.containedInPlace) === 1)
                         ? {
                             containedInPlace: {
                                 typeOf: '$typeOf',
@@ -295,14 +342,14 @@ class SectionRepo {
                 .exec();
         });
     }
-    deleteScreeningRoomSection(screeningRoomSection) {
+    deleteSectionByBranchCode(screeningRoomSection, 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: screeningRoomSection.project.id }, 'containedInPlace.branchCode': {
+            const { project, parentOrganization, movieTheaterCode, roomCode } = options;
+            const doc = yield this.placeModel.findOneAndUpdate(Object.assign({ typeOf: { $eq: factory.placeType.ScreeningRoom }, 'project.id': { $eq: project.id }, 'containedInPlace.branchCode': {
                     $exists: true,
-                    $eq: screeningRoomSection.containedInPlace.containedInPlace.branchCode
-                }, branchCode: { $eq: screeningRoomSection.containedInPlace.branchCode }, 'containsPlace.branchCode': { $eq: screeningRoomSection.branchCode } }, (typeof ((_a = screeningRoomSection.parentOrganization) === null || _a === void 0 ? void 0 : _a.id) === 'string')
-                ? { 'parentOrganization.id': { $exists: true, $eq: screeningRoomSection.parentOrganization.id } }
+                    $eq: movieTheaterCode
+                }, branchCode: { $eq: roomCode }, 'containsPlace.branchCode': { $eq: screeningRoomSection.branchCode } }, (typeof (parentOrganization === null || parentOrganization === void 0 ? void 0 : parentOrganization.id) === 'string')
+                ? { 'parentOrganization.id': { $exists: true, $eq: parentOrganization.id } }
                 : undefined), {
                 $pull: {
                     containsPlace: {

package/lib/chevre/service/assetTransaction/pay/validateAcceptedPaymentMethodIfNeeded.d.ts

@@ -1,16 +1,21 @@
 import * as factory from '../../../factory';
+import type { AcceptedPaymentMethodRepo } from '../../../repo/acceptedPaymentMethod';
 import type { EventRepo } from '../../../repo/event';
 import type { EventSeriesRepo } from '../../../repo/eventSeries';
 /**
  * 必要あらば関連リソースの対応決済方法を検証する
  */
-export declare function validateAcceptedPaymentMethodIfNeeded(params: Pick<factory.assetTransaction.pay.IStartParamsWithoutDetail, 'object'> | {
+export declare function validateAcceptedPaymentMethodIfNeeded(params: Pick<factory.assetTransaction.pay.IStartParamsWithoutDetail, 'object'> & {
+    instrument: factory.action.trade.pay.IPlaceOrderRelatedInstrument[];
+} | {
     object: factory.action.accept.pay.IPayObject & {
         paymentMethod: factory.action.accept.pay.IPaymentMethod & {
             movieTickets: never;
         };
     };
+    instrument: factory.action.accept.pay.IInstrument[];
 }): (repos: {
+    acceptedPaymentMethod: AcceptedPaymentMethodRepo;
     event: EventRepo;
     eventSeries: EventSeriesRepo;
 }) => Promise<void>;