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

package/lib/chevre/repo/event.js

@@ -66,7 +66,7 @@ class EventRepo {
     }
     // tslint:disable-next-line:cyclomatic-complexity max-func-body-length
     static CREATE_MONGO_CONDITIONS(conditions) {
-        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s, _t, _u, _v, _w, _x, _y, _z, _0, _1, _2, _3, _4, _5, _6, _7, _8, _9, _10, _11, _12, _13, _14, _15, _16, _17, _18, _19, _20, _21, _22, _23, _24, _25, _26, _27, _28, _29, _30, _31, _32, _33, _34, _35, _36, _37, _38, _39, _40, _41, _42;
+        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s, _t, _u, _v, _w, _x, _y, _z, _0, _1, _2, _3, _4, _5, _6, _7, _8, _9, _10, _11, _12, _13, _14, _15, _16, _17, _18, _19, _20, _21, _22, _23, _24, _25, _26, _27, _28, _29;
         const andConditions = [];
         const typeOfEq = conditions.typeOf;
         if (typeof typeOfEq === 'string') {
@@ -372,106 +372,107 @@ class EventRepo {
                 }
                 break;
             case factory.eventType.ScreeningEventSeries:
-                params = conditions;
-                // tslint:disable-next-line:no-single-line-block-comment
-                /* istanbul ignore else */
-                if (typeof params.name === 'string' && params.name.length > 0) {
-                    andConditions.push({
-                        $or: [
-                            {
-                                'name.ja': {
-                                    $exists: true,
-                                    $regex: new RegExp(params.name)
-                                }
-                            },
-                            {
-                                'name.en': {
-                                    $exists: true,
-                                    $regex: new RegExp(params.name)
-                                }
-                            },
-                            {
-                                kanaName: {
-                                    $exists: true,
-                                    $regex: new RegExp(params.name)
-                                }
-                            }
-                        ]
-                    });
-                }
-                const locationIdEq = (_31 = (_30 = params.location) === null || _30 === void 0 ? void 0 : _30.id) === null || _31 === void 0 ? void 0 : _31.$eq;
-                // tslint:disable-next-line:no-single-line-block-comment
-                /* istanbul ignore else */
-                if (typeof locationIdEq === 'string') {
-                    andConditions.push({
-                        'location.id': { $exists: true, $eq: locationIdEq }
-                    });
-                }
-                // tslint:disable-next-line:no-single-line-block-comment
-                /* istanbul ignore else */
-                if (params.location !== undefined) {
-                    // tslint:disable-next-line:no-single-line-block-comment
-                    /* istanbul ignore else */
-                    if (Array.isArray(params.location.branchCodes)) {
-                        andConditions.push({
-                            'location.branchCode': {
-                                $exists: true,
-                                $in: params.location.branchCodes
-                            }
-                        });
-                    }
-                }
-                const workPerformedIdentifierIn = (_32 = params.workPerformed) === null || _32 === void 0 ? void 0 : _32.identifiers;
-                // tslint:disable-next-line:no-single-line-block-comment
-                /* istanbul ignore else */
-                if (Array.isArray(workPerformedIdentifierIn)) {
-                    andConditions.push({
-                        'workPerformed.identifier': { $exists: true, $in: workPerformedIdentifierIn }
-                    });
-                }
-                const workPerformedVersionEq = (_34 = (_33 = params.workPerformed) === null || _33 === void 0 ? void 0 : _33.version) === null || _34 === void 0 ? void 0 : _34.$eq;
-                if (typeof workPerformedVersionEq === 'string') {
-                    andConditions.push({
-                        'workPerformed.version': { $exists: true, $eq: workPerformedVersionEq }
-                    });
-                }
-                const videoFormatTypeOfEq = (_36 = (_35 = params.videoFormat) === null || _35 === void 0 ? void 0 : _35.typeOf) === null || _36 === void 0 ? void 0 : _36.$eq;
-                if (typeof videoFormatTypeOfEq === 'string') {
-                    andConditions.push({
-                        'videoFormat.typeOf': {
-                            $exists: true,
-                            $eq: videoFormatTypeOfEq
-                        }
-                    });
-                }
-                const videoFormatTypeOfIn = (_38 = (_37 = params.videoFormat) === null || _37 === void 0 ? void 0 : _37.typeOf) === null || _38 === void 0 ? void 0 : _38.$in;
-                if (Array.isArray(videoFormatTypeOfIn)) {
-                    andConditions.push({
-                        'videoFormat.typeOf': {
-                            $exists: true,
-                            $in: videoFormatTypeOfIn
-                        }
-                    });
-                }
-                const soundFormatTypeOfEq = (_40 = (_39 = params.soundFormat) === null || _39 === void 0 ? void 0 : _39.typeOf) === null || _40 === void 0 ? void 0 : _40.$eq;
-                if (typeof soundFormatTypeOfEq === 'string') {
-                    andConditions.push({
-                        'soundFormat.typeOf': {
-                            $exists: true,
-                            $eq: soundFormatTypeOfEq
-                        }
-                    });
-                }
-                const soundFormatTypeOfIn = (_42 = (_41 = params.soundFormat) === null || _41 === void 0 ? void 0 : _41.typeOf) === null || _42 === void 0 ? void 0 : _42.$in;
-                if (Array.isArray(soundFormatTypeOfIn)) {
-                    andConditions.push({
-                        'soundFormat.typeOf': {
-                            $exists: true,
-                            $in: soundFormatTypeOfIn
-                        }
-                    });
-                }
-                break;
+                throw new factory.errors.Internal('typeOf: ScreeningEventSeries discontinued');
+            // params = conditions;
+            // // tslint:disable-next-line:no-single-line-block-comment
+            // /* istanbul ignore else */
+            // if (typeof params.name === 'string' && params.name.length > 0) {
+            //     andConditions.push({
+            //         $or: [
+            //             {
+            //                 'name.ja': {
+            //                     $exists: true,
+            //                     $regex: new RegExp(params.name)
+            //                 }
+            //             },
+            //             {
+            //                 'name.en': {
+            //                     $exists: true,
+            //                     $regex: new RegExp(params.name)
+            //                 }
+            //             },
+            //             {
+            //                 kanaName: {
+            //                     $exists: true,
+            //                     $regex: new RegExp(params.name)
+            //                 }
+            //             }
+            //         ]
+            //     });
+            // }
+            // const locationIdEq = params.location?.id?.$eq;
+            // // tslint:disable-next-line:no-single-line-block-comment
+            // /* istanbul ignore else */
+            // if (typeof locationIdEq === 'string') {
+            //     andConditions.push({
+            //         'location.id': { $exists: true, $eq: locationIdEq }
+            //     });
+            // }
+            // // tslint:disable-next-line:no-single-line-block-comment
+            // /* istanbul ignore else */
+            // if (params.location !== undefined) {
+            //     // tslint:disable-next-line:no-single-line-block-comment
+            //     /* istanbul ignore else */
+            //     if (Array.isArray(params.location.branchCodes)) {
+            //         andConditions.push({
+            //             'location.branchCode': {
+            //                 $exists: true,
+            //                 $in: params.location.branchCodes
+            //             }
+            //         });
+            //     }
+            // }
+            // const workPerformedIdentifierIn = params.workPerformed?.identifiers;
+            // // tslint:disable-next-line:no-single-line-block-comment
+            // /* istanbul ignore else */
+            // if (Array.isArray(workPerformedIdentifierIn)) {
+            //     andConditions.push({
+            //         'workPerformed.identifier': { $exists: true, $in: workPerformedIdentifierIn }
+            //     });
+            // }
+            // const workPerformedVersionEq = params.workPerformed?.version?.$eq;
+            // if (typeof workPerformedVersionEq === 'string') {
+            //     andConditions.push({
+            //         'workPerformed.version': { $exists: true, $eq: workPerformedVersionEq }
+            //     });
+            // }
+            // const videoFormatTypeOfEq = params.videoFormat?.typeOf?.$eq;
+            // if (typeof videoFormatTypeOfEq === 'string') {
+            //     andConditions.push({
+            //         'videoFormat.typeOf': {
+            //             $exists: true,
+            //             $eq: videoFormatTypeOfEq
+            //         }
+            //     });
+            // }
+            // const videoFormatTypeOfIn = params.videoFormat?.typeOf?.$in;
+            // if (Array.isArray(videoFormatTypeOfIn)) {
+            //     andConditions.push({
+            //         'videoFormat.typeOf': {
+            //             $exists: true,
+            //             $in: videoFormatTypeOfIn
+            //         }
+            //     });
+            // }
+            // const soundFormatTypeOfEq = params.soundFormat?.typeOf?.$eq;
+            // if (typeof soundFormatTypeOfEq === 'string') {
+            //     andConditions.push({
+            //         'soundFormat.typeOf': {
+            //             $exists: true,
+            //             $eq: soundFormatTypeOfEq
+            //         }
+            //     });
+            // }
+            // const soundFormatTypeOfIn = params.soundFormat?.typeOf?.$in;
+            // if (Array.isArray(soundFormatTypeOfIn)) {
+            //     andConditions.push({
+            //         'soundFormat.typeOf': {
+            //             $exists: true,
+            //             $in: soundFormatTypeOfIn
+            //         }
+            //     });
+            // }
+            // break;
             default:
         }
         return andConditions;
@@ -479,7 +480,7 @@ class EventRepo {
     /**
      * 複数イベントを作成する
      */
-    createMany(params) {
+    createManyEvents(params) {
         return __awaiter(this, void 0, void 0, function* () {
             const uniqid = yield Promise.resolve().then(() => require('uniqid'));
             // let docs: HydratedDocument<factory.event.IEvent<T>>[];
@@ -568,119 +569,6 @@ class EventRepo {
             }
         });
     }
-    /**
-     * コンテンツ+バージョンをキーにして、なければ作成する(複数対応)
-     */
-    createScreeningEventSeriesIfNotExistByWorkPerformed(params) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const uniqid = yield Promise.resolve().then(() => require('uniqid'));
-            const bulkWriteOps = [];
-            if (Array.isArray(params)) {
-                params.forEach((creatingEventParams) => {
-                    const version = creatingEventParams.attributes.workPerformed.version;
-                    if (typeof version !== 'string') {
-                        throw new factory.errors.ArgumentNull('workPerformed.version');
-                    }
-                    const setOnInsertFields = creatingEventParams.attributes;
-                    bulkWriteOps.push({
-                        updateOne: {
-                            filter: {
-                                typeOf: creatingEventParams.attributes.typeOf,
-                                'project.id': { $eq: creatingEventParams.attributes.project.id },
-                                'location.branchCode': {
-                                    $exists: true,
-                                    $eq: creatingEventParams.attributes.location.branchCode
-                                },
-                                'workPerformed.identifier': {
-                                    $exists: true,
-                                    $eq: creatingEventParams.attributes.workPerformed.identifier
-                                },
-                                'workPerformed.version': {
-                                    $exists: true,
-                                    $eq: version
-                                }
-                            },
-                            update: {
-                                $setOnInsert: Object.assign(Object.assign({}, setOnInsertFields), { _id: uniqid() })
-                                // 変更可能な属性のみ上書き
-                                // $set: {}
-                            },
-                            upsert: true
-                        }
-                    });
-                });
-            }
-            if (bulkWriteOps.length > 0) {
-                return this.eventModel.bulkWrite(bulkWriteOps, { ordered: false });
-            }
-        });
-    }
-    /**
-     * コンテンツ+バージョンをキーにして冪等置換
-     */
-    // tslint:disable-next-line:max-func-body-length
-    upsertScreeningEventSeriesByVersion(params
-    // options?: {
-    // }
-    ) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const uniqid = yield Promise.resolve().then(() => require('uniqid'));
-            const bulkWriteOps4insert = [];
-            // const bulkWriteOps: AnyBulkWriteOperation<factory.event.IAttributes<factory.eventType.ScreeningEventSeries>>[] = [];
-            const queryFilters = [];
-            if (Array.isArray(params)) {
-                params.forEach(({ $set, $unset }) => {
-                    const version = $set.workPerformed.version;
-                    if (typeof version !== 'string' || version.length === 0) {
-                        throw new factory.errors.ArgumentNull('workPerformed.version');
-                    }
-                    // リソースのユニークネスを保証するfilter
-                    const filter = {
-                        typeOf: $set.typeOf,
-                        'project.id': { $eq: $set.project.id },
-                        'location.branchCode': { $exists: true, $eq: $set.location.branchCode },
-                        'workPerformed.identifier': { $exists: true, $eq: $set.workPerformed.identifier },
-                        'workPerformed.version': { $exists: true, $eq: version }
-                    };
-                    queryFilters.push({
-                        typeOf: $set.typeOf,
-                        'project.id': { $eq: $set.project.id },
-                        'location.branchCode': { $exists: true, $eq: $set.location.branchCode },
-                        'workPerformed.identifier': { $exists: true, $eq: $set.workPerformed.identifier },
-                        'workPerformed.version': { $exists: true, $eq: version }
-                    });
-                    const { identifier, project, typeOf } = $set, setFields = __rest($set, ["identifier", "project", "typeOf"]);
-                    const setOnInsert = {
-                        project,
-                        typeOf,
-                        _id: uniqid()
-                    };
-                    const updateOne = {
-                        filter,
-                        update: Object.assign({ $setOnInsert: setOnInsert, $set: setFields }, ($unset !== undefined) ? { $unset } : undefined),
-                        upsert: true
-                    };
-                    bulkWriteOps4insert.push({ updateOne });
-                    // updateOneで再実装
-                    // const replacement: WithoutId<factory.event.IAttributes<factory.eventType.ScreeningEventSeries>> = attributes;
-                    // const replaceOne: ReplaceOneModel<factory.event.IAttributes<factory.eventType.ScreeningEventSeries>> = {
-                    //     filter,
-                    //     replacement,
-                    //     upsert: true
-                    // };
-                    // bulkWriteOps.push({ replaceOne });
-                });
-            }
-            if (bulkWriteOps4insert.length > 0) {
-                const bulkWriteResult4insert = yield this.eventModel.bulkWrite(bulkWriteOps4insert, { ordered: false });
-                // const bulkWriteResult = await this.eventModel.bulkWrite(bulkWriteOps, { ordered: false });
-                // modifiedの場合upsertedIdsに含まれないので、idを検索する
-                const modifiedEvents = yield this.eventModel.find({ $or: queryFilters }, { _id: 1 })
-                    .exec();
-                return { bulkWriteResult4insert, modifiedEvents };
-            }
-        });
-    }
     /**
      * イベント部分更新
      */
@@ -709,7 +597,7 @@ class EventRepo {
     /**
      * イベントを保管する
      */
-    save(params) {
+    saveEvent(params) {
         return __awaiter(this, void 0, void 0, function* () {
             let savedEventId;
             let doc;
@@ -753,7 +641,7 @@ class EventRepo {
             // return doc.toObject();
         });
     }
-    saveMany(params) {
+    saveManyEvents(params) {
         return __awaiter(this, void 0, void 0, function* () {
             const bulkWriteOps = [];
             if (Array.isArray(params)) {
@@ -778,20 +666,30 @@ class EventRepo {
                         });
                     }
                     else if (p.attributes.typeOf === factory.eventType.ScreeningEventSeries) {
+                        throw new factory.errors.Internal('typeOf: ScreeningEventSeries discontinued');
                         // 上書き禁止属性を除外(2022-08-24~)
-                        const _b = p.attributes, { identifier, project, typeOf } = _b, updateFields = __rest(_b, ["identifier", "project", "typeOf"]);
-                        bulkWriteOps.push({
-                            updateOne: {
-                                filter: {
-                                    _id: p.id,
-                                    typeOf: p.attributes.typeOf
-                                },
-                                // upsertの場合、createがありうるので属性を除外しない
-                                update: Object.assign({ $setOnInsert: Object.assign({ typeOf: p.attributes.typeOf, project: p.attributes.project }, (typeof p.attributes.identifier === 'string')
-                                        ? { identifier: p.attributes.identifier } : undefined), $set: updateFields }, (p.$unset !== undefined) ? { $unset: p.$unset } : undefined),
-                                upsert
-                            }
-                        });
+                        // const { identifier, project, typeOf, ...updateFields } = p.attributes;
+                        // bulkWriteOps.push({
+                        //     updateOne: {
+                        //         filter: {
+                        //             _id: p.id,
+                        //             typeOf: p.attributes.typeOf
+                        //         },
+                        //         // upsertの場合、createがありうるので属性を除外しない
+                        //         update: {
+                        //             $setOnInsert: {
+                        //                 typeOf: p.attributes.typeOf,
+                        //                 project: p.attributes.project,
+                        //                 ...(typeof p.attributes.identifier === 'string')
+                        //                     ? { identifier: p.attributes.identifier } : undefined
+                        //             },
+                        //             $set: updateFields,
+                        //             // $unsetに対応(2022-08-31~)
+                        //             ...(p.$unset !== undefined) ? { $unset: p.$unset } : undefined
+                        //         },
+                        //         upsert
+                        //     }
+                        // });
                     }
                 });
             }
@@ -830,49 +728,10 @@ class EventRepo {
             // return <factory.event.IEvent<factory.eventType.ScreeningEvent>>doc.toObject();
         });
     }
-    // migrate to projectFields
-    // public async search<T extends factory.eventType>(
-    //     params: ISearchConditions<T>,
-    //     inclusion: IKeyOfProjection<T>[],
-    //     exclusion?: IKeyOfProjection<T>[]
-    // ): Promise<Omit<factory.event.IEvent<T>, 'aggregateEntranceGate' | 'aggregateOffer'>[]> {
-    //     const conditions = EventRepo.CREATE_MONGO_CONDITIONS<T>(params);
-    //     let projection: IProjection<T> = {};
-    //     if (Array.isArray(inclusion) && inclusion.length > 0) {
-    //         inclusion.forEach((field) => {
-    //             projection[field] = 1;
-    //         });
-    //     } else {
-    //         projection = {
-    //             __v: 0,
-    //             createdAt: 0,
-    //             updatedAt: 0
-    //         };
-    //         if (Array.isArray(exclusion) && exclusion.length > 0) {
-    //             exclusion.forEach((field) => {
-    //                 projection[field] = 0;
-    //             });
-    //         }
-    //     }
-    //     const query = this.eventModel.find<HydratedDocument<factory.event.IEvent<T>>>({ $and: conditions }, projection);
-    //     if (typeof params.limit === 'number' && params.limit > 0) {
-    //         const page: number = (typeof params.page === 'number' && params.page > 0) ? params.page : 1;
-    //         query.limit(params.limit)
-    //             .skip(params.limit * (page - 1));
-    //     }
-    //     // tslint:disable-next-line:no-single-line-block-comment
-    //     /* istanbul ignore else */
-    //     if (params.sort?.startDate !== undefined) {
-    //         query.sort({ startDate: params.sort.startDate });
-    //     }
-    //     return query.setOptions({ maxTimeMS: MONGO_MAX_TIME_MS })
-    //         .exec()
-    //         .then((docs) => docs.map((doc) => doc.toObject()));
-    // }
     /**
      * イベントを検索する(inclusion projection)
      */
-    projectFields(params, inclusion) {
+    projectEventFields(params, inclusion) {
         var _a;
         return __awaiter(this, void 0, void 0, function* () {
             const conditions = EventRepo.CREATE_MONGO_CONDITIONS(params);
@@ -918,7 +777,7 @@ class EventRepo {
     findAnyEventById(params) {
         var _a;
         return __awaiter(this, void 0, void 0, function* () {
-            const doc = yield this.eventModel.findOne(Object.assign({ _id: { $eq: params.id.$eq }, 'project.id': { $eq: params.project.id.$eq } }, (typeof ((_a = params.organizer) === null || _a === void 0 ? void 0 : _a.id.$eq) === 'string')
+            const doc = yield this.eventModel.findOne(Object.assign({ _id: { $eq: params.id.$eq }, 'project.id': { $eq: params.project.id.$eq }, typeOf: { $in: [factory.eventType.Event, factory.eventType.ScreeningEvent] } }, (typeof ((_a = params.organizer) === null || _a === void 0 ? void 0 : _a.id.$eq) === 'string')
                 ? { 'organizer.id': { $exists: true, $eq: params.organizer.id.$eq } }
                 : undefined), {
                 __v: 0,
@@ -937,7 +796,7 @@ class EventRepo {
             return doc.toObject();
         });
     }
-    searchIds(params) {
+    searchEventIds(params) {
         return __awaiter(this, void 0, void 0, function* () {
             const conditions = EventRepo.CREATE_MONGO_CONDITIONS(params);
             const query = this.eventModel.distinct('_id', { $and: conditions });
@@ -949,7 +808,7 @@ class EventRepo {
      * 特定イベントから指定フィールドのみ取得する
      * イベント IDは必ず返ります
      */
-    projectFieldsById(params, inclusion // add projection(2024-07-18~)
+    projectEventFieldsById(params, inclusion // add projection(2024-07-18~)
     ) {
         return __awaiter(this, void 0, void 0, function* () {
             const projection = {
@@ -981,7 +840,7 @@ class EventRepo {
     /**
      * イベントをキャンセルする
      */
-    cancel(params) {
+    cancelEvent(params) {
         return __awaiter(this, void 0, void 0, function* () {
             yield this.eventModel.updateOne({
                 _id: { $eq: params.id },
@@ -995,26 +854,35 @@ class EventRepo {
      */
     syncScreeningEventSeries2screeningEvents(params) {
         return __awaiter(this, void 0, void 0, function* () {
-            const superEvents = yield this.projectFields({
-                limit: 1,
-                page: 1,
-                typeOf: factory.eventType.ScreeningEventSeries,
-                id: { $eq: params.superEvent.id },
-                project: { id: { $eq: params.project.id } }
-            }, [
-                'additionalProperty', 'alternativeHeadline', 'description', 'dubLanguage',
-                'endDate', 'headline', 'kanaName', 'location', 'name',
-                'soundFormat', 'startDate', 'subtitleLanguage', 'typeOf', 'videoFormat', 'workPerformed'
-            ]);
-            const superEventFromDB = superEvents.shift();
-            if (superEventFromDB === undefined) {
-                throw new factory.errors.NotFound(factory.eventType.ScreeningEventSeries);
-            }
-            const superEvent = EventFactory.minimizeSuperEvent({ superEventFromDB });
+            // const superEvents = <Pick<
+            //     factory.event.screeningEventSeries.IEvent,
+            //     'additionalProperty' | 'alternativeHeadline' | 'description' | 'dubLanguage'
+            //     | 'endDate' | 'headline' | 'id' | 'kanaName' | 'location' | 'name'
+            //     | 'soundFormat' | 'startDate' | 'subtitleLanguage' | 'typeOf' | 'videoFormat' | 'workPerformed'
+            // >[]>
+            //     await this.projectFields<factory.eventType.ScreeningEventSeries>(
+            //         {
+            //             limit: 1,
+            //             page: 1,
+            //             typeOf: factory.eventType.ScreeningEventSeries,
+            //             id: { $eq: params.superEvent.id },
+            //             project: { id: { $eq: params.project.id } }
+            //         },
+            //         [
+            //             'additionalProperty', 'alternativeHeadline', 'description', 'dubLanguage',
+            //             'endDate', 'headline', 'kanaName', 'location', 'name',
+            //             'soundFormat', 'startDate', 'subtitleLanguage', 'typeOf', 'videoFormat', 'workPerformed'
+            //         ]
+            //     );
+            // const superEventFromDB = superEvents.shift();
+            // if (superEventFromDB === undefined) {
+            //     throw new factory.errors.NotFound(factory.eventType.ScreeningEventSeries);
+            // }
+            const superEvent = EventFactory.minimizeSuperEvent({ superEventFromDB: params.superEventFromDB });
             yield this.eventModel.updateMany({
                 typeOf: { $eq: factory.eventType.ScreeningEvent },
                 'project.id': { $eq: params.project.id },
-                'superEvent.id': { $exists: true, $eq: params.superEvent.id },
+                'superEvent.id': { $exists: true, $eq: params.superEventFromDB.id },
                 startDate: { $gte: params.startDate.$gte }
             }, {
                 $set: {
@@ -1024,7 +892,7 @@ class EventRepo {
                 .exec();
         });
     }
-    deleteById(params) {
+    deleteEventById(params) {
         return __awaiter(this, void 0, void 0, function* () {
             yield this.eventModel.findOneAndDelete({
                 _id: params.id,
@@ -1033,33 +901,7 @@ class EventRepo {
                 .exec();
         });
     }
-    // public async deleteScreeningEventsByMovieTheaterBranchCode(params: {
-    //     project: { id: string };
-    //     location: { branchCode: string };
-    // }) {
-    //     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();
-    // }
-    // public async deleteScreeningEventSeriesByMovieTheaterBranchCode(params: {
-    //     project: { id: string };
-    //     location: { branchCode: string };
-    // }) {
-    //     return this.eventModel.deleteMany(
-    //         {
-    //             typeOf: { $eq: factory.eventType.ScreeningEventSeries },
-    //             'project.id': { $eq: params.project.id },
-    //             'location.branchCode': { $exists: true, $eq: params.location.branchCode }
-    //         }
-    //     )
-    //         .exec();
-    // }
-    deleteManyByOrganizerId(params) {
+    deleteManyEventByOrganizerId(params) {
         return __awaiter(this, void 0, void 0, function* () {
             return this.eventModel.deleteMany({
                 'project.id': { $eq: params.project.id },
@@ -1068,16 +910,7 @@ class EventRepo {
                 .exec();
         });
     }
-    deleteManyByLocationId(params) {
-        return __awaiter(this, void 0, void 0, function* () {
-            return this.eventModel.deleteMany({
-                'project.id': { $eq: params.project.id },
-                'location.id': { $exists: true, $eq: params.location.id }
-            })
-                .exec();
-        });
-    }
-    deleteManyByScreeningRoom(params) {
+    deleteManyEventsByScreeningRoom(params) {
         return __awaiter(this, void 0, void 0, function* () {
             return this.eventModel.deleteMany({
                 'project.id': { $eq: params.project.id },
@@ -1108,7 +941,7 @@ class EventRepo {
     /**
      * 興行(プロダクト)から削除する
      */
-    deleteManyByItemOfferedId(params) {
+    deleteManyEventsByItemOfferedId(params) {
         return __awaiter(this, void 0, void 0, function* () {
             return this.eventModel.deleteMany({
                 'project.id': { $eq: params.project.id },
@@ -1117,18 +950,33 @@ class EventRepo {
                 .exec();
         });
     }
-    deleteManyEndedByIds(params) {
+    /**
+     * 旧施設コンテンツ廃止専用メソッド
+     * 2024-09-11~
+     */
+    deleteOldEventSeries() {
         return __awaiter(this, void 0, void 0, function* () {
             return this.eventModel.deleteMany({
-                typeOf: { $in: params.typeOf.$in },
-                'project.id': { $eq: params.project.id },
-                _id: { $in: params.ids },
-                endDate: { $lte: params.endDate.$lte }
+                typeOf: { $eq: factory.eventType.ScreeningEventSeries }
             })
                 .exec();
         });
     }
-    deleteManyEndedByProject(params) {
+    // public async deleteManyEndedByIds(params: {
+    //     typeOf: { $in: factory.eventType[] };
+    //     project: { id: string };
+    //     ids: string[];
+    //     endDate: { $lte: Date };
+    // }) {
+    //     return this.eventModel.deleteMany({
+    //         typeOf: { $in: params.typeOf.$in },
+    //         'project.id': { $eq: params.project.id },
+    //         _id: { $in: params.ids },
+    //         endDate: { $lte: params.endDate.$lte }
+    //     })
+    //         .exec();
+    // }
+    deleteManyEventsEndedByProject(params) {
         return __awaiter(this, void 0, void 0, function* () {
             return this.eventModel.deleteMany({
                 typeOf: { $in: params.typeOf.$in },
@@ -1138,7 +986,7 @@ class EventRepo {
                 .exec();
         });
     }
-    deleteManyEnded(params) {
+    deleteManyEventsEnded(params) {
         return __awaiter(this, void 0, void 0, function* () {
             return this.eventModel.deleteMany({
                 typeOf: { $eq: params.typeOf.$eq },
@@ -1169,7 +1017,6 @@ class EventRepo {
             if (doc === null) {
                 throw new factory.errors.NotFound(this.eventModel.modelName);
             }
-            // return doc.toObject();
         });
     }
     bulkWrite(bulkWriteOps) {
@@ -1192,60 +1039,33 @@ class EventRepo {
                 .exec();
         });
     }
-    deleteAvailableAtOrFrom(params) {
-        return __awaiter(this, void 0, void 0, function* () {
-            yield this.eventModel.updateOne({ _id: { $eq: params.id } }, {
-                $pull: {
-                    'offers.seller.makesOffer': {
-                        'availableAtOrFrom.id': { $eq: params.offers.seller.makesOffer.availableAtOrFrom.id }
-                    }
-                }
-            }, { rawResult: true })
-                .exec();
-        });
-    }
+    // public async deleteAvailableAtOrFrom(params: {
+    //     id: string;
+    //     offers: {
+    //         seller: {
+    //             makesOffer: { availableAtOrFrom: { id: string } };
+    //         };
+    //     };
+    // }): Promise<void> {
+    //     await this.eventModel.updateOne(
+    //         { _id: { $eq: params.id } },
+    //         {
+    //             $pull: {
+    //                 'offers.seller.makesOffer': {
+    //                     'availableAtOrFrom.id': { $eq: params.offers.seller.makesOffer.availableAtOrFrom.id }
+    //                 }
+    //             }
+    //         },
+    //         { rawResult: true }
+    //     )
+    //         .exec();
+    // }
     unsetUnnecessaryFields(params) {
         return __awaiter(this, void 0, void 0, function* () {
             return this.eventModel.updateMany(params.filter, { $unset: params.$unset }, { timestamps: false })
                 .exec();
         });
     }
-    /**
-     * 既存施設コンテンツの最大バージョンを集計する
-     */
-    aggregateScreeningEventMaxVersion(params) {
-        var _a;
-        return __awaiter(this, void 0, void 0, function* () {
-            const aggregations = yield this.eventModel.aggregate([
-                {
-                    $match: {
-                        typeOf: { $eq: factory.eventType.ScreeningEventSeries },
-                        'project.id': { $eq: params.project.id.$eq },
-                        'workPerformed.identifier': { $exists: true, $eq: params.workPerformed.identifier.$eq },
-                        'workPerformed.version': { $exists: true },
-                        'location.branchCode': { $exists: true, $in: params.location.branchCode.$in }
-                    }
-                },
-                {
-                    $project: {
-                        workPerformed: '$workPerformed',
-                        version: { $toInt: '$workPerformed.version' }
-                    }
-                },
-                {
-                    $group: {
-                        _id: '$typeOf',
-                        maxVersion: { $max: '$version' }
-                    }
-                }
-            ])
-                .exec();
-            const maxVersion = (aggregations.length > 0)
-                ? String((_a = aggregations.shift()) === null || _a === void 0 ? void 0 : _a.maxVersion)
-                : '0';
-            return { maxVersion };
-        });
-    }
     aggregateEvent(params) {
         return __awaiter(this, void 0, void 0, function* () {
             const statuses = yield Promise.all([