@chevre/domain 21.4.0-alpha.10 → 21.4.0-alpha.12

package/example/src/chevre/cleanEventsByMovieTheater.ts

@@ -0,0 +1,32 @@
+// tslint:disable:no-console
+// import * as moment from 'moment';
+import * as mongoose from 'mongoose';
+
+import { chevre } from '../../../lib/index';
+
+const project = { id: String(process.env.PROJECT_ID) };
+const LOCATION_BRANCH_CODE = String(process.env.LOCATION_BRANCH_CODE);
+// const EXCLUDED_PROJECT_ID = process.env.EXCLUDED_PROJECT_ID;
+
+// tslint:disable-next-line:max-func-body-length
+async function main() {
+    await mongoose.connect(<string>process.env.MONGOLAB_URI, { autoIndex: false });
+
+    const eventRepo = new chevre.repository.Event(mongoose.connection);
+
+    let result = await eventRepo.deleteScreeningEventSeriesByMovieTheaterBranchCode({
+        project: { id: project.id },
+        location: { branchCode: LOCATION_BRANCH_CODE }
+    });
+    console.log('deleteScreeningEventSeriesByMovieTheaterBranchCode processed.', result);
+
+    result = await eventRepo.deleteScreeningEventsByMovieTheaterBranchCode({
+        project: { id: project.id },
+        location: { branchCode: LOCATION_BRANCH_CODE }
+    });
+    console.log('deleteScreeningEventsByMovieTheaterBranchCode processed.', result);
+}
+
+main()
+    .then()
+    .catch(console.error);

package/example/src/chevre/migrateEventOrganizer.ts

@@ -23,7 +23,8 @@ async function main() {
                     chevre.factory.eventType.ScreeningEvent,
                     chevre.factory.eventType.ScreeningEventSeries
                 ]
-            }
+            },
+            organizer: { $exists: false }
             // startDate: {
             //     $gte: moment()
             //         // tslint:disable-next-line:no-magic-numbers
@@ -62,12 +63,18 @@ async function main() {
             console.log('already exist...', event.project.id, event.id, event.startDate, organizerId, i);
         } else {
             let movieTheaterId: string;
+            let movieTheaterBranchCode: string;
             if (event.typeOf === chevre.factory.eventType.ScreeningEventSeries) {
                 movieTheaterId = event.location.id;
+                movieTheaterBranchCode = event.location.branchCode;
             } else {
                 movieTheaterId = event.superEvent.location.id;
+                movieTheaterBranchCode = event.superEvent.location.branchCode;
             }
-            const movieTheaters = <Pick<chevre.factory.place.movieTheater.IPlaceWithoutScreeningRoom, 'parentOrganization'>[]>
+            const movieTheaters = <Pick<
+                chevre.factory.place.movieTheater.IPlaceWithoutScreeningRoom,
+                'parentOrganization' | 'branchCode'
+            >[]>
                 await placeRepo.searchMovieTheaters(
                     {
                         limit: 1,
@@ -75,12 +82,18 @@ async function main() {
                         project: { id: { $eq: event.project.id } },
                         id: { $eq: movieTheaterId }
                     },
-                    ['parentOrganization'],
+                    ['parentOrganization', 'branchCode'],
                     []
                 );
             const movieTheater = movieTheaters.shift();
             const sellerId = movieTheater?.parentOrganization?.id;
-            console.log('movieTheater found', event.project.id, event.id, event.startDate, 'sellerId:', sellerId, i);
+            console.log(
+                'movieTheater found',
+                event.project.id, event.id, event.startDate, 'sellerId:', sellerId,
+                'movieTheaterId:', movieTheaterId,
+                'movieTheaterBranchCode:', movieTheaterBranchCode,
+                i
+            );
             // if (typeof sellerId !== 'string') {
             //     throw new Error('movieTheater not found');
             // }

package/example/src/chevre/migrateScreeningRoomOrganizer.ts

@@ -0,0 +1,91 @@
+// tslint:disable:no-console
+// import * as moment from 'moment';
+import * as mongoose from 'mongoose';
+
+import { chevre } from '../../../lib/index';
+
+// const project = { id: String(process.env.PROJECT_ID) };
+// const EXCLUDED_PROJECT_ID = process.env.EXCLUDED_PROJECT_ID;
+
+// tslint:disable-next-line:max-func-body-length
+async function main() {
+    await mongoose.connect(<string>process.env.MONGOLAB_URI, { autoIndex: true });
+
+    const placeRepo = new chevre.repository.Place(mongoose.connection);
+
+    const cursor = placeRepo.getCursor(
+        {
+            // 'project.id': { $eq: project.id },
+            // 'project.id': { $ne: EXCLUDED_PROJECT_ID },
+            typeOf: {
+                $in: [
+                    chevre.factory.placeType.ScreeningRoom
+                ]
+            }
+            // organizer: { $exists: false }
+        },
+        {
+            containsPlace: 0
+        }
+    );
+    console.log('places found');
+
+    let i = 0;
+    let updateCount = 0;
+    await cursor.eachAsync(async (doc) => {
+        i += 1;
+        const screeningRoom: chevre.factory.place.screeningRoom.IPlace = doc.toObject();
+        console.log(screeningRoom);
+
+        const organizerId = screeningRoom.parentOrganization?.id;
+        const alreadyMigrated = typeof organizerId === 'string';
+
+        if (alreadyMigrated) {
+            console.log('already exist...', screeningRoom.project.id, screeningRoom.branchCode, organizerId, i);
+        } else {
+            const movieTheaterId = screeningRoom.containedInPlace?.id;
+            if (typeof movieTheaterId !== 'string') {
+                throw new Error('containedInPlace?.id undefined');
+            }
+            const movieTheaters = <Pick<chevre.factory.place.movieTheater.IPlaceWithoutScreeningRoom, 'parentOrganization'>[]>
+                await placeRepo.searchMovieTheaters(
+                    {
+                        limit: 1,
+                        page: 1,
+                        project: { id: { $eq: screeningRoom.project.id } },
+                        id: { $eq: movieTheaterId }
+                    },
+                    ['parentOrganization'],
+                    []
+                );
+            const movieTheater = movieTheaters.shift();
+            const sellerId = movieTheater?.parentOrganization?.id;
+            console.log('movieTheater found', screeningRoom.project.id, screeningRoom.branchCode, 'sellerId:', sellerId, i);
+            // if (typeof sellerId !== 'string') {
+            //     throw new Error('movieTheater not found');
+            // }
+            if (typeof sellerId === 'string') {
+                const newParentOrganization: chevre.factory.place.screeningRoom.IParentOrganization = {
+                    id: sellerId,
+                    typeOf: chevre.factory.organizationType.Corporation
+                };
+                console.log('updating room...', screeningRoom.project.id, screeningRoom.branchCode, i);
+                await placeRepo.addParentOrganization2ScreeningRoom({
+                    project: screeningRoom.project,
+                    branchCode: screeningRoom.branchCode,
+                    containedInPlace: { branchCode: String(screeningRoom.containedInPlace?.branchCode) },
+                    parentOrganization: newParentOrganization
+                });
+                updateCount += 1;
+                console.log('updated.', screeningRoom.project.id, screeningRoom.branchCode, i);
+            }
+        }
+    });
+
+    console.log(i, 'rooms checked');
+    console.log(updateCount, 'rooms updated');
+}
+
+main()
+    .then()
+    .catch(console.error);

package/lib/chevre/repo/event.d.ts

@@ -169,6 +169,22 @@ export declare class MongoRepository {
         };
         id: string;
     }): Promise<void>;
