@chevre/domain 23.2.0-alpha.16 → 23.2.0-alpha.18

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

@@ -23,6 +23,106 @@ class SectionRepo {
         this.placeModel = connection.model(place_1.modelName, (0, place_1.createSchema)());
     }
     // tslint:disable-next-line:max-func-body-length
+    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* () {
             const { project, parentOrganization, movieTheaterCode, roomCode } = options;
@@ -157,106 +257,43 @@ class SectionRepo {
             return doc.toObject();
         });
     }
-    // tslint:disable-next-line:cyclomatic-complexity max-func-body-length
-    searchScreeningRoomSections(searchConditions) {
+    /**
+     * 最小限のprojectionでセクション検索を再定義
+     * 2026-01-08~
+     */
+    findSections(params) {
         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 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 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 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
-                        }
+            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', identifier: '$containsPlace.identifier', 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',
@@ -270,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: {

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

@@ -11,7 +11,7 @@
   "dependencies": {
     "@aws-sdk/client-cognito-identity-provider": "3.600.0",
     "@aws-sdk/credential-providers": "3.600.0",
-    "@chevre/factory": "5.4.0-alpha.10",
+    "@chevre/factory": "5.4.0-alpha.12",
     "@cinerino/sdk": "12.12.1",
     "@motionpicture/coa-service": "9.6.0",
     "@motionpicture/gmo-service": "5.4.0-alpha.1",
@@ -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.16"
+  "version": "23.2.0-alpha.18"
 }

package/lib/chevre/service/eventOld.d.ts

@@ -1,60 +0,0 @@
-/**
- * マスターデータ同期サービス
- */
-import type * as COA from '@motionpicture/coa-service';
-import type { ActionRepo } from '../repo/action';
-import type { CategoryCodeRepo } from '../repo/categoryCode';
-import type { CreativeWorkRepo } from '../repo/creativeWork';
-import type { EventRepo } from '../repo/event';
-import type { EventSeriesRepo } from '../repo/eventSeries';
-import type { MovieTheaterRepo } from '../repo/place/movieTheater';
-import type { ScreeningRoomRepo } from '../repo/place/screeningRoom';
-import type { SellerRepo } from '../repo/seller';
-import * as factory from '../factory';
-interface IImportFromCOAParams {
-    project: {
-        id: string;
-        typeOf: factory.organizationType.Project;
-    };
-    /**
-     * 施設コード
-     */
-    locationBranchCode: string;
-    importFrom: Date;
-    importThrough: Date;
-    /**
-     * 施設を保管するかどうか
-     */
-    saveMovieTheater: boolean;
-    /**
-     * 施設コンテンツを保管するかどうか
-     */
-    saveScreeningEventSeries: boolean;
-    saveScreeningEventSeriesPeriodInMonth: number;
-}
-/**
- * イベントをインポートする
- */
-declare function importFromCOA(params: IImportFromCOAParams): (repos: {
-    action: ActionRepo;
-    categoryCode: CategoryCodeRepo;
-    creativeWork: CreativeWorkRepo;
-    event: EventRepo;
-    eventSeries: EventSeriesRepo;
-    movieTheater: MovieTheaterRepo;
-    screeningRoom: ScreeningRoomRepo;
-    seller: SellerRepo;
-    masterService: COA.service.Master;
-}) => Promise<void>;
-/**
- * COA情報からイベントIDを作成する
- */
-declare function createScreeningEventIdFromCOA(params: {
-    theaterCode: string;
-    titleCode: string;
-    titleBranchNum: string;
-    dateJouei: string;
-    screenCode: string;
-    timeBegin: string;
-}): string;
-export { importFromCOA, createScreeningEventIdFromCOA };