@chevre/domain 22.3.0-alpha.23 → 22.3.0-alpha.25

package/example/src/chevre/migrateEventSeries2secondary.ts

@@ -48,9 +48,9 @@ async function main() {
                 eventSeries.id,
                 eventSeries.startDate, i, updateCount
             );
-            await eventSeriesRepo.sync2secondary({
-                id: eventSeries.id
-            });
+            // await eventSeriesRepo.sync2secondary({
+            //     id: eventSeries.id
+            // });
             console.log(
                 'updated.',
                 eventSeries.project.id,

package/lib/chevre/repo/event.js

@@ -373,106 +373,6 @@ class EventRepo {
                 break;
             case factory.eventType.ScreeningEventSeries:
                 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;
@@ -870,30 +770,6 @@ class EventRepo {
      */
     syncScreeningEventSeries2screeningEvents(params) {
         return __awaiter(this, void 0, void 0, function* () {
-            // 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 },

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

@@ -25,7 +25,7 @@
 import type { BulkWriteResult } from 'mongodb';
 import type { Connection, Document, FilterQuery } from 'mongoose';
 import * as factory from '../factory';
-type ISearchConditions = Omit<factory.event.ISearchConditions<factory.eventType.ScreeningEventSeries>, 'typeOfIn' | 'hasOfferCatalog'>;
+type ISearchConditions = factory.event.ISearchConditions<factory.eventType.ScreeningEventSeries>;
 type IKeyOfProjection = Exclude<keyof factory.event.IEvent<factory.eventType.ScreeningEventSeries>, 'id'>;
 type IUnset = {
     [key in keyof factory.event.IEvent<factory.eventType.ScreeningEventSeries>]?: 1;
@@ -34,7 +34,7 @@ type IUnset = {
  * 施設コンテンツリポジトリ
  */
 export declare class EventSeriesRepo {
-    private readonly eventModel;
+    private readonly eventSeriesModel;
     constructor(connection: Connection);
     static CREATE_MONGO_CONDITIONS(conditions: ISearchConditions): FilterQuery<factory.event.IEvent<factory.eventType.ScreeningEventSeries>>[];
     /**
@@ -127,9 +127,6 @@ export declare class EventSeriesRepo {
     }): Promise<{
         maxVersion: string;
     }>;
-    sync2secondary(__: {
-        id: string;
-    }): Promise<void>;
     getCursor(conditions: FilterQuery<any>, projection: any): import("mongoose").Cursor<Document<unknown, {}, import("@chevre/factory/lib/event/screeningEventSeries").IAttributes & {
         _id: string;
     }> & import("@chevre/factory/lib/event/screeningEventSeries").IAttributes & {

package/lib/chevre/repo/eventSeries.js

@@ -22,7 +22,6 @@ var __rest = (this && this.__rest) || function (s, e) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.EventSeriesRepo = void 0;
 const factory = require("../factory");
-// import { createSchema, IDocType, IModel, modelName } from './mongoose/schemas/event';
 const eventSeries_1 = require("./mongoose/schemas/eventSeries");
 const errorHandler_1 = require("../errorHandler");
 const settings_1 = require("../settings");
@@ -30,18 +29,8 @@ const settings_1 = require("../settings");
  * 施設コンテンツリポジトリ
  */
 class EventSeriesRepo {
-    // private readonly eventModel: IModel | INewModel;
-    // private readonly secondaryEventModel: IModel | INewModel;
     constructor(connection) {
-        this.eventModel = connection.model(eventSeries_1.modelName, (0, eventSeries_1.createSchema)());
-        // this.secondaryEventModel = connection.model(modelName, createSchema());
-        // if (USE_EVENT_SERIES_NEW_SCHEMA) {
-        //     this.eventModel = connection.model(newModelName, createNewSchema());
-        //     this.secondaryEventModel = connection.model(modelName, createSchema());
-        // } else {
-        //     this.eventModel = connection.model(modelName, createSchema());
-        //     this.secondaryEventModel = connection.model(newModelName, createNewSchema());
-        // }
+        this.eventSeriesModel = connection.model(eventSeries_1.modelName, (0, eventSeries_1.createSchema)());
     }
     // tslint:disable-next-line:cyclomatic-complexity max-func-body-length
     static CREATE_MONGO_CONDITIONS(conditions) {
@@ -49,18 +38,6 @@ class EventSeriesRepo {
         const andConditions = [
             { typeOf: { $eq: factory.eventType.ScreeningEventSeries } } // fix(2024-09-08~)
         ];
-        // const typeOfEq = conditions.typeOf;
-        // if (typeof typeOfEq === 'string') {
-        //     andConditions.push({ typeOf: { $eq: typeOfEq } });
-        // }
-        // const typeOfIn = conditions.typeOfIn;
-        // if (Array.isArray(typeOfIn)) {
-        //     andConditions.push({ typeOf: { $in: typeOfIn } });
-        // }
-        // typeOf条件必須検証(2023-07-13~)
-        // if (typeof typeOfEq !== 'string' && !Array.isArray(typeOfIn)) {
-        //     throw new factory.errors.ArgumentNull('typeOf');
-        // }
         const projectIdEq = (_b = (_a = conditions.project) === null || _a === void 0 ? void 0 : _a.id) === null || _b === void 0 ? void 0 : _b.$eq;
         if (typeof projectIdEq === 'string') {
             andConditions.push({ 'project.id': { $eq: projectIdEq } });
@@ -134,15 +111,6 @@ class EventSeriesRepo {
         if (Array.isArray(locationBranchCodeIn)) {
             andConditions.push({ 'location.branchCode': { $exists: true, $in: locationBranchCodeIn } });
         }
-        // const hasOfferCatalogIdEq = conditions.hasOfferCatalog?.id?.$eq;
-        // if (typeof hasOfferCatalogIdEq === 'string') {
-        //     andConditions.push({
-        //         'hasOfferCatalog.id': {
-        //             $exists: true,
-        //             $eq: hasOfferCatalogIdEq
-        //         }
-        //     });
-        // }
         const additionalPropertyElemMatch = (_l = conditions.additionalProperty) === null || _l === void 0 ? void 0 : _l.$elemMatch;
         if (additionalPropertyElemMatch !== undefined && additionalPropertyElemMatch !== null) {
             andConditions.push({
@@ -262,7 +230,7 @@ class EventSeriesRepo {
                 return Object.assign({ _id: uniqid() }, p);
             });
             try {
-                yield this.eventModel.insertMany(insertingDocs, { rawResult: true } // rawResult(2024-08-02~)
+                yield this.eventSeriesModel.insertMany(insertingDocs, { rawResult: true } // rawResult(2024-08-02~)
                 );
                 // console.dir(insertResult, { depth: null });
             }
@@ -321,7 +289,7 @@ class EventSeriesRepo {
                 });
             }
             if (bulkWriteOps.length > 0) {
-                return this.eventModel.bulkWrite(bulkWriteOps, { ordered: false });
+                return this.eventSeriesModel.bulkWrite(bulkWriteOps, { ordered: false });
             }
         });
     }
@@ -370,9 +338,9 @@ class EventSeriesRepo {
                 });
             }
             if (bulkWriteOps4insert.length > 0) {
-                const bulkWriteResult4insert = yield this.eventModel.bulkWrite(bulkWriteOps4insert, { ordered: false });
+                const bulkWriteResult4insert = yield this.eventSeriesModel.bulkWrite(bulkWriteOps4insert, { ordered: false });
                 // modifiedの場合upsertedIdsに含まれないので、idを検索する
-                const modifiedEvents = yield this.eventModel.find({ $or: queryFilters }, { _id: 1 })
+                const modifiedEvents = yield this.eventSeriesModel.find({ $or: queryFilters }, { _id: 1 })
                     .exec();
                 return { bulkWriteResult4insert, modifiedEvents };
             }
@@ -390,13 +358,13 @@ class EventSeriesRepo {
                 if (params.id === undefined) {
                     const uniqid = yield Promise.resolve().then(() => require('uniqid'));
                     const id = uniqid();
-                    doc = yield this.eventModel.create(Object.assign(Object.assign({}, params.attributes), { _id: id }));
+                    doc = yield this.eventSeriesModel.create(Object.assign(Object.assign({}, params.attributes), { _id: id }));
                     savedEventId = id;
                 }
                 else {
                     // const upsert: boolean = params.upsert === true;
                     const upsert = false;
-                    doc = yield this.eventModel.findOneAndUpdate({
+                    doc = yield this.eventSeriesModel.findOneAndUpdate({
                         _id: { $eq: params.id },
                         typeOf: { $eq: typeOf }
                     }, Object.assign({ 
@@ -421,7 +389,7 @@ class EventSeriesRepo {
                 throw error;
             }
             if (doc === null) {
-                throw new factory.errors.NotFound(this.eventModel.modelName);
+                throw new factory.errors.NotFound(this.eventSeriesModel.modelName);
             }
             return { id: savedEventId }; // optimize(2024-07-31~)
             // return doc.toObject();
@@ -456,11 +424,7 @@ class EventSeriesRepo {
                 });
             }
             if (bulkWriteOps.length > 0) {
-                yield this.eventModel.bulkWrite(bulkWriteOps, { ordered: false });
-                // sync2secondary(2024-09-10~)
-                // if (USE_EVENT_SERIES_SYNC2SECONDARY) {
-                //     await (<INewModel>this.secondaryEventModel).bulkWrite(bulkWriteOps, { ordered: false });
-                // }
+                yield this.eventSeriesModel.bulkWrite(bulkWriteOps, { ordered: false });
             }
         });
     }
@@ -482,7 +446,7 @@ class EventSeriesRepo {
                 // discontinue(2024-07-24~)
                 throw new factory.errors.ArgumentNull('inclusion', 'inclusion must be specified');
             }
-            const query = this.eventModel.find({ $and: conditions }, projection);
+            const query = this.eventSeriesModel.find({ $and: conditions }, projection);
             if (typeof params.limit === 'number' && params.limit > 0) {
                 const page = (typeof params.page === 'number' && params.page > 0) ? params.page : 1;
                 query.limit(params.limit)
@@ -511,7 +475,7 @@ class EventSeriesRepo {
     //     project: { id: { $eq: string } };
     //     organizer?: { id: { $eq: string } };
     // }): Promise<factory.event.IEvent<factory.eventType.ScreeningEventSeries>> {
-    //     const doc = await this.eventModel.findOne<HydratedDocument<factory.event.IEvent<factory.eventType.ScreeningEventSeries>>>(
+    //     const doc = await this.eventSeriesModel.findOne<HydratedDocument<factory.event.IEvent<factory.eventType.ScreeningEventSeries>>>(
     //         {
     //             _id: { $eq: params.id.$eq },
     //             'project.id': { $eq: params.project.id.$eq },
@@ -540,7 +504,7 @@ class EventSeriesRepo {
     //     params: ISearchConditions
     // ): Promise<string[]> {
     //     const conditions = EventSeriesRepo.CREATE_MONGO_CONDITIONS(params);
-    //     const query = this.eventModel.distinct(
+    //     const query = this.eventSeriesModel.distinct(
     //         '_id',
     //         { $and: conditions }
     //     );
@@ -549,7 +513,7 @@ class EventSeriesRepo {
     // }
     deleteEventSeriesById(params) {
         return __awaiter(this, void 0, void 0, function* () {
-            yield this.eventModel.findOneAndDelete({
+            yield this.eventSeriesModel.findOneAndDelete({
                 _id: { $eq: params.id },
                 'project.id': { $eq: params.project.id },
                 typeOf: { $eq: factory.eventType.ScreeningEventSeries }
@@ -559,7 +523,7 @@ class EventSeriesRepo {
     }
     deleteManyByOrganizerId(params) {
         return __awaiter(this, void 0, void 0, function* () {
-            return this.eventModel.deleteMany({
+            return this.eventSeriesModel.deleteMany({
                 'project.id': { $eq: params.project.id },
                 'organizer.id': { $exists: true, $eq: params.organizer.id },
                 typeOf: { $eq: factory.eventType.ScreeningEventSeries }
@@ -569,7 +533,7 @@ class EventSeriesRepo {
     }
     deleteManyByLocationId(params) {
         return __awaiter(this, void 0, void 0, function* () {
-            return this.eventModel.deleteMany({
+            return this.eventSeriesModel.deleteMany({
                 'project.id': { $eq: params.project.id },
                 'location.id': { $exists: true, $eq: params.location.id },
                 typeOf: { $eq: factory.eventType.ScreeningEventSeries }
@@ -583,7 +547,7 @@ class EventSeriesRepo {
     aggregateMaxVersion(params) {
         var _a;
         return __awaiter(this, void 0, void 0, function* () {
-            const aggregations = yield this.eventModel.aggregate([
+            const aggregations = yield this.eventSeriesModel.aggregate([
                 {
                     $match: {
                         typeOf: { $eq: factory.eventType.ScreeningEventSeries },
@@ -614,49 +578,8 @@ class EventSeriesRepo {
             return { maxVersion };
         });
     }
-    // tslint:disable-next-line:prefer-function-over-method
-    sync2secondary(__) {
-        return __awaiter(this, void 0, void 0, function* () {
-            // if (!USE_EVENT_SERIES_SYNC2SECONDARY) {
-            //     return;
-            // }
-            // const doc = await this.eventModel.findOne({
-            //     _id: { $eq: params.id },
-            //     typeOf: { $eq: factory.eventType.ScreeningEventSeries }
-            // })
-            //     .lean()
-            //     .exec();
-            // if (doc !== null) {
-            //     const { _id, ...replacement } = doc;
-            //     // console.log('replacing eventSeries', params.id, 'replacement:', replacement);
-            //     const replaceResult = await this.secondaryEventModel.findOneAndReplace(
-            //         {
-            //             _id: { $eq: params.id },
-            //             typeOf: { $eq: factory.eventType.ScreeningEventSeries }
-            //         },
-            //         replacement,
-            //         {
-            //             upsert: true,
-            //             rawResult: true
-            //         }
-            //     )
-            //         .exec();
-            //     // tslint:disable-next-line:no-console
-            //     console.log('eventSeries', params.id, 'replaced. result:', replaceResult);
-            // } else {
-            //     await this.secondaryEventModel.findOneAndDelete(
-            //         {
-            //             _id: { $eq: params.id },
-            //             typeOf: { $eq: factory.eventType.ScreeningEventSeries }
-            //         },
-            //         { projection: { _id: 1 } }
-            //     )
-            //         .exec();
-            // }
-        });
-    }
     getCursor(conditions, projection) {
-        return this.eventModel.find(conditions, projection)
+        return this.eventSeriesModel.find(conditions, projection)
             .sort({ startDate: factory.sortType.Descending })
             .cursor();
     }

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

@@ -3,7 +3,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.modelName = exports.indexes = exports.createSchema = void 0;
 const mongoose_1 = require("mongoose");
 const writeConcern_1 = require("../writeConcern");
-const factory = require("../../../factory");
 const settings_1 = require("../../../settings");
 const modelName = 'Event';
 exports.modelName = modelName;
@@ -158,43 +157,6 @@ const indexes = [
             }
         }
     ],
-    [
-        { 'workPerformed.identifier': 1, startDate: 1 },
-        {
-            name: 'searchByWorkPerformedIdentifier',
-            partialFilterExpression: {
-                'workPerformed.identifier': { $exists: true }
-            }
-        }
-    ],
-    [
-        { 'workPerformed.version': 1, startDate: 1 },
-        {
-            name: 'searchByWorkPerformedVersion',
-            partialFilterExpression: {
-                'workPerformed.version': { $exists: true }
-            }
-        }
-    ],
-    [
-        // コンテンツ+バージョンに対するuniqueness
-        {
-            'project.id': 1,
-            'location.branchCode': 1,
-            'workPerformed.identifier': 1,
-            'workPerformed.version': 1
-        },
-        {
-            unique: true,
-            name: 'uniqueScreeningEventSeries',
-            partialFilterExpression: {
-                typeOf: factory.eventType.ScreeningEventSeries,
-                'location.branchCode': { $exists: true },
-                'workPerformed.identifier': { $exists: true },
-                'workPerformed.version': { $exists: true }
-            }
-        }
-    ],
     [
         { startDate: 1 },
         { name: 'searchByStartDate' }
@@ -302,24 +264,6 @@ const indexes = [
             }
         }
     ],
-    [
-        { 'videoFormat.typeOf': 1, startDate: 1 },
-        {
-            name: 'searchByVideoFormatTypeOf',
-            partialFilterExpression: {
-                'videoFormat.typeOf': { $exists: true }
-            }
-        }
-    ],
-    [
-        { 'soundFormat.typeOf': 1, startDate: 1 },
-        {
-            name: 'searchBySoundFormatTypeOf',
-            partialFilterExpression: {
-                'soundFormat.typeOf': { $exists: true }
-            }
-        }
-    ],
     [
         { 'name.ja': 1, startDate: 1 },
         {
@@ -338,15 +282,6 @@ const indexes = [
             }
         }
     ],
-    [
-        { kanaName: 1, startDate: 1 },
-        {
-            name: 'searchByKanaName',
-            partialFilterExpression: {
-                kanaName: { $exists: true }
-            }
-        }
-    ],
     [
         { additionalProperty: 1, startDate: 1 },
         {

package/lib/chevre/service/event.js

@@ -651,6 +651,10 @@ function createScreeningEventSeriesFromCOA(params) {
             .toISOString(), contentRating: params.eirinKubuns.filter((kubun) => kubun.kubunCode === params.filmFromCOA.kbnEirin)[0], typeOf: factory.creativeWorkType.Movie }, (typeof params.filmFromCOA.titleBranchNum === 'string' && params.filmFromCOA.titleBranchNum.length > 0)
         ? { version: params.filmFromCOA.titleBranchNum } // add version(2024-01-31~)
         : undefined);
+    // redefine videoFormat(2024-09-18~)
+    // const videoFormat: factory.event.screeningEventSeries.ICOAKubun =
+    //     params.eizouKubuns.filter((kubun) => kubun.kubunCode === params.filmFromCOA.kbnEizou)[0];
+    const videoFormat = params.joueihousikiKubuns.map(({ kubunCode }) => ({ typeOf: kubunCode, name: kubunCode }));
     return {
         project: { typeOf: params.project.typeOf, id: params.project.id },
         typeOf: factory.eventType.ScreeningEventSeries,
@@ -673,7 +677,7 @@ function createScreeningEventSeriesFromCOA(params) {
         },
         // 必須化(2023-07-12~)
         organizer: { id: params.seller.id },
-        videoFormat: params.eizouKubuns.filter((kubun) => kubun.kubunCode === params.filmFromCOA.kbnEizou)[0],
+        videoFormat,
         soundFormat: [],
         workPerformed,
         duration: moment.duration(params.filmFromCOA.showTime, 'm')

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

@@ -139,8 +139,8 @@ function searchEventTicketOffersByEvent(params) {
             const superEvents = yield repos.eventSeries.projectEventSeriesFields({
                 limit: 1,
                 page: 1,
-                id: { $eq: event.superEvent.id },
-                typeOf: factory.eventType.ScreeningEventSeries
+                id: { $eq: event.superEvent.id }
+                // typeOf: factory.eventType.ScreeningEventSeries
             }, ['soundFormat', 'videoFormat']);
             const superEvent = superEvents.shift();
             if (superEvent === undefined) {
@@ -361,8 +361,8 @@ function searchOfferAppliesToMovieTicket(params) {
             const superEvents = yield repos.eventSeries.projectEventSeriesFields({
                 limit: 1,
                 page: 1,
-                id: { $eq: event.superEvent.id },
-                typeOf: factory.eventType.ScreeningEventSeries
+                id: { $eq: event.superEvent.id }
+                // typeOf: factory.eventType.ScreeningEventSeries
             }, ['soundFormat', 'videoFormat']);
             const superEvent = superEvents.shift();
             if (superEvent === undefined) {

package/lib/chevre/service/offer/onEventChanged.js

@@ -50,21 +50,10 @@ function onEventChanged(params) {
                     // no op
                 }
             }
-            // 施設コンテンツsecondaryコレクションへ同期(2024-09-10~)
-            yield syncEventSeries2secondary({
-                ids: params.id
-            })(repos);
         }
     });
 }
 exports.onEventChanged = onEventChanged;
-function syncEventSeries2secondary(params) {
-    return (repos) => __awaiter(this, void 0, void 0, function* () {
-        for (const eventSeriesId of params.ids) {
-            yield repos.eventSeries.sync2secondary({ id: eventSeriesId });
-        }
-    });
-}
 function syncEventSeries2screeningEvents(params) {
     return (repos) => __awaiter(this, void 0, void 0, function* () {
         const now = new Date();
@@ -72,7 +61,7 @@ function syncEventSeries2screeningEvents(params) {
             const superEvents = yield repos.eventSeries.projectEventSeriesFields({
                 limit: 1,
                 page: 1,
-                typeOf: factory.eventType.ScreeningEventSeries,
+                // typeOf: factory.eventType.ScreeningEventSeries,
                 id: { $eq: eventSeriesId },
                 project: { id: { $eq: params.project.id } }
             }, [
@@ -209,8 +198,8 @@ function createInformTasks(params) {
         }
         else {
             const screeningEventSeries4inform = yield repos.eventSeries.projectEventSeriesFields({
-                id: { $in: params.ids },
-                typeOf: params.typeOf
+                id: { $in: params.ids }
+                // typeOf: params.typeOf
             }, [
                 'project', 'organizer', 'typeOf', 'name', 'location', 'videoFormat', 'soundFormat', 'workPerformed', 'kanaName', 'eventStatus',
                 'endDate', 'startDate', 'additionalProperty', 'subtitleLanguage', 'dubLanguage',

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

@@ -40,10 +40,6 @@ function onResourceDeleted(params) {
                         project: { id: params.project.id },
                         ids: params.id
                     })(repos);
-                    // 施設コンテンツsecondaryコレクションへ同期(2024-09-10~)
-                    for (const eventSeriesId of params.id) {
-                        yield repos.eventSeries.sync2secondary({ id: eventSeriesId });
-                    }
                     break;
                 case factory.placeType.ScreeningRoom:
                     yield deleteResourcesByScreeningRoom({

package/lib/chevre/settings.d.ts

@@ -2,12 +2,6 @@ import * as factory from './factory';
 export declare const MONGO_MAX_TIME_MS: number;
 export declare const MONGO_READ_PREFERENCE: string;
 export declare const MONGO_AUTO_INDEX: boolean;
-/**
- * 施設コンテンツのprimaryコレクションとして新スキーマを使用するかどうか
- */
-/**
- * 施設コンテンツのsecondaryコレクションへ同期するかどうか
- */
 /**
  * 施設のprimaryコレクションとして新スキーマを使用するかどうか
  */

package/lib/chevre/settings.js

@@ -9,14 +9,6 @@ exports.MONGO_READ_PREFERENCE = (typeof process.env.MONGO_READ_PREFERENCE === 's
     ? process.env.MONGO_READ_PREFERENCE
     : 'primaryPreferred';
 exports.MONGO_AUTO_INDEX = process.env.MONGO_AUTO_INDEX === '1';
-/**
- * 施設コンテンツのprimaryコレクションとして新スキーマを使用するかどうか
- */
-// export const USE_EVENT_SERIES_NEW_SCHEMA = process.env.USE_EVENT_SERIES_NEW_SCHEMA === '1';
-/**
- * 施設コンテンツのsecondaryコレクションへ同期するかどうか
- */
-// export const USE_EVENT_SERIES_SYNC2SECONDARY = process.env.USE_EVENT_SERIES_SYNC2SECONDARY === '1';
 /**
  * 施設のprimaryコレクションとして新スキーマを使用するかどうか
  */

package/package.json

@@ -9,8 +9,8 @@
     }
   ],
   "dependencies": {
-    "@chevre/factory": "4.383.0",
-    "@cinerino/sdk": "10.9.0",
+    "@chevre/factory": "4.384.0-alpha.0",
+    "@cinerino/sdk": "10.10.0-alpha.0",
     "@motionpicture/coa-service": "9.5.0",
     "@motionpicture/gmo-service": "5.3.0",
     "@sendgrid/mail": "6.4.0",
@@ -110,5 +110,5 @@
     "postversion": "git push origin --tags",
     "prepublishOnly": "npm run clean && npm run build && npm test && npm run doc"
   },
-  "version": "22.3.0-alpha.23"
+  "version": "22.3.0-alpha.25"
 }

package/example/src/chevre/syncEventSeries2secondary.ts

@@ -1,20 +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, { autoIndex: false });
-
-    const eventSeriesRepo = await chevre.repository.EventSeries.createInstance(mongoose.connection);
-
-    await eventSeriesRepo.sync2secondary({
-        id: '7k9ayl8hc'
-    });
-}
-
-main()
-    .then(() => {
-        console.log('success!');
-    })
-    .catch(console.error);