+    deleteScreeningEventsByMovieTheaterBranchCode(params: {
+        project: {
+            id: string;
+        };
+        location: {
+            branchCode: string;
+        };
+    }): Promise<import("mongodb").DeleteResult>;
+    deleteScreeningEventSeriesByMovieTheaterBranchCode(params: {
+        project: {
+            id: string;
+        };
+        location: {
+            branchCode: string;
+        };
+    }): Promise<import("mongodb").DeleteResult>;
     deleteByProject(params: {
         project: {
             id: string;

package/lib/chevre/repo/event.js

@@ -850,6 +850,26 @@ class MongoRepository {
                 .exec();
         });
     }
+    deleteScreeningEventsByMovieTheaterBranchCode(params) {
+        return __awaiter(this, void 0, void 0, function* () {
+            return this.eventModel.deleteMany({
+                typeOf: { $eq: factory.eventType.ScreeningEvent },
+                'project.id': { $eq: params.project.id },
+                'superEvent.location.branchCode': { $exists: true, $eq: params.location.branchCode }
+            })
+                .exec();
+        });
+    }
+    deleteScreeningEventSeriesByMovieTheaterBranchCode(params) {
+        return __awaiter(this, void 0, void 0, function* () {
+            return this.eventModel.deleteMany({
+                typeOf: { $eq: factory.eventType.ScreeningEventSeries },
+                'project.id': { $eq: params.project.id },
+                'location.branchCode': { $exists: true, $eq: params.location.branchCode }
+            })
+                .exec();
+        });
+    }
     deleteByProject(params) {
         return __awaiter(this, void 0, void 0, function* () {
             yield this.eventModel.deleteMany({

package/lib/chevre/repo/mongoose/schemas/place.d.ts

@@ -53,13 +53,14 @@ declare const schema: Schema<any, import("mongoose").Model<any, any, any, any, a
     };
 }, {
     typeOf: string;
+    project: any;
     additionalProperty: any[];
+    parentOrganization: any;
     containsPlace: any[];
     hasEntranceGate: any[];
     hasPOS: any[];
     name?: any;
     url?: string | undefined;
-    project?: any;
     alternateName?: any;
     description?: any;
     offers?: any;
@@ -72,18 +73,18 @@ declare const schema: Schema<any, import("mongoose").Model<any, any, any, any, a
     openingHoursSpecification?: any;
     smokingAllowed?: boolean | undefined;
     sameAs?: string | undefined;
-    parentOrganization?: any;
     openSeatingAllowed?: any;
     amenityFeature?: any;
 }, import("mongoose").Document<unknown, {}, import("mongoose").FlatRecord<{
     typeOf: string;
+    project: any;
     additionalProperty: any[];
+    parentOrganization: any;
     containsPlace: any[];
     hasEntranceGate: any[];
     hasPOS: any[];
     name?: any;
     url?: string | undefined;
-    project?: any;
     alternateName?: any;
     description?: any;
     offers?: any;
@@ -96,18 +97,18 @@ declare const schema: Schema<any, import("mongoose").Model<any, any, any, any, a
     openingHoursSpecification?: any;
     smokingAllowed?: boolean | undefined;
     sameAs?: string | undefined;
-    parentOrganization?: any;
     openSeatingAllowed?: any;
     amenityFeature?: any;
 }>> & Omit<import("mongoose").FlatRecord<{
     typeOf: string;
+    project: any;
     additionalProperty: any[];
+    parentOrganization: any;
     containsPlace: any[];
     hasEntranceGate: any[];
     hasPOS: any[];
     name?: any;
     url?: string | undefined;
-    project?: any;
     alternateName?: any;
     description?: any;
     offers?: any;
@@ -120,7 +121,6 @@ declare const schema: Schema<any, import("mongoose").Model<any, any, any, any, a
     openingHoursSpecification?: any;
     smokingAllowed?: boolean | undefined;
     sameAs?: string | undefined;
-    parentOrganization?: any;
     openSeatingAllowed?: any;
     amenityFeature?: any;
 }> & {

package/lib/chevre/repo/mongoose/schemas/place.js

@@ -9,7 +9,15 @@ exports.modelName = modelName;
  * 場所スキーマ
  */
 const schema = new mongoose_1.Schema({
-    project: mongoose_1.SchemaTypes.Mixed,
+    project: {
+        type: mongoose_1.SchemaTypes.Mixed,
+        required: true
+    },
+    // 必須化(2023-07-14~)
+    parentOrganization: {
+        type: mongoose_1.SchemaTypes.Mixed,
+        required: true
+    },
     typeOf: {
         type: String,
         required: true
@@ -32,7 +40,6 @@ const schema = new mongoose_1.Schema({
     kanaName: String,
     offers: mongoose_1.SchemaTypes.Mixed,
     additionalProperty: [mongoose_1.SchemaTypes.Mixed],
-    parentOrganization: mongoose_1.SchemaTypes.Mixed,
     // ↓ルームの施設からの分離に伴い属性追加(2023-06-22~)
     openSeatingAllowed: mongoose_1.SchemaTypes.Mixed,
     amenityFeature: mongoose_1.SchemaTypes.Mixed

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

@@ -25,7 +25,7 @@
 import { Connection } from 'mongoose';
 import * as factory from '../factory';
 type IScreeningRoomSectionWithoutContainsPlace = Omit<factory.place.screeningRoomSection.IPlace, 'containsPlace'>;
-export type IScreeningRoomFoundByBranchCode = Pick<factory.place.screeningRoom.IPlace, 'typeOf' | 'branchCode' | 'name' | 'containsPlace' | 'seatCount'>;
+export type IScreeningRoomFoundByBranchCode = Pick<factory.place.screeningRoom.IPlace, 'typeOf' | 'branchCode' | 'name' | 'containsPlace' | 'seatCount' | 'parentOrganization'>;
 /**
  * 施設リポジトリ
  */
@@ -44,9 +44,12 @@ export declare class MongoRepository {
      */
     searchMovieTheaters(params: factory.place.movieTheater.ISearchConditions & {}, inclusion: string[], exclusion: string[]): Promise<factory.place.movieTheater.IPlaceWithoutScreeningRoom[]>;
     deleteMovieTheaterById(params: {
+        project: {
+            id: string;
+        };
         id: string;
     }): Promise<void>;
-    createScreeningRoom(screeningRoom: Omit<factory.place.screeningRoom.IPlace, 'containedInPlace' | 'containsPlace'> & {
+    createScreeningRoom(screeningRoom: Omit<factory.place.screeningRoom.IPlace, 'containedInPlace' | 'containsPlace' | 'parentOrganization'> & {
         containedInPlace: {
             branchCode: string;
         };
@@ -59,7 +62,7 @@ export declare class MongoRepository {
         };
         typeOf: factory.placeType.ScreeningRoom;
     }>;
-    updateScreeningRoom(screeningRoom: Omit<factory.place.screeningRoom.IPlace, 'containedInPlace' | 'containsPlace'> & {
+    updateScreeningRoom(screeningRoom: Omit<factory.place.screeningRoom.IPlace, 'containedInPlace' | 'containsPlace' | 'parentOrganization'> & {
         containedInPlace: {
             branchCode: string;
         };
@@ -72,6 +75,19 @@ export declare class MongoRepository {
         };
         typeOf: factory.placeType.ScreeningRoom;
     }>;
+    addParentOrganization2ScreeningRoom(screeningRoom: Pick<factory.place.screeningRoom.IPlace, 'branchCode' | 'parentOrganization' | 'project'> & {
+        containedInPlace: {
+            branchCode: string;
+        };
+    }): Promise<{
+        containedInPlace: {
+            /**
+             * 施設ID
+             */
+            id: string;
+        };
+        typeOf: factory.placeType.ScreeningRoom;
+    }>;
     updateScreeningRoomsByContainedInPlaceId(screeningRoom: {
         project: {
             id: string;
@@ -171,8 +187,11 @@ export declare class MongoRepository {
         };
         typeOf: factory.placeType.ScreeningRoom;
     }>;
-    searchScreeningRooms(searchConditions: factory.place.screeningRoom.ISearchConditions): Promise<Omit<factory.place.screeningRoom.IPlace, 'containsPlace'>[]>;
+    searchScreeningRooms(searchConditions: factory.place.screeningRoom.ISearchConditions): Promise<Omit<factory.place.screeningRoom.IPlace, 'containsPlace' | 'parentOrganization'>[]>;
     findScreeningRoomsByBranchCode(params: {
+        project: {
+            id: string;
+        };
         branchCode: {
             $eq: string;
         };
@@ -246,16 +265,6 @@ export declare class MongoRepository {
         };
         typeOf: factory.placeType.ScreeningRoom;
     }>;
-    syncScreeningRooms(__: {
-        /**
-         * 施設ID
-         */
-        id: string;
-        /**
-         * 特定のルームのみ同期する場合、ルームコードを指定する
-         */
-        screeningRoomBranchCode?: string;
-    }): Promise<void>;
     unsetContainsPlaceFromMovieTheater(params: {
         /**
          * 施設ID
@@ -281,6 +290,9 @@ export declare class MongoRepository {
         id: string;
     }, projection?: any): Promise<factory.place.busStop.IPlace>;
     deleteBusStopById(params: {
+        project: {
+            id: string;
+        };
         id: string;
     }): Promise<void>;
     getCursor(conditions: any, projection: any): import("mongoose").Cursor<any, import("mongoose").QueryOptions<any>>;

package/lib/chevre/repo/place.js

@@ -342,7 +342,8 @@ class MongoRepository {
         return __awaiter(this, void 0, void 0, function* () {
             yield this.placeModel.findOneAndDelete({
                 typeOf: { $eq: factory.placeType.MovieTheater },
-                _id: { $eq: params.id }
+                _id: { $eq: params.id },
+                'project.id': { $eq: params.project.id }
             }, { projection: { _id: 1 } })
                 .exec()
                 .then((doc) => {
@@ -359,7 +360,7 @@ class MongoRepository {
                 typeOf: { $eq: factory.placeType.MovieTheater },
                 'project.id': { $eq: screeningRoom.project.id },
                 branchCode: { $eq: screeningRoom.containedInPlace.branchCode }
-            }, { _id: 1, typeOf: 1, branchCode: 1, name: 1 })
+            }, { _id: 1, typeOf: 1, branchCode: 1, name: 1, parentOrganization: 1 })
                 .exec();
             if (movieTheaterDoc === null) {
                 throw new factory.errors.NotFound(factory.placeType.MovieTheater);
@@ -370,7 +371,9 @@ class MongoRepository {
                     typeOf: movieTheater.typeOf,
                     branchCode: movieTheater.branchCode,
                     name: movieTheater.name
-                }, containsPlace: [], project: screeningRoom.project }, (typeof screeningRoom.openSeatingAllowed === 'boolean')
+                }, containsPlace: [], project: screeningRoom.project, 
+                // 必須化(2023-07-14~)
+                parentOrganization: movieTheater.parentOrganization }, (typeof screeningRoom.openSeatingAllowed === 'boolean')
                 ? { openSeatingAllowed: screeningRoom.openSeatingAllowed }
                 : undefined);
             const upsertScreeningRoomResult = yield this.placeModel.updateOne({
@@ -423,6 +426,26 @@ class MongoRepository {
             return doc.toObject();
         });
     }
+    addParentOrganization2ScreeningRoom(screeningRoom) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const doc = yield this.placeModel.findOneAndUpdate({
+                typeOf: { $eq: factory.placeType.ScreeningRoom },
+                'project.id': { $eq: screeningRoom.project.id },
+                'containedInPlace.branchCode': { $exists: true, $eq: screeningRoom.containedInPlace.branchCode },
+                branchCode: screeningRoom.branchCode
+            }, {
+                parentOrganization: screeningRoom.parentOrganization
+            }, {
+                new: true,
+                projection: { 'containedInPlace.id': 1, typeOf: 1 }
+            })
+                .exec();
+            if (doc === null) {
+                throw new factory.errors.NotFound(factory.placeType.ScreeningRoom);
+            }
+            return doc.toObject();
+        });
+    }
     updateScreeningRoomsByContainedInPlaceId(screeningRoom) {
         var _a;
         return __awaiter(this, void 0, void 0, function* () {
@@ -558,7 +581,7 @@ class MongoRepository {
     }
     // tslint:disable-next-line:cyclomatic-complexity max-func-body-length
     searchScreeningRoomSections(searchConditions) {
-        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m;
+        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p;
         return __awaiter(this, void 0, void 0, function* () {
             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;
@@ -567,8 +590,14 @@ class MongoRepository {
                     $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 = (_e = (_d = (_c = searchConditions.containedInPlace) === null || _c === void 0 ? void 0 : _c.containedInPlace) === null || _d === void 0 ? void 0 : _d.branchCode) === null || _e === void 0 ? void 0 : _e.$eq;
+            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: {
@@ -580,7 +609,7 @@ class MongoRepository {
                 });
             }
             // ルームコード
-            const containedInPlaceBranchCodeEq = (_g = (_f = searchConditions.containedInPlace) === null || _f === void 0 ? void 0 : _f.branchCode) === null || _g === void 0 ? void 0 : _g.$eq;
+            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: {
@@ -591,7 +620,7 @@ class MongoRepository {
                 });
             }
             // セクションコード
-            const sectionBranchCodeEq = (_h = searchConditions === null || searchConditions === void 0 ? void 0 : searchConditions.branchCode) === null || _h === void 0 ? void 0 : _h.$eq;
+            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: {
@@ -602,7 +631,7 @@ class MongoRepository {
                     }
                 });
             }
-            const nameCodeRegex = (_j = searchConditions.name) === null || _j === void 0 ? void 0 : _j.$regex;
+            const nameCodeRegex = (_l = searchConditions.name) === null || _l === void 0 ? void 0 : _l.$regex;
             if (typeof nameCodeRegex === 'string') {
                 matchStages.push({
                     $match: {
@@ -623,7 +652,7 @@ class MongoRepository {
                     }
                 });
             }
-            const branchCodeRegex = (_k = searchConditions.branchCode) === null || _k === void 0 ? void 0 : _k.$regex;
+            const branchCodeRegex = (_m = searchConditions.branchCode) === null || _m === void 0 ? void 0 : _m.$regex;
             if (typeof branchCodeRegex === 'string') {
                 matchStages.push({
                     $match: {
@@ -634,7 +663,7 @@ class MongoRepository {
                     }
                 });
             }
-            const additionalPropertyElemMatch = (_l = searchConditions.additionalProperty) === null || _l === void 0 ? void 0 : _l.$elemMatch;
+            const additionalPropertyElemMatch = (_o = searchConditions.additionalProperty) === null || _o === void 0 ? void 0 : _o.$elemMatch;
             if (additionalPropertyElemMatch !== undefined && additionalPropertyElemMatch !== null) {
                 matchStages.push({
                     $match: {
@@ -659,7 +688,7 @@ class MongoRepository {
                                 branchCode: '$containedInPlace.branchCode',
                                 name: '$containedInPlace.name'
                             }
-                        }, additionalProperty: '$containsPlace.additionalProperty' }, (((_m = searchConditions.$projection) === null || _m === void 0 ? void 0 : _m.seatCount) === 1)
+                        }, additionalProperty: '$containsPlace.additionalProperty' }, (((_p = searchConditions.$projection) === null || _p === void 0 ? void 0 : _p.seatCount) === 1)
                         ? {
                             seatCount: {
                                 $cond: {
@@ -712,7 +741,7 @@ class MongoRepository {
     }
     // tslint:disable-next-line:cyclomatic-complexity max-func-body-length
     searchScreeningRooms(searchConditions) {
-        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l;
+        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o;
         return __awaiter(this, void 0, void 0, function* () {
             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;
@@ -721,8 +750,14 @@ class MongoRepository {
                     $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 = (_d = (_c = searchConditions.containedInPlace) === null || _c === void 0 ? void 0 : _c.id) === null || _d === void 0 ? void 0 : _d.$eq;
+            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: {
@@ -748,7 +783,7 @@ class MongoRepository {
                     }
                 }
             }
-            const branchCodeEq = (_e = searchConditions.branchCode) === null || _e === void 0 ? void 0 : _e.$eq;
+            const branchCodeEq = (_g = searchConditions.branchCode) === null || _g === void 0 ? void 0 : _g.$eq;
             if (typeof branchCodeEq === 'string') {
                 matchStages.push({
                     $match: {
@@ -756,7 +791,7 @@ class MongoRepository {
                     }
                 });
             }
-            const branchCodeIn = (_f = searchConditions.branchCode) === null || _f === void 0 ? void 0 : _f.$in;
+            const branchCodeIn = (_h = searchConditions.branchCode) === null || _h === void 0 ? void 0 : _h.$in;
             if (Array.isArray(branchCodeIn)) {
                 matchStages.push({
                     $match: {
@@ -764,7 +799,7 @@ class MongoRepository {
                     }
                 });
             }
-            const branchCodeRegex = (_g = searchConditions.branchCode) === null || _g === void 0 ? void 0 : _g.$regex;
+            const branchCodeRegex = (_j = searchConditions.branchCode) === null || _j === void 0 ? void 0 : _j.$regex;
             if (typeof branchCodeRegex === 'string') {
                 matchStages.push({
                     $match: {
@@ -774,7 +809,7 @@ class MongoRepository {
                     }
                 });
             }
-            const nameCodeRegex = (_h = searchConditions.name) === null || _h === void 0 ? void 0 : _h.$regex;
+            const nameCodeRegex = (_k = searchConditions.name) === null || _k === void 0 ? void 0 : _k.$regex;
             if (typeof nameCodeRegex === 'string') {
                 matchStages.push({
                     $match: {
@@ -806,7 +841,7 @@ class MongoRepository {
                     }
                 });
             }
-            const additionalPropertyElemMatch = (_j = searchConditions.additionalProperty) === null || _j === void 0 ? void 0 : _j.$elemMatch;
+            const additionalPropertyElemMatch = (_l = searchConditions.additionalProperty) === null || _l === void 0 ? void 0 : _l.$elemMatch;
             if (additionalPropertyElemMatch !== undefined && additionalPropertyElemMatch !== null) {
                 matchStages.push({
                     $match: {
@@ -827,7 +862,7 @@ class MongoRepository {
                             typeOf: '$containedInPlace.typeOf',
                             branchCode: '$containedInPlace.branchCode',
                             name: '$containedInPlace.name'
-                        }, openSeatingAllowed: '$openSeatingAllowed', additionalProperty: '$additionalProperty', maximumAttendeeCapacity: '$maximumAttendeeCapacity' }, (((_k = searchConditions.$projection) === null || _k === void 0 ? void 0 : _k.sectionCount) === 1)
+                        }, openSeatingAllowed: '$openSeatingAllowed', additionalProperty: '$additionalProperty', maximumAttendeeCapacity: '$maximumAttendeeCapacity' }, (((_m = searchConditions.$projection) === null || _m === void 0 ? void 0 : _m.sectionCount) === 1)
                         ? {
                             sectionCount: {
                                 $cond: {
@@ -837,7 +872,7 @@ class MongoRepository {
                                 }
                             }
                         }
-                        : undefined), (((_l = searchConditions.$projection) === null || _l === void 0 ? void 0 : _l.seatCount) === 1)
+                        : undefined), (((_o = searchConditions.$projection) === null || _o === void 0 ? void 0 : _o.seatCount) === 1)
                         ? {
                             seatCount: {
                                 $sum: {
@@ -871,12 +906,9 @@ class MongoRepository {
         return __awaiter(this, void 0, void 0, function* () {
             const matchStages = [
                 { $match: { typeOf: { $eq: factory.placeType.ScreeningRoom } } },
-                {
-                    $match: { 'containedInPlace.id': { $exists: true, $eq: params.containedInPlace.id.$eq } }
-                },
-                {
-                    $match: { branchCode: { $eq: params.branchCode.$eq } }
-                }
+                { $match: { 'project.id': { $eq: params.project.id } } },
+                { $match: { 'containedInPlace.id': { $exists: true, $eq: params.containedInPlace.id.$eq } } },
+                { $match: { branchCode: { $eq: params.branchCode.$eq } } }
             ];
             const aggregate = this.placeModel.aggregate([
                 // { $unwind: '$containsPlace' },
@@ -1031,7 +1063,7 @@ class MongoRepository {
     }
     // tslint:disable-next-line:cyclomatic-complexity max-func-body-length
     searchSeats(params) {
-        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l;
+        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o;
         return __awaiter(this, void 0, void 0, function* () {
             const matchStages = [{ $match: { typeOf: { $eq: factory.placeType.ScreeningRoom } } }];
             const projectIdEq = (_b = (_a = params.project) === null || _a === void 0 ? void 0 : _a.id) === null || _b === void 0 ? void 0 : _b.$eq;
@@ -1040,7 +1072,13 @@ class MongoRepository {
                     $match: { 'project.id': { $eq: projectIdEq } }
                 });
             }
-            const containedInPlaceBranchCodeEq = (_d = (_c = params.containedInPlace) === null || _c === void 0 ? void 0 : _c.branchCode) === null || _d === void 0 ? void 0 : _d.$eq;
+            const parentOrganizationIdEq = (_d = (_c = params.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 containedInPlaceBranchCodeEq = (_f = (_e = params.containedInPlace) === null || _e === void 0 ? void 0 : _e.branchCode) === null || _f === void 0 ? void 0 : _f.$eq;
             if (typeof containedInPlaceBranchCodeEq === 'string') {
                 matchStages.push({
                     $match: {
@@ -1051,7 +1089,7 @@ class MongoRepository {
                     }
                 });
             }
-            const containedInPlaceBranchCodeIn = (_f = (_e = params.containedInPlace) === null || _e === void 0 ? void 0 : _e.branchCode) === null || _f === void 0 ? void 0 : _f.$in;
+            const containedInPlaceBranchCodeIn = (_h = (_g = params.containedInPlace) === null || _g === void 0 ? void 0 : _g.branchCode) === null || _h === void 0 ? void 0 : _h.$in;
             if (Array.isArray(containedInPlaceBranchCodeIn)) {
                 matchStages.push({
                     $match: {
@@ -1104,7 +1142,7 @@ class MongoRepository {
                     });
                 }
             }
-            const branchCodeIn = (_g = params.branchCode) === null || _g === void 0 ? void 0 : _g.$in;
+            const branchCodeIn = (_j = params.branchCode) === null || _j === void 0 ? void 0 : _j.$in;
             if (Array.isArray(branchCodeIn)) {
                 matchStages.push({
                     $match: {
@@ -1115,7 +1153,7 @@ class MongoRepository {
                     }
                 });
             }
-            const branchCodeRegex = (_h = params.branchCode) === null || _h === void 0 ? void 0 : _h.$regex;
+            const branchCodeRegex = (_k = params.branchCode) === null || _k === void 0 ? void 0 : _k.$regex;
             if (typeof branchCodeRegex === 'string' && branchCodeRegex.length > 0) {
                 matchStages.push({
                     $match: {
@@ -1126,7 +1164,7 @@ class MongoRepository {
                     }
                 });
             }
-            const nameRegex = (_j = params.name) === null || _j === void 0 ? void 0 : _j.$regex;
+            const nameRegex = (_l = params.name) === null || _l === void 0 ? void 0 : _l.$regex;
             if (typeof nameRegex === 'string' && nameRegex.length > 0) {
                 matchStages.push({
                     $match: {
@@ -1147,7 +1185,7 @@ class MongoRepository {
                     }
                 });
             }
-            const seatingTypeEq = (_k = params.seatingType) === null || _k === void 0 ? void 0 : _k.$eq;
+            const seatingTypeEq = (_m = params.seatingType) === null || _m === void 0 ? void 0 : _m.$eq;
             if (typeof seatingTypeEq === 'string') {
                 matchStages.push({
                     $match: {
@@ -1163,7 +1201,7 @@ class MongoRepository {
                 && params.$projection['containedInPlace.containedInPlace'] === 0) {
                 includeScreeningRooms = false;
             }
-            const additionalPropertyElemMatch = (_l = params.additionalProperty) === null || _l === void 0 ? void 0 : _l.$elemMatch;
+            const additionalPropertyElemMatch = (_o = params.additionalProperty) === null || _o === void 0 ? void 0 : _o.$elemMatch;
             if (additionalPropertyElemMatch !== undefined && additionalPropertyElemMatch !== null) {
                 matchStages.push({
                     $match: {
@@ -1245,77 +1283,6 @@ class MongoRepository {
             return doc.toObject();
         });
     }
-    // tslint:disable-next-line:prefer-function-over-method
-    syncScreeningRooms(__) {
-        return __awaiter(this, void 0, void 0, function* () {
-            return;
-            // const movieTheater = <Pick<
-            //     factory.place.movieTheater.IPlace,
-            //     'id' | 'branchCode' | 'name' | 'project' | 'typeOf' | 'containsPlace'
-            // >>await this.placeModel.findOne({
-            //     _id: { $eq: params.id },
-            //     typeOf: { $eq: factory.placeType.MovieTheater }
-            // })
-            //     .select({
-            //         _id: 1, branchCode: 1, name: 1, project: 1, typeOf: 1, containsPlace: 1
-            //     })
-            //     .exec()
-            //     .then((doc) => {
-            //         if (doc === null) {
-            //             throw new factory.errors.NotFound(factory.placeType.MovieTheater);
-            //         }
-            //         return doc.toObject();
-            //     });
-            // let screeningRoomsFromMovieTheater = movieTheater.containsPlace;
-            // if (typeof params.screeningRoomBranchCode === 'string' && params.screeningRoomBranchCode.length > 0) {
-            //     screeningRoomsFromMovieTheater = screeningRoomsFromMovieTheater.filter(
-            //         (place) => place.branchCode === params.screeningRoomBranchCode
-            //     );
-            // }
-            // const creatingScreeningRooms: ICreatingScreeningRoom[] = screeningRoomsFromMovieTheater.map((place) => {
-            //     return {
-            //         ...place,
-            //         containedInPlace: {
-            //             id: movieTheater.id,
-            //             typeOf: movieTheater.typeOf,
-            //             branchCode: movieTheater.branchCode,
-            //             name: movieTheater.name
-            //         },
-            //         containsPlace: (Array.isArray(place.containsPlace)) ? place.containsPlace : [],
-            //         project: movieTheater.project
-            //     };
-            // });
-            // debug('sync processing', creatingScreeningRooms.length, 'screeningRooms...', creatingScreeningRooms);
-            // await Promise.all(creatingScreeningRooms.map(async (createScreeningRoom) => {
-            //     const { typeOf, project, branchCode, ...setFields } = createScreeningRoom;
-            //     if (typeof branchCode === 'string' && branchCode.length > 0) {
-            //         const upsertScreeningRoomResult = await this.placeModel.findOneAndUpdate(
-            //             {
-            //                 typeOf: { $eq: factory.placeType.ScreeningRoom },
-            //                 'project.id': { $eq: createScreeningRoom.project.id },
-            //                 'containedInPlace.id': { $exists: true, $eq: createScreeningRoom.containedInPlace.id },
-            //                 branchCode: { $eq: createScreeningRoom.branchCode }
-            //             },
-            //             {
-            //                 $setOnInsert: {
-            //                     typeOf: createScreeningRoom.typeOf,
-            //                     project: createScreeningRoom.project,
-            //                     branchCode: createScreeningRoom.branchCode
-            //                 },
-            //                 $set: setFields
-            //             },
-            //             {
-            //                 upsert: true,
-            //                 new: true,
-            //                 projection: { _id: 1 }
-            //             }
-            //         )
-            //             .exec();
-            //         debug('screeningRoom upserted. upsertScreeningRoomResult:', upsertScreeningRoomResult);
-            //     }
-            // }));
-        });
-    }
     unsetContainsPlaceFromMovieTheater(params) {
         return __awaiter(this, void 0, void 0, function* () {
             return this.placeModel.findOneAndUpdate({
@@ -1420,7 +1387,8 @@ class MongoRepository {
         return __awaiter(this, void 0, void 0, function* () {
             yield this.placeModel.findOneAndDelete({
                 typeOf: { $eq: factory.placeType.BusStop },
-                _id: { $eq: params.id }
+                _id: { $eq: params.id },
+                'project.id': { $eq: params.project.id }
             })
                 .exec()
                 .then((doc) => {

package/lib/chevre/service/aggregation/event/aggregateScreeningEvent.js

@@ -80,6 +80,7 @@ function aggregateByEvent(params) {
             movieTheaterId = String((_a = params.event.offers) === null || _a === void 0 ? void 0 : _a.itemOffered.availableChannel.serviceLocation.containedInPlace.id);
         }
         const screeningRoom = yield repos.place.findScreeningRoomsByBranchCode({
+            project: { id: event.project.id },
             branchCode: { $eq: event.location.branchCode },
             containedInPlace: { id: { $eq: movieTheaterId } }
         });

package/lib/chevre/service/event.js

@@ -670,7 +670,7 @@ function createMovieTheaterFromCOA(project, seller, theaterFromCOA, screensFromC
         },
         kanaName: theaterFromCOA.theaterNameKana,
         containsPlace: screensFromCOA.map((screenFromCOA) => {
-            return createScreeningRoomFromCOA(project, screenFromCOA);
+            return createScreeningRoomFromCOA(project, seller, screenFromCOA);
         }),
         typeOf: factory.placeType.MovieTheater,
         telephone: theaterFromCOA.theaterTelNum,
@@ -712,7 +712,7 @@ function createMovieTheaterFromCOA(project, seller, theaterFromCOA, screensFromC
  */
 // tslint:disable-next-line:no-single-line-block-comment
 /* istanbul ignore next */
-function createScreeningRoomFromCOA(project, screenFromCOA) {
+function createScreeningRoomFromCOA(project, seller, screenFromCOA) {
     const sections = [];
     const sectionCodes = [];
     screenFromCOA.listSeat.forEach((seat) => {
@@ -751,7 +751,9 @@ function createScreeningRoomFromCOA(project, screenFromCOA) {
             en: screenFromCOA.screenNameEng
         },
         typeOf: factory.placeType.ScreeningRoom,
-        maximumAttendeeCapacity: sections[0].containsPlace.length
+        maximumAttendeeCapacity: sections[0].containsPlace.length,
+        // 必須化(2023-07-14~)
+        parentOrganization: { id: seller.id, typeOf: factory.organizationType.Corporation }
     };
 }
 function updateEvent4ttts(params) {

package/package.json

@@ -9,7 +9,7 @@
     }
   ],
   "dependencies": {
-    "@chevre/factory": "4.315.0-alpha.2",
+    "@chevre/factory": "4.315.0-alpha.3",
     "@cinerino/sdk": "3.160.0-alpha.3",
     "@motionpicture/coa-service": "9.2.0",
     "@motionpicture/gmo-service": "5.2.0",
@@ -117,5 +117,5 @@
     "postversion": "git push origin --tags",
     "prepublishOnly": "npm run clean && npm run build && npm test && npm run doc"
   },
-  "version": "21.4.0-alpha.10"
+  "version": "21.4.0-alpha.12"
 }

package/example/src/chevre/findScreeningRoomsByBranchCode.ts

@@ -1,27 +0,0 @@
-// tslint:disable:no-console
-import * as mongoose from 'mongoose';
-
-import { chevre } from '../../../lib/index';
-
-async function main() {
-    await mongoose.connect(<string>process.env.MONGOLAB_URI);
-
-    const placeRepo = new chevre.repository.Place(mongoose.connection);
-
-    const screeningRoom = await placeRepo.findScreeningRoomsByBranchCode({
-        branchCode: {
-            $eq: '20'
-        },
-        containedInPlace: {
-            id: {
-                $eq: '5bfb841d5a78d7948369979a'
-            }
-        }
-    });
-    console.log('room found', screeningRoom);
-
-}
-
-main()
-    .then(console.log)
-    .catch(console.error);

package/example/src/chevre/searchScreeningRooms.ts

@@ -1,33 +0,0 @@
-// 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 placeRepo = new chevre.repository.Place(mongoose.connection);
-
-    const rooms = await placeRepo.searchScreeningRooms(
-        {
-            limit: 10,
-            page: 1,
-            $projection: { sectionCount: 1 }
-        }
-    );
-    console.log('place found', rooms);
-    const filteredRooms = rooms.filter((room) => typeof room.sectionCount === 'number' && room.sectionCount > 1);
-    console.log(filteredRooms.length, 'filteredRooms found');
-
-    const screeningRoom = await placeRepo.findScreeningRoomsByBranchCode({
-        branchCode: { $eq: rooms[0].branchCode },
-        containedInPlace: { id: { $eq: String(rooms[0].containedInPlace?.id) } }
-    });
-    console.log('screeningRoom found', screeningRoom);
-}
-
-main()
-    .then(console.log)
-    .catch(console.error);

package/example/src/chevre/syncScreeningRooms.ts

@@ -1,21 +0,0 @@
-// 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 placeRepo = new chevre.repository.Place(mongoose.connection);
-
-    await placeRepo.syncScreeningRooms({
-        id: '60409176f60a46000a7a3787'
-    });
-    console.log('synced');
-}
-
-main()
-    .then(console.log)
-    .catch(console.error);

package/example/src/chevre/syncScreeningRoomsAll.ts

@@ -1,41 +0,0 @@
-// 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 placeRepo = new chevre.repository.Place(mongoose.connection);
-
-    const cursor = placeRepo.getCursor(
-        {
-            typeOf: { $eq: chevre.factory.placeType.MovieTheater }
-        },
-        {
-            _id: 1,
-            name: 1,
-            project: 1,
-            typeOf: 1
-        }
-    );
-    console.log('places found');
-
-    let i = 0;
-    await cursor.eachAsync(async (doc) => {
-        i += 1;
-        const { id, name, project, typeOf } = <Pick<chevre.factory.place.movieTheater.IPlace, 'id' | 'name' | 'project' | 'typeOf'>>
-            doc.toObject();
-
-        console.log('syncing...', project.id, typeOf, id, name.ja, i);
-        await placeRepo.syncScreeningRooms({ id });
-        console.log('synced.', project.id, typeOf, id, name.ja, i);
-    });
-
-}
-
-main()
-    .then(console.log)
-    .catch(console.error);

package/lib/chevre/service/task/syncScreeningRooms.d.ts

@@ -1,7 +0,0 @@
-import * as factory from '../../factory';
-import { IConnectionSettings } from '../task';
-export type IOperation<T> = (settings: IConnectionSettings) => Promise<T>;
-/**
- * タスク実行関数
- */
-export declare function call(data: factory.task.syncScreeningRooms.IData): IOperation<void>;

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

@@ -1,23 +0,0 @@
-"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.call = void 0;
-const place_1 = require("../../repo/place");
-/**
- * タスク実行関数
- */
-function call(data) {
-    return (connectionSettings) => __awaiter(this, void 0, void 0, function* () {
-        const placeRepo = new place_1.MongoRepository(connectionSettings.connection);
-        yield placeRepo.syncScreeningRooms({ id: data.id });
-    });
-}
-exports.call = call;