@chevre/domain 23.2.0-alpha.15 → 23.2.0-alpha.17

package/example/src/chevre/event/importEventsFromCOAByTitle.ts

@@ -67,7 +67,7 @@ async function main() {
     }
     console.log('movieTheater:', movieTheater);
 
-    const screeningRooms = await roomRepo.searchScreeningRooms({
+    const screeningRooms = await roomRepo.findRooms({
         project: { id: { $eq: project.id } },
         containedInPlace: { branchCode: { $eq: movieTheater.branchCode } },
         branchCode: { $eq: roomCode }

package/example/src/chevre/eventSeries/migrateEventSeriesVideoFormat.ts

@@ -13,7 +13,7 @@ async function main() {
     const cursor = eventSeriesRepo.getCursor(
         {
             // _id: { $eq: 'al9s38bj6' },
-            'project.id': { $ne: 'sskts-development' }
+            'project.id': { $nin: ['sskts-development', 'sskts-test', 'sskts-production'] }
         },
         {
             // _id: 1,

package/example/src/chevre/place/findRooms.ts

@@ -0,0 +1,24 @@
+// tslint:disable:no-console
+import * as mongoose from 'mongoose';
+
+import { chevre } from '../../../../lib/index';
+
+const project = { id: String(process.env.PROJECT_ID) };
+
+async function main() {
+    await mongoose.connect(<string>process.env.MONGOLAB_URI, { autoIndex: false });
+
+    const roomRepo = await chevre.repository.place.ScreeningRoom.createInstance(mongoose.connection);
+
+    const rooms = await roomRepo.findRooms({
+        limit: 20,
+        page: 1,
+        project: { id: { $eq: project.id } }
+    });
+    console.log(rooms);
+    console.log(rooms.length);
+}
+
+main()
+    .then(console.log)
+    .catch(console.error);

package/example/src/chevre/roles/{addAdminSeatReadPermissionIfNotExists.ts → addAdminMovieTheaterReadPermissionIfNotExists.ts}

@@ -15,7 +15,8 @@ async function main() {
         chevre.factory.role.organizationRole.RoleName.TicketClerk
     ];
     const permissions = [
-        'admin.sellers.seats.read'
+        'admin.sellers.entranceGates.read',
+        'admin.sellers.movieTheaters.read'
     ];
     for (const roleName of roleNames) {
         for (const permission of permissions) {

package/example/src/chevre/roles/{addAdminSeatWritePermissionIfNotExists.ts → addAdminMovieTheaterWritePermissionIfNotExists.ts}

@@ -15,7 +15,8 @@ async function main() {
         // chevre.factory.role.organizationRole.RoleName.TicketClerk
     ];
     const permissions = [
-        'admin.sellers.seats.*'
+        'admin.sellers.entranceGates.*',
+        'admin.sellers.movieTheaters.*'
     ];
     for (const roleName of roleNames) {
         for (const permission of permissions) {

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

@@ -0,0 +1,30 @@
+import { Connection } from 'mongoose';
+import * as factory from '../../factory';
+/**
+ * ゲートを操作する組織
+ */
+interface IOperator {
+    /**
+     * 施設ID
+     */
+    id: string;
+}
+type IEntranceGate = Pick<factory.place.movieTheater.IEntranceGate, 'identifier' | 'name'>;
+/**
+ * 施設の入場ゲートリポジトリ
+ */
+export declare class EntranceGateRepo {
+    private readonly operator;
+    private readonly civicStructureModel;
+    constructor(connection: Connection, operater: IOperator);
+    findEntranceGates(params: {
+        limit: number;
+        page: number;
+        project?: {
+            id?: {
+                $eq?: string;
+            };
+        };
+    }): Promise<IEntranceGate[]>;
+}
+export {};

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

@@ -0,0 +1,62 @@
+"use strict";
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.EntranceGateRepo = void 0;
+const mongoose_1 = require("mongoose");
+const factory = require("../../factory");
+const settings_1 = require("../../settings");
+const civicStructure_1 = require("../mongoose/schemas/civicStructure");
+/**
+ * 施設の入場ゲートリポジトリ
+ */
+class EntranceGateRepo {
+    constructor(connection, operater) {
+        this.civicStructureModel = connection.model(civicStructure_1.modelName, (0, civicStructure_1.createSchema)());
+        this.operator = operater;
+    }
+    findEntranceGates(params) {
+        return __awaiter(this, void 0, void 0, function* () {
+            var _a, _b;
+            const matchStages = [
+                { $match: { _id: { $eq: new mongoose_1.Types.ObjectId(this.operator.id) } } }
+            ];
+            const projectIdEq = (_b = (_a = params.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 aggregate = this.civicStructureModel.aggregate([
+                {
+                    $unwind: {
+                        path: '$hasEntranceGate'
+                    }
+                },
+                ...matchStages,
+                { $sort: { 'hasEntranceGate.identifier': factory.sortType.Ascending } },
+                {
+                    $project: {
+                        _id: 0,
+                        identifier: '$hasEntranceGate.identifier',
+                        name: '$hasEntranceGate.name'
+                    }
+                }
+            ]);
+            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();
+        });
+    }
+}
+exports.EntranceGateRepo = EntranceGateRepo;

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

@@ -1,6 +1,7 @@
-import type { Connection, FilterQuery } from 'mongoose';
+import type { Connection, FilterQuery, PipelineStage } from 'mongoose';
 import * as factory from '../../factory';
 export type IScreeningRoomFoundByBranchCode = Pick<factory.place.screeningRoom.IPlace, 'typeOf' | 'branchCode' | 'name' | 'containsPlace' | 'seatCount' | 'parentOrganization'>;
+type IMatchStage = PipelineStage.Match;
 interface IUpdateOptions {
     project: {
         id: string;
@@ -32,6 +33,7 @@ export declare class ScreeningRoomRepo {
     private readonly civicStructureModel;
     private readonly placeModel;
     constructor(connection: Connection);
+    static CREATE_ROOM_MONGO_CONDITIONS(searchConditions: Omit<factory.place.screeningRoom.ISearchConditions, '$projection' | 'limit' | 'page'>): IMatchStage[];
     saveScreeningRooms4coa(params: IMovieTheaterIncludingScreeningRooms): Promise<void>;
     createRoom(screeningRoom: Pick<factory.place.screeningRoom.IPlace, 'additionalProperty' | 'address' | 'branchCode' | 'name' | 'openSeatingAllowed'>, options: IUpdateOptions): Promise<IUpdateScreeningRoomResult>;
     updateRoomByBranchCode(screeningRoom: Pick<factory.place.screeningRoom.IPlace, 'additionalProperty' | 'address' | 'branchCode' | 'name' | 'openSeatingAllowed'>, $unset: any, options: IUpdateOptions): Promise<IUpdateScreeningRoomResult>;
@@ -59,6 +61,7 @@ export declare class ScreeningRoomRepo {
         };
     }): Promise<import("mongodb").DeleteResult>;
     searchScreeningRooms(searchConditions: factory.place.screeningRoom.ISearchConditions): Promise<Omit<factory.place.screeningRoom.IPlace, 'containsPlace' | 'parentOrganization'>[]>;
+    findRooms(params: Omit<factory.place.screeningRoom.ISearchConditions, '$projection'>): Promise<Pick<factory.place.screeningRoom.IPlace, 'additionalProperty' | 'address' | 'branchCode' | 'name' | 'openSeatingAllowed' | 'maximumAttendeeCapacity'>[]>;
     /**
      * セクションと座席も含めたひとつのルームを取得する
      */

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

@@ -33,6 +33,120 @@ class ScreeningRoomRepo {
         this.civicStructureModel = connection.model(civicStructure_1.modelName, (0, civicStructure_1.createSchema)());
         this.placeModel = connection.model(place_1.modelName, (0, place_1.createSchema)());
     }
+    // tslint:disable-next-line:max-func-body-length
+    static CREATE_ROOM_MONGO_CONDITIONS(searchConditions) {
+        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l;
+        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 containedInPlaceIdEq = (_f = (_e = searchConditions.containedInPlace) === null || _e === void 0 ? void 0 : _e.id) === null || _f === void 0 ? void 0 : _f.$eq;
+        if (typeof containedInPlaceIdEq === 'string') {
+            matchStages.push({
+                $match: {
+                    'containedInPlace.id': {
+                        $exists: true,
+                        $eq: containedInPlaceIdEq
+                    }
+                }
+            });
+        }
+        if (searchConditions.containedInPlace !== undefined) {
+            // 施設コード
+            if (searchConditions.containedInPlace.branchCode !== undefined) {
+                if (typeof searchConditions.containedInPlace.branchCode.$eq === 'string') {
+                    matchStages.push({
+                        $match: {
+                            'containedInPlace.branchCode': {
+                                $exists: true,
+                                $eq: searchConditions.containedInPlace.branchCode.$eq
+                            }
+                        }
+                    });
+                }
+            }
+        }
+        const branchCodeEq = (_g = searchConditions.branchCode) === null || _g === void 0 ? void 0 : _g.$eq;
+        if (typeof branchCodeEq === 'string') {
+            matchStages.push({
+                $match: {
+                    branchCode: { $eq: branchCodeEq }
+                }
+            });
+        }
+        const branchCodeIn = (_h = searchConditions.branchCode) === null || _h === void 0 ? void 0 : _h.$in;
+        if (Array.isArray(branchCodeIn)) {
+            matchStages.push({
+                $match: {
+                    branchCode: { $in: branchCodeIn }
+                }
+            });
+        }
+        const branchCodeRegex = (_j = searchConditions.branchCode) === null || _j === void 0 ? void 0 : _j.$regex;
+        if (typeof branchCodeRegex === 'string') {
+            matchStages.push({
+                $match: {
+                    branchCode: {
+                        $regex: new RegExp(branchCodeRegex)
+                    }
+                }
+            });
+        }
+        const nameCodeRegex = (_k = searchConditions.name) === null || _k === void 0 ? void 0 : _k.$regex;
+        if (typeof nameCodeRegex === 'string') {
+            matchStages.push({
+                $match: {
+                    $or: [
+                        {
+                            'name.ja': {
+                                $exists: true,
+                                $regex: new RegExp(nameCodeRegex)
+                            }
+                        },
+                        {
+                            'name.en': {
+                                $exists: true,
+                                $regex: new RegExp(nameCodeRegex)
+                            }
+                        }
+                    ]
+                }
+            });
+        }
+        const openSeatingAllowed = searchConditions.openSeatingAllowed;
+        if (typeof openSeatingAllowed === 'boolean') {
+            matchStages.push({
+                $match: {
+                    openSeatingAllowed: {
+                        $exists: true,
+                        $eq: openSeatingAllowed
+                    }
+                }
+            });
+        }
+        const additionalPropertyElemMatch = (_l = searchConditions.additionalProperty) === null || _l === void 0 ? void 0 : _l.$elemMatch;
+        if (additionalPropertyElemMatch !== undefined && additionalPropertyElemMatch !== null) {
+            matchStages.push({
+                $match: {
+                    additionalProperty: {
+                        $exists: true,
+                        $elemMatch: additionalPropertyElemMatch
+                    }
+                }
+            });
+        }
+        return matchStages;
+    }
     saveScreeningRooms4coa(params) {
         return __awaiter(this, void 0, void 0, function* () {
             const { containsPlace } = params, movieTheater4update = __rest(params, ["containsPlace"]);
@@ -189,130 +303,19 @@ class ScreeningRoomRepo {
                 .exec();
         });
     }
-    // tslint:disable-next-line:cyclomatic-complexity max-func-body-length
     searchScreeningRooms(searchConditions) {
         return __awaiter(this, void 0, void 0, function* () {
-            var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o;
-            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 containedInPlaceIdEq = (_f = (_e = searchConditions.containedInPlace) === null || _e === void 0 ? void 0 : _e.id) === null || _f === void 0 ? void 0 : _f.$eq;
-            if (typeof containedInPlaceIdEq === 'string') {
-                matchStages.push({
-                    $match: {
-                        'containedInPlace.id': {
-                            $exists: true,
-                            $eq: containedInPlaceIdEq
-                        }
-                    }
-                });
-            }
-            if (searchConditions.containedInPlace !== undefined) {
-                // 施設コード
-                if (searchConditions.containedInPlace.branchCode !== undefined) {
-                    if (typeof searchConditions.containedInPlace.branchCode.$eq === 'string') {
-                        matchStages.push({
-                            $match: {
-                                'containedInPlace.branchCode': {
-                                    $exists: true,
-                                    $eq: searchConditions.containedInPlace.branchCode.$eq
-                                }
-                            }
-                        });
-                    }
-                }
-            }
-            const branchCodeEq = (_g = searchConditions.branchCode) === null || _g === void 0 ? void 0 : _g.$eq;
-            if (typeof branchCodeEq === 'string') {
-                matchStages.push({
-                    $match: {
-                        branchCode: { $eq: branchCodeEq }
-                    }
-                });
-            }
-            const branchCodeIn = (_h = searchConditions.branchCode) === null || _h === void 0 ? void 0 : _h.$in;
-            if (Array.isArray(branchCodeIn)) {
-                matchStages.push({
-                    $match: {
-                        branchCode: { $in: branchCodeIn }
-                    }
-                });
-            }
-            const branchCodeRegex = (_j = searchConditions.branchCode) === null || _j === void 0 ? void 0 : _j.$regex;
-            if (typeof branchCodeRegex === 'string') {
-                matchStages.push({
-                    $match: {
-                        branchCode: {
-                            $regex: new RegExp(branchCodeRegex)
-                        }
-                    }
-                });
-            }
-            const nameCodeRegex = (_k = searchConditions.name) === null || _k === void 0 ? void 0 : _k.$regex;
-            if (typeof nameCodeRegex === 'string') {
-                matchStages.push({
-                    $match: {
-                        $or: [
-                            {
-                                'name.ja': {
-                                    $exists: true,
-                                    $regex: new RegExp(nameCodeRegex)
-                                }
-                            },
-                            {
-                                'name.en': {
-                                    $exists: true,
-                                    $regex: new RegExp(nameCodeRegex)
-                                }
-                            }
-                        ]
-                    }
-                });
-            }
-            const openSeatingAllowed = searchConditions.openSeatingAllowed;
-            if (typeof openSeatingAllowed === 'boolean') {
-                matchStages.push({
-                    $match: {
-                        openSeatingAllowed: {
-                            $exists: true,
-                            $eq: openSeatingAllowed
-                        }
-                    }
-                });
-            }
-            const additionalPropertyElemMatch = (_l = searchConditions.additionalProperty) === null || _l === void 0 ? void 0 : _l.$elemMatch;
-            if (additionalPropertyElemMatch !== undefined && additionalPropertyElemMatch !== null) {
-                matchStages.push({
-                    $match: {
-                        additionalProperty: {
-                            $exists: true,
-                            $elemMatch: additionalPropertyElemMatch
-                        }
-                    }
-                });
-            }
+            var _a, _b;
             const aggregate = this.placeModel.aggregate([
                 { $sort: { branchCode: factory.sortType.Ascending } },
-                // { $unwind: '$containsPlace' },
-                ...matchStages,
+                ...ScreeningRoomRepo.CREATE_ROOM_MONGO_CONDITIONS(searchConditions),
                 {
                     $project: Object.assign(Object.assign({ _id: 0, typeOf: '$typeOf', branchCode: '$branchCode', name: '$name', address: '$address', containedInPlace: {
                             id: '$containedInPlace.id',
                             typeOf: '$containedInPlace.typeOf',
                             branchCode: '$containedInPlace.branchCode',
                             name: '$containedInPlace.name'
-                        }, openSeatingAllowed: '$openSeatingAllowed', additionalProperty: '$additionalProperty', maximumAttendeeCapacity: '$maximumAttendeeCapacity' }, (((_m = searchConditions.$projection) === null || _m === void 0 ? void 0 : _m.sectionCount) === 1)
+                        }, openSeatingAllowed: '$openSeatingAllowed', additionalProperty: '$additionalProperty', maximumAttendeeCapacity: '$maximumAttendeeCapacity' }, (((_a = searchConditions.$projection) === null || _a === void 0 ? void 0 : _a.sectionCount) === 1)
                         ? {
                             sectionCount: {
                                 $cond: {
@@ -322,7 +325,7 @@ class ScreeningRoomRepo {
                                 }
                             }
                         }
-                        : undefined), (((_o = searchConditions.$projection) === null || _o === void 0 ? void 0 : _o.seatCount) === 1)
+                        : undefined), (((_b = searchConditions.$projection) === null || _b === void 0 ? void 0 : _b.seatCount) === 1)
                         ? {
                             seatCount: {
                                 $sum: {
@@ -354,6 +357,34 @@ class ScreeningRoomRepo {
                 .exec();
         });
     }
+    findRooms(params) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const aggregate = this.placeModel.aggregate([
+                ...ScreeningRoomRepo.CREATE_ROOM_MONGO_CONDITIONS(params),
+                {
+                    $project: {
+                        _id: 0,
+                        branchCode: '$branchCode',
+                        name: '$name',
+                        address: '$address',
+                        openSeatingAllowed: '$openSeatingAllowed',
+                        additionalProperty: '$additionalProperty',
+                        maximumAttendeeCapacity: '$maximumAttendeeCapacity'
+                    }
+                },
+                { $sort: { branchCode: factory.sortType.Ascending } }
+            ]);
+            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();
+        });
+    }
     /**
      * セクションと座席も含めたひとつのルームを取得する
      */

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/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/task/createEvent/createEventBySchedule/factory.d.ts

@@ -1,7 +1,7 @@
 import type { ICreatingEvent4ttts } from '../../../../repo/event';
 import type { ICustomerMember } from '../../../../repo/member';
 import * as factory from '../../../../factory';
-declare function tour2creatingEvent(tour: ITourBySchedule, movieTheater: Pick<factory.place.movieTheater.IPlace, 'id' | 'branchCode' | 'parentOrganization'>, screeningRoom: Omit<factory.place.screeningRoom.IPlace, 'containsPlace' | 'parentOrganization'>, existingApplicationMembers: {
+declare function tour2creatingEvent(tour: ITourBySchedule, movieTheater: Pick<factory.place.movieTheater.IPlace, 'id' | 'branchCode' | 'parentOrganization'>, screeningRoom: Pick<factory.place.screeningRoom.IPlace, 'additionalProperty' | 'address' | 'branchCode' | 'name' | 'maximumAttendeeCapacity'>, existingApplicationMembers: {
     member: ICustomerMember;
 }[], maxValue: number, eventService: Pick<factory.product.IProduct, 'id' | 'name'> & {
     id: string;

package/lib/chevre/service/task/createEvent/createEventBySchedule/factory.js

@@ -83,7 +83,7 @@ function tour2creatingEvent(tour, movieTheater, screeningRoom, existingApplicati
             }, typeOf: factory.product.ProductType.EventService, availableChannel: {
                 typeOf: 'ServiceChannel',
                 serviceLocation: {
-                    typeOf: screeningRoom.typeOf,
+                    typeOf: factory.placeType.ScreeningRoom,
                     branchCode: screeningRoom.branchCode,
                     name: screeningRoom.name,
                     containedInPlace: Object.assign({ typeOf: screeningEventSeries.location.typeOf, id: screeningEventSeries.location.id, branchCode: screeningEventSeries.location.branchCode }, (screeningEventSeries.location.name !== undefined)
@@ -104,7 +104,7 @@ function tour2creatingEvent(tour, movieTheater, screeningRoom, existingApplicati
         : undefined), (screeningEventSeries.headline !== undefined)
         ? { headline: screeningEventSeries.headline }
         : undefined);
-    const location = Object.assign({ typeOf: screeningRoom.typeOf, branchCode: screeningRoom.branchCode, name: screeningRoom.name }, (screeningRoom.address !== undefined) ? { address: screeningRoom.address } : undefined);
+    const location = Object.assign({ typeOf: factory.placeType.ScreeningRoom, branchCode: screeningRoom.branchCode, name: screeningRoom.name }, (screeningRoom.address !== undefined) ? { address: screeningRoom.address } : undefined);
     return {
         project: { id: project.id, typeOf: factory.organizationType.Project },
         typeOf: factory.eventType.ScreeningEvent,

package/lib/chevre/service/task/createEvent/createEventBySchedule/schedule2events.js

@@ -61,7 +61,7 @@ function schedule2relatedResources(schedule) {
         if (movieTheater === undefined) {
             throw new factory.errors.NotFound(factory.placeType.MovieTheater);
         }
-        const screeningRoom = (yield repos.screeningRoom.searchScreeningRooms({
+        const screeningRoom = (yield repos.screeningRoom.findRooms({
             limit: 1,
             page: 1,
             project: { id: { $eq: project.id } },

package/lib/chevre/service/task/onResourceUpdated.js

@@ -433,14 +433,14 @@ function createInformMovieTheaterTasks(params, setting) {
             throw new factory.errors.NotFound(factory.placeType.MovieTheater);
         }
         // ルームを検索
-        const screeningRooms = yield repos.screeningRoom.searchScreeningRooms({
+        const screeningRooms = yield repos.screeningRoom.findRooms({
             containedInPlace: { id: { $eq: movieTheater.id } }
         });
         const movieTheaters4inform = [Object.assign(Object.assign({}, movieTheater), { containsPlace: screeningRooms.map((room) => {
                     return {
                         branchCode: room.branchCode,
                         name: room.name,
-                        typeOf: room.typeOf,
+                        typeOf: factory.placeType.ScreeningRoom,
                         additionalProperty: room.additionalProperty,
                         address: room.address
                     };

package/lib/chevre/service/task/syncResourcesFromCOA.js

@@ -216,7 +216,7 @@ function syncEvents(params) {
                 throw new factory.errors.NotFound(factory.placeType.MovieTheater);
             }
             // console.log('movieTheater:', movieTheater);
-            const screeningRoom = (yield repos.screeningRoom.searchScreeningRooms({
+            const screeningRoom = (yield repos.screeningRoom.findRooms({
                 project: { id: { $eq: params.project.id } },
                 containedInPlace: { branchCode: { $eq: movieTheater.branchCode } },
                 branchCode: { $eq: roomCode }

package/package.json

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