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

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

@@ -23,20 +23,112 @@ class SectionRepo {
         this.placeModel = connection.model(place_1.modelName, (0, place_1.createSchema)());
     }
     // tslint:disable-next-line:max-func-body-length
-    createScreeningRoomSection(screeningRoomSection) {
+    static CREATE_SECTION_MONGO_CONDITIONS(searchConditions) {
+        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r;
+        const matchStages = [{ $match: { typeOf: { $eq: factory.placeType.ScreeningRoom } } }];
+        const projectIdEq = (_b = (_a = searchConditions.project) === null || _a === void 0 ? void 0 : _a.id) === null || _b === void 0 ? void 0 : _b.$eq;
+        if (typeof projectIdEq === 'string') {
+            matchStages.push({
+                $match: { 'project.id': { $eq: projectIdEq } }
+            });
+        }
+        const parentOrganizationIdEq = (_d = (_c = searchConditions.parentOrganization) === null || _c === void 0 ? void 0 : _c.id) === null || _d === void 0 ? void 0 : _d.$eq;
+        if (typeof parentOrganizationIdEq === 'string') {
+            matchStages.push({
+                $match: { 'parentOrganization.id': { $exists: true, $eq: parentOrganizationIdEq } }
+            });
+        }
+        // 施設ID
+        const movieTheaterIdEq = (_g = (_f = (_e = searchConditions.containedInPlace) === null || _e === void 0 ? void 0 : _e.containedInPlace) === null || _f === void 0 ? void 0 : _f.id) === null || _g === void 0 ? void 0 : _g.$eq;
+        if (typeof movieTheaterIdEq === 'string') {
+            matchStages.push({
+                $match: {
+                    'containedInPlace.id': { $exists: true, $eq: movieTheaterIdEq }
+                }
+            });
+        }
+        // 施設コード
+        const movieTheaterBranchCodeEq = (_k = (_j = (_h = searchConditions.containedInPlace) === null || _h === void 0 ? void 0 : _h.containedInPlace) === null || _j === void 0 ? void 0 : _j.branchCode) === null || _k === void 0 ? void 0 : _k.$eq;
+        if (typeof movieTheaterBranchCodeEq === 'string') {
+            matchStages.push({
+                $match: {
+                    'containedInPlace.branchCode': { $exists: true, $eq: movieTheaterBranchCodeEq }
+                }
+            });
+        }
+        // ルームコード
+        const containedInPlaceBranchCodeEq = (_m = (_l = searchConditions.containedInPlace) === null || _l === void 0 ? void 0 : _l.branchCode) === null || _m === void 0 ? void 0 : _m.$eq;
+        if (typeof containedInPlaceBranchCodeEq === 'string') {
+            matchStages.push({
+                $match: {
+                    branchCode: { $eq: containedInPlaceBranchCodeEq }
+                }
+            });
+        }
+        // セクションコード
+        const sectionBranchCodeEq = (_o = searchConditions === null || searchConditions === void 0 ? void 0 : searchConditions.branchCode) === null || _o === void 0 ? void 0 : _o.$eq;
+        if (typeof sectionBranchCodeEq === 'string') {
+            matchStages.push({
+                $match: {
+                    'containsPlace.branchCode': {
+                        $exists: true,
+                        $eq: sectionBranchCodeEq
+                    }
+                }
+            });
+        }
+        const nameCodeRegex = (_p = searchConditions.name) === null || _p === void 0 ? void 0 : _p.$regex;
+        if (typeof nameCodeRegex === 'string') {
+            matchStages.push({
+                $match: {
+                    $or: [
+                        {
+                            'containsPlace.name.ja': {
+                                $exists: true,
+                                $regex: new RegExp(nameCodeRegex)
+                            }
+                        },
+                        {
+                            'containsPlace.name.en': {
+                                $exists: true,
+                                $regex: new RegExp(nameCodeRegex)
+                            }
+                        }
+                    ]
+                }
+            });
+        }
+        const branchCodeRegex = (_q = searchConditions.branchCode) === null || _q === void 0 ? void 0 : _q.$regex;
+        if (typeof branchCodeRegex === 'string') {
+            matchStages.push({
+                $match: {
+                    'containsPlace.branchCode': {
+                        $exists: true,
+                        $regex: new RegExp(branchCodeRegex)
+                    }
+                }
+            });
+        }
+        const additionalPropertyElemMatch = (_r = searchConditions.additionalProperty) === null || _r === void 0 ? void 0 : _r.$elemMatch;
+        if (additionalPropertyElemMatch !== undefined && additionalPropertyElemMatch !== null) {
+            matchStages.push({
+                $match: {
+                    'containsPlace.additionalProperty': {
+                        $exists: true,
+                        $elemMatch: additionalPropertyElemMatch
+                    }
+                }
+            });
+        }
+        return matchStages;
+    }
+    // tslint:disable-next-line:max-func-body-length
+    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 +138,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 +160,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 +177,40 @@ 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 }
@@ -110,106 +224,76 @@ class SectionRepo {
             return doc.toObject();
         });
     }
-    // tslint:disable-next-line:cyclomatic-complexity max-func-body-length
-    searchScreeningRoomSections(searchConditions) {
+    // tslint:disable-next-line:max-func-body-length
+    migrateSectionIdentifier(screeningRoomSection) {
         return __awaiter(this, void 0, void 0, function* () {
-            var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q;
-            const matchStages = [{ $match: { typeOf: { $eq: factory.placeType.ScreeningRoom } } }];
-            const projectIdEq = (_b = (_a = searchConditions.project) === null || _a === void 0 ? void 0 : _a.id) === null || _b === void 0 ? void 0 : _b.$eq;
-            if (typeof projectIdEq === 'string') {
-                matchStages.push({
-                    $match: { 'project.id': { $eq: projectIdEq } }
-                });
-            }
-            const parentOrganizationIdEq = (_d = (_c = searchConditions.parentOrganization) === null || _c === void 0 ? void 0 : _c.id) === null || _d === void 0 ? void 0 : _d.$eq;
-            if (typeof parentOrganizationIdEq === 'string') {
-                matchStages.push({
-                    $match: { 'parentOrganization.id': { $exists: true, $eq: parentOrganizationIdEq } }
-                });
-            }
-            // 施設コード
-            const movieTheaterBranchCodeEq = (_g = (_f = (_e = searchConditions.containedInPlace) === null || _e === void 0 ? void 0 : _e.containedInPlace) === null || _f === void 0 ? void 0 : _f.branchCode) === null || _g === void 0 ? void 0 : _g.$eq;
-            if (typeof movieTheaterBranchCodeEq === 'string') {
-                matchStages.push({
-                    $match: {
-                        'containedInPlace.branchCode': {
-                            $exists: true,
-                            $eq: movieTheaterBranchCodeEq
-                        }
-                    }
-                });
-            }
-            // ルームコード
-            const containedInPlaceBranchCodeEq = (_j = (_h = searchConditions.containedInPlace) === null || _h === void 0 ? void 0 : _h.branchCode) === null || _j === void 0 ? void 0 : _j.$eq;
-            if (typeof containedInPlaceBranchCodeEq === 'string') {
-                matchStages.push({
-                    $match: {
-                        branchCode: {
-                            $eq: containedInPlaceBranchCodeEq
-                        }
-                    }
-                });
-            }
-            // セクションコード
-            const sectionBranchCodeEq = (_k = searchConditions === null || searchConditions === void 0 ? void 0 : searchConditions.branchCode) === null || _k === void 0 ? void 0 : _k.$eq;
-            if (typeof sectionBranchCodeEq === 'string') {
-                matchStages.push({
-                    $match: {
-                        'containsPlace.branchCode': {
-                            $exists: true,
-                            $eq: sectionBranchCodeEq
-                        }
-                    }
-                });
+            const screeningRoom = screeningRoomSection.containedInPlace;
+            if (typeof (screeningRoom === null || screeningRoom === void 0 ? void 0 : screeningRoom.branchCode) !== 'string') {
+                throw new factory.errors.ArgumentNull('containedInPlace.branchCode');
             }
-            const nameCodeRegex = (_l = searchConditions.name) === null || _l === void 0 ? void 0 : _l.$regex;
-            if (typeof nameCodeRegex === 'string') {
-                matchStages.push({
-                    $match: {
-                        $or: [
-                            {
-                                'containsPlace.name.ja': {
-                                    $exists: true,
-                                    $regex: new RegExp(nameCodeRegex)
-                                }
-                            },
-                            {
-                                'containsPlace.name.en': {
-                                    $exists: true,
-                                    $regex: new RegExp(nameCodeRegex)
-                                }
-                            }
-                        ]
-                    }
-                });
+            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 branchCodeRegex = (_m = searchConditions.branchCode) === null || _m === void 0 ? void 0 : _m.$regex;
-            if (typeof branchCodeRegex === 'string') {
-                matchStages.push({
-                    $match: {
-                        'containsPlace.branchCode': {
-                            $exists: true,
-                            $regex: new RegExp(branchCodeRegex)
-                        }
-                    }
-                });
+            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 }
+                ],
+                projection: { 'containedInPlace.id': 1, typeOf: 1 }
+            })
+                .exec();
+            if (doc === null) {
+                throw new factory.errors.NotFound(factory.placeType.ScreeningRoomSection);
             }
-            const additionalPropertyElemMatch = (_o = searchConditions.additionalProperty) === null || _o === void 0 ? void 0 : _o.$elemMatch;
-            if (additionalPropertyElemMatch !== undefined && additionalPropertyElemMatch !== null) {
-                matchStages.push({
-                    $match: {
-                        'containsPlace.additionalProperty': {
-                            $exists: true,
-                            $elemMatch: additionalPropertyElemMatch
-                        }
+            return doc.toObject();
+        });
+    }
+    /**
+     * 最小限のprojectionでセクション検索を再定義
+     * 2026-01-08~
+     */
+    findSections(params) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const aggregate = this.placeModel.aggregate([
+                { $unwind: '$containsPlace' },
+                ...SectionRepo.CREATE_SECTION_MONGO_CONDITIONS(params),
+                {
+                    $project: {
+                        _id: 0,
+                        branchCode: '$containsPlace.branchCode',
+                        name: '$containsPlace.name',
+                        additionalProperty: '$containsPlace.additionalProperty'
                     }
-                });
+                }
+            ]);
+            const { limit, page } = params;
+            if (typeof limit === 'number' && limit > 0) {
+                const pageMustBePositive = (typeof page === 'number' && page > 0) ? page : 1;
+                aggregate.skip(limit * (pageMustBePositive - 1))
+                    .limit(limit);
             }
+            return aggregate
+                .option({ maxTimeMS: settings_1.MONGO_MAX_TIME_MS })
+                .exec();
+        });
+    }
+    searchScreeningRoomSections(searchConditions) {
+        return __awaiter(this, void 0, void 0, function* () {
+            var _a, _b;
             const aggregate = this.placeModel.aggregate([
                 { $unwind: '$containsPlace' },
-                ...matchStages,
+                ...SectionRepo.CREATE_SECTION_MONGO_CONDITIONS(searchConditions),
                 {
-                    $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' }, (((_a = searchConditions.$projection) === null || _a === void 0 ? void 0 : _a.containedInPlace) === 1)
                         ? {
                             containedInPlace: {
                                 typeOf: '$typeOf',
@@ -223,7 +307,7 @@ class SectionRepo {
                                 }
                             }
                         }
-                        : undefined), (((_q = searchConditions.$projection) === null || _q === void 0 ? void 0 : _q.seatCount) === 1)
+                        : undefined), (((_b = searchConditions.$projection) === null || _b === void 0 ? void 0 : _b.seatCount) === 1)
                         ? {
                             seatCount: {
                                 $cond: {
@@ -295,14 +379,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/repository.d.ts

@@ -51,6 +51,7 @@ import type { PaymentServiceProviderRepo } from './repo/paymentServiceProvider';
 import type { PendingReservationRepo } from './repo/pendingReservation';
 import type { PermitRepo } from './repo/permit';
 import type { BusStopRepo } from './repo/place/busStop';
+import type { EntranceGateRepo } from './repo/place/entranceGate';
 import type { HasPOSRepo } from './repo/place/hasPOS';
 import type { MovieTheaterRepo } from './repo/place/movieTheater';
 import type { ScreeningRoomRepo } from './repo/place/screeningRoom';
@@ -316,6 +317,13 @@ export declare namespace place {
     namespace BusStop {
         function createInstance(...params: ConstructorParameters<typeof BusStopRepo>): Promise<BusStopRepo>;
     }
+    type EntranceGate = EntranceGateRepo;
+    /**
+     * 施設の入場ゲートリポジトリ
+     */
+    namespace EntranceGate {
+        function createInstance(...params: ConstructorParameters<typeof EntranceGateRepo>): Promise<EntranceGateRepo>;
+    }
     type HasPOS = HasPOSRepo;
     /**
      * 施設PointOfSalesリポジトリ

package/lib/chevre/repository.js

@@ -721,6 +721,22 @@ var place;
         }
         BusStop.createInstance = createInstance;
     })(BusStop = place.BusStop || (place.BusStop = {}));
+    /**
+     * 施設の入場ゲートリポジトリ
+     */
+    let EntranceGate;
+    (function (EntranceGate) {
+        let repo;
+        function createInstance(...params) {
+            return __awaiter(this, void 0, void 0, function* () {
+                if (repo === undefined) {
+                    repo = (yield Promise.resolve().then(() => require('./repo/place/entranceGate'))).EntranceGateRepo;
+                }
+                return new repo(...params);
+            });
+        }
+        EntranceGate.createInstance = createInstance;
+    })(EntranceGate = place.EntranceGate || (place.EntranceGate = {}));
     /**
      * 施設PointOfSalesリポジトリ
      */

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>;

package/lib/chevre/service/assetTransaction/pay/validateAcceptedPaymentMethodIfNeeded.js

@@ -19,14 +19,18 @@ const debug = createDebug('chevre-domain:service:assetTransaction:pay');
 /**
  * 必要あらば関連リソースの対応決済方法を検証する
  */
+// tslint:disable-next-line:max-func-body-length
 function validateAcceptedPaymentMethodIfNeeded(params) {
+    // tslint:disable-next-line:max-func-body-length
     return (repos) => __awaiter(this, void 0, void 0, function* () {
         var _a, _b;
+        const now = new Date();
         /**
          * 検証対象のイベントIDリスト
          */
         let checkingEventIds;
         const paymentServiceType = params.object.typeOf;
+        const paymentServiceId = params.object.id;
         // CreditCard or MovieTicket?
         if (paymentServiceType === factory.service.paymentService.PaymentServiceType.CreditCard) {
             // クレジットカードIF決済の場合、objectに注文アイテム指定があればそちらで検証する
@@ -77,10 +81,28 @@ function validateAcceptedPaymentMethodIfNeeded(params) {
                 }
                 if (((_b = eventSeries.offers) === null || _b === void 0 ? void 0 : _b.typeOf) === factory.offerType.AggregateOffer) {
                     // 対応決済方法オファーIDの指定が必要
-                    throw new factory.errors.ArgumentNull('acceptedPaymentMethodOfferId');
-                    // if (paymentAccepted !== true) {
-                    //     throw new factory.errors.Argument('recipient', `payment not accepted [${paymentMethodType}]`);
-                    // }
+                    const acceptedPaymentMethodOfferIds = [];
+                    params.instrument.forEach((instrument) => {
+                        if (instrument.typeOf === factory.offerType.Offer) {
+                            acceptedPaymentMethodOfferIds.push(instrument.id);
+                        }
+                    });
+                    if (acceptedPaymentMethodOfferIds.length === 0) {
+                        throw new factory.errors.ArgumentNull('acceptedPaymentMethodOfferIds');
+                    }
+                    // 全施設コンテンツについて有効な対応決済方法オファーの存在を検証
+                    const validAcceptedPaymentMethodOffer = (yield repos.acceptedPaymentMethod.findAcceptedPaymentMethods({
+                        limit: 1,
+                        page: 1,
+                        id: { $in: acceptedPaymentMethodOfferIds }, // 指定されたIDで
+                        itemOffered: { id: { $eq: eventSeriesId } }, // リソースに対して
+                        acceptedPaymentMethod: { id: { $eq: paymentServiceId } }, // 決済方法を許可
+                        validFrom: { $lte: now }, // 現在有効
+                        validThrough: { $gte: now } // 現在有効
+                    }, ['identifier'])).shift();
+                    if (validAcceptedPaymentMethodOffer === undefined) {
+                        throw new factory.errors.NotFound(factory.offerType.Offer, `payment not accepted. eventSeriesId: ${eventSeriesId}`);
+                    }
                 }
                 else {
                     // 集約オファーでなければ検証の必要なし

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

@@ -5,6 +5,7 @@ import * as GMO from '@motionpicture/gmo-service';
 import * as factory from '../../factory';
 import { Settings } from '../../settings';
 import type { AcceptedOfferRepo } from '../../repo/acceptedOffer';
+import type { AcceptedPaymentMethodRepo } from '../../repo/acceptedPaymentMethod';
 import type { AccountingReportRepo } from '../../repo/accountingReport';
 import type { ActionRepo } from '../../repo/action';
 import type { AssetTransactionRepo } from '../../repo/assetTransaction';
@@ -21,6 +22,7 @@ import type { TaskRepo } from '../../repo/task';
 import * as CreditCardPayment from '../payment/creditCard';
 import * as MovieTicketPayment from '../payment/movieTicket';
 export interface IStartOperationRepos {
+    acceptedPaymentMethod: AcceptedPaymentMethodRepo;
     accountingReport: AccountingReportRepo;
     action: ActionRepo;
     credentials: CredentialsRepo;
@@ -62,6 +64,7 @@ export type ICheckOperation<T> = (repos: {
     paymentServiceProvider: PaymentServiceProviderRepo;
 }, settings: Settings) => Promise<T>;
 export type IPublishPaymentUrlOperation<T> = (repos: {
+    acceptedPaymentMethod: AcceptedPaymentMethodRepo;
     action: ActionRepo;
     event: EventRepo;
     eventSeries: EventSeriesRepo;

package/lib/chevre/service/event/processUpdateMovieTheater.d.ts

@@ -19,6 +19,6 @@ declare function processUpdateMovieTheater(params: IImportFromCOAParams): (repos
         id: string;
     };
     movieTheater: IMovieTheater;
-    screeningRooms: Omit<factory.place.screeningRoom.IPlace, "containsPlace" | "parentOrganization">[];
+    screeningRooms: Pick<factory.place.screeningRoom.IPlace, "additionalProperty" | "address" | "branchCode" | "name" | "openSeatingAllowed">[];
 }>;
 export { processUpdateMovieTheater };

package/lib/chevre/service/event/processUpdateMovieTheater.js

@@ -65,7 +65,7 @@ function processUpdateMovieTheater(params) {
             if (movieTheater === undefined) {
                 throw new factory.errors.NotFound(factory.placeType.MovieTheater);
             }
-            screeningRooms = yield repos.screeningRoom.searchScreeningRooms({
+            screeningRooms = yield repos.screeningRoom.findRooms({
                 project: { id: { $eq: params.project.id } },
                 containedInPlace: { branchCode: { $eq: movieTheater.branchCode } }
             });

package/lib/chevre/service/event/saveScreeningEvents.d.ts

@@ -7,7 +7,7 @@ import * as factory from '../../factory';
 type IMovieTheater = Pick<factory.place.movieTheater.IPlace, 'id' | 'typeOf' | 'branchCode' | 'name' | 'kanaName'>;
 declare function saveScreeningEvents(params: {
     movieTheater: IMovieTheater;
-    screeningRooms: Pick<factory.place.screeningRoom.IPlace, 'typeOf' | 'branchCode' | 'name' | 'maximumAttendeeCapacity'>[];
+    screeningRooms: Pick<factory.place.screeningRoom.IPlace, 'branchCode' | 'name' | 'maximumAttendeeCapacity'>[];
     screeningEventSerieses?: factory.eventSeries.IEvent[];
     project: {
         id: string;

package/lib/chevre/service/event/saveScreeningEvents.js

@@ -266,7 +266,7 @@ function createScreeningEventFromCOA(params) {
         name: params.superEvent.name,
         eventStatus: factory.eventStatusType.EventScheduled,
         location: {
-            typeOf: params.screenRoom.typeOf,
+            typeOf: factory.placeType.ScreeningRoom,
             branchCode: params.screenRoom.branchCode,
             name: params.screenRoom.name
         },

package/lib/chevre/service/offer/event/searchEventTicketOffers.js

@@ -127,7 +127,7 @@ function searchTicketOffersByItemOffered(params) {
 function searchEventTicketOffersByEvent(params) {
     // tslint:disable-next-line:max-func-body-length
     return (repos) => __awaiter(this, void 0, void 0, function* () {
-        var _a;
+        var _a, _b;
         const event = params.event;
         let soundFormatTypes = [];
         let videoFormatTypes = [];
@@ -137,13 +137,16 @@ function searchEventTicketOffersByEvent(params) {
                 page: 1,
                 id: { $eq: event.superEvent.id }
                 // typeOf: factory.eventType.ScreeningEventSeries
-            }, ['soundFormat', 'videoFormat']);
+            }, 
+            // ['soundFormat', 'videoFormat', 'subEvent']
+            ['soundFormat', 'subEvent']);
             const superEvent = superEvents.shift();
             if (superEvent === undefined) {
                 throw new factory.errors.NotFound(factory.eventType.ScreeningEventSeries);
             }
             soundFormatTypes = (Array.isArray(superEvent.soundFormat)) ? superEvent.soundFormat.map((f) => f.typeOf) : [];
-            videoFormatTypes = (Array.isArray(superEvent.videoFormat)) ? superEvent.videoFormat.map((f) => f.typeOf) : [];
+            // videoFormatTypes = (Array.isArray(superEvent.videoFormat)) ? superEvent.videoFormat.map((f) => f.typeOf) : [];
+            videoFormatTypes = (Array.isArray((_a = superEvent.subEvent) === null || _a === void 0 ? void 0 : _a.videoFormat)) ? superEvent.subEvent.videoFormat : [];
         }
         const unacceptedPaymentMethod = getUnacceptedPaymentMethodByEvent({ event });
         // 上映方式がなければMovieTicket除外(2023-02-21~)
@@ -151,7 +154,7 @@ function searchEventTicketOffersByEvent(params) {
         // 興行設定があれば興行のカタログを参照する(2022-08-31~)
         const eventOffers = event.offers;
         const { availableOffers, sortedOfferIds } = yield searchTicketOffersByItemOffered({
-            itemOffered: { id: String((_a = eventOffers === null || eventOffers === void 0 ? void 0 : eventOffers.itemOffered) === null || _a === void 0 ? void 0 : _a.id) },
+            itemOffered: { id: String((_b = eventOffers === null || eventOffers === void 0 ? void 0 : eventOffers.itemOffered) === null || _b === void 0 ? void 0 : _b.id) },
             // ids: params.ids,
             store: params.store,
             limit: params.limit,