@chevre/domain 22.3.0-alpha.7 → 22.3.0-alpha.9

package/example/src/chevre/aggregateScreeningEventMaxVersion.ts

@@ -8,8 +8,8 @@ const project = { id: String(process.env.PROJECT_ID) };
 async function main() {
     await mongoose.connect(<string>process.env.MONGOLAB_URI, { autoIndex: false });
 
-    const eventRepo = await chevre.repository.Event.createInstance(mongoose.connection);
-    const result = await eventRepo.aggregateScreeningEventMaxVersion(
+    const eventSeriesRepo = await chevre.repository.EventSeries.createInstance(mongoose.connection);
+    const result = await eventSeriesRepo.aggregateMaxVersion(
         {
             project: {
                 id: { $eq: project.id }

package/example/src/chevre/aggregation/createAggregateEventTasks.ts

@@ -15,7 +15,7 @@ async function main() {
     const events = <Pick<
         chevre.factory.event.IEvent<chevre.factory.eventType.ScreeningEvent>,
         'id' | 'typeOf' | 'startDate' | 'project'
-    >[]>await eventRepo.projectFields<chevre.factory.eventType.ScreeningEvent>(
+    >[]>await eventRepo.projectEventFields<chevre.factory.eventType.ScreeningEvent>(
         {
             typeOf: chevre.factory.eventType.ScreeningEvent,
             project: { id: { $eq: PROJECT.id } },

package/example/src/chevre/importEventsFromCOA.ts

@@ -14,6 +14,7 @@ async function main() {
     const categoryCodeRepo = await chevre.repository.CategoryCode.createInstance(mongoose.connection);
     const creativeWorkRepo = await chevre.repository.CreativeWork.createInstance(mongoose.connection);
     const eventRepo = await chevre.repository.Event.createInstance(mongoose.connection);
+    const eventSeriesRepo = await chevre.repository.EventSeries.createInstance(mongoose.connection);
     const screeningRoomRepo = await chevre.repository.place.ScreeningRoom.createInstance(mongoose.connection);
     const movieTheaterRepo = await chevre.repository.place.MovieTheater.createInstance(mongoose.connection);
     const sellerRepo = await chevre.repository.Seller.createInstance(mongoose.connection);
@@ -50,6 +51,7 @@ async function main() {
         categoryCode: categoryCodeRepo,
         creativeWork: creativeWorkRepo,
         event: eventRepo,
+        eventSeries: eventSeriesRepo,
         movieTheater: movieTheaterRepo,
         screeningRoom: screeningRoomRepo,
         seller: sellerRepo,

package/example/src/chevre/unsetUnnecessaryFields.ts

@@ -6,79 +6,22 @@ import { chevre } from '../../../lib/index';
 async function main() {
     await mongoose.connect(<string>process.env.MONGOLAB_URI, { autoIndex: false });
 
-    const accountTitleRepo = await chevre.repository.AccountTitle.createInstance(mongoose.connection);
-    const customerRepo = await chevre.repository.Customer.createInstance(mongoose.connection);
-    const additionalPropertyRepo = await chevre.repository.AdditionalProperty.createInstance(mongoose.connection);
-    const movieTheaterRepo = await chevre.repository.place.MovieTheater.createInstance(mongoose.connection);
-    const productModelRepo = await chevre.repository.ProductModel.createInstance(mongoose.connection);
-    const tripRepo = await chevre.repository.Trip.createInstance(mongoose.connection);
+    const eventRepo = await chevre.repository.Event.createInstance(mongoose.connection);
 
     let updateResult: any;
-    updateResult = await customerRepo.unsetUnnecessaryFields({
+    updateResult = await eventRepo.unsetUnnecessaryFields({
         filter: {
             _id: { $exists: true }
+            // startDate: {
+            //     // $gte: moment()
+            //     //     .add(-48, 'months')
+            //     //     .toDate()
+            //     // $lte: moment()
+            //     //     .add(-1, 'months')
+            //     //     .toDate()
+            // }
         },
-        $unset: {
-            createdAt: 1,
-            updatedAt: 1,
-            __v: 1
-        }
-    });
-    console.log(updateResult);
-
-    updateResult = await accountTitleRepo.unsetUnnecessaryFields({
-        filter: {
-            _id: { $exists: true }
-        },
-        $unset: {
-            createdAt: 1,
-            updatedAt: 1,
-            __v: 1
-        }
-    });
-    console.log(updateResult);
-
-    updateResult = await additionalPropertyRepo.unsetUnnecessaryFields({
-        filter: {
-            _id: { $exists: true }
-        },
-        $unset: {
-            createdAt: 1,
-            updatedAt: 1,
-            __v: 1
-        }
-    });
-    console.log(updateResult);
-
-    updateResult = await movieTheaterRepo.unsetUnnecessaryFields({
-        filter: {
-            _id: { $exists: true }
-        },
-        $unset: {
-            createdAt: 1,
-            updatedAt: 1,
-            __v: 1
-        }
-    });
-    console.log(updateResult);
-
-    updateResult = await productModelRepo.unsetUnnecessaryFields({
-        filter: {
-            _id: { $exists: true }
-        },
-        $unset: {
-            createdAt: 1,
-            updatedAt: 1,
-            __v: 1
-        }
-    });
-    console.log(updateResult);
-
-    updateResult = await tripRepo.unsetUnnecessaryFields({
-        filter: {
-            _id: { $exists: true }
-        },
-        $unset: {
+        $unset: <any>{
             createdAt: 1,
             updatedAt: 1,
             __v: 1

package/example/src/chevre/upsertScreeningEventSeriesByVersion.ts

@@ -10,9 +10,9 @@ const PROJECT_ID = String(process.env.PROJECT_ID);
 async function main() {
     await mongoose.connect(<string>process.env.MONGOLAB_URI, { autoIndex: false });
 
-    const eventRepo = await chevre.repository.Event.createInstance(mongoose.connection);
+    const eventSeriesRepo = await chevre.repository.EventSeries.createInstance(mongoose.connection);
 
-    const result = await eventRepo.upsertScreeningEventSeriesByVersion(
+    const result = await eventSeriesRepo.upsertByVersion(
         [
             {
                 $set: {

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

@@ -26,8 +26,8 @@ import type { BulkWriteResult } from 'mongodb';
 import type { Connection, Document, FilterQuery } from 'mongoose';
 import * as factory from '../factory';
 import * as EventFactory from '../factory/event';
-import { IDocType } from './mongoose/schemas/event';
-export interface IAttributes4patchUpdate<T extends factory.eventType> {
+type AvailableEventType = factory.eventType.Event | factory.eventType.ScreeningEvent;
+export interface IAttributes4patchUpdate<T extends AvailableEventType> {
     typeOf: T;
     eventStatus?: factory.eventStatusType;
 }
@@ -46,7 +46,7 @@ export interface IUpdateAggregateReservationParams {
         remainingAttendeeCapacity?: '';
     };
 }
-export type ISearchConditions<T extends factory.eventType> = factory.event.ISearchConditions<T>;
+export type ISearchConditions<T extends AvailableEventType> = factory.event.ISearchConditions<T>;
 interface IAggregationByStatus {
     eventCount: number;
     reservationCount: number;
@@ -69,13 +69,13 @@ interface IAggregateEvent {
     statuses: IStatus[];
 }
 export import IMinimizedIndividualEvent = EventFactory.IMinimizedIndividualEvent;
-type IKeyOfProjection<T extends factory.eventType> = Exclude<keyof factory.event.IEvent<T>, 'id'> | 'aggregateEntranceGate' | 'aggregateOffer' | 'superEvent.location.id' | 'offers.itemOffered';
+type IKeyOfProjection<T extends AvailableEventType> = Exclude<keyof factory.event.IEvent<T>, 'id'> | 'aggregateEntranceGate' | 'aggregateOffer' | 'superEvent.location.id' | 'offers.itemOffered';
 /**
  * minimizedEvent検索時のprojection候補
  * add(2024-07-18~)
  */
-type IKeyOfProjection4minimizedEvent<T extends factory.eventType> = T extends factory.eventType.ScreeningEvent ? Exclude<keyof IMinimizedIndividualEvent<T>, 'additionalProperty' | 'id'> | 'superEvent.id' | 'location.branchCode' | 'superEvent.workPerformed.identifier' | 'superEvent.location.id' | 'offers.itemOffered' | 'offers.itemOffered.id' | 'offers.offeredThrough' | 'offers.unacceptedPaymentMethod' | 'offers.eligibleQuantity' : T extends factory.eventType.Event ? Exclude<keyof IMinimizedIndividualEvent<T>, 'additionalProperty' | 'id'> | 'superEvent.id' | 'location.branchCode' | 'superEvent.workPerformed.identifier' | 'superEvent.location.id' | 'offers.itemOffered' | 'offers.itemOffered.id' | 'offers.offeredThrough' | 'offers.unacceptedPaymentMethod' | 'offers.eligibleQuantity' : never;
-type IUnset<T extends factory.eventType> = {
+type IKeyOfProjection4minimizedEvent<T extends AvailableEventType> = T extends factory.eventType.ScreeningEvent ? Exclude<keyof IMinimizedIndividualEvent<T>, 'additionalProperty' | 'id'> | 'superEvent.id' | 'location.branchCode' | 'superEvent.workPerformed.identifier' | 'superEvent.location.id' | 'offers.itemOffered' | 'offers.itemOffered.id' | 'offers.offeredThrough' | 'offers.unacceptedPaymentMethod' | 'offers.eligibleQuantity' : T extends factory.eventType.Event ? Exclude<keyof IMinimizedIndividualEvent<T>, 'additionalProperty' | 'id'> | 'superEvent.id' | 'location.branchCode' | 'superEvent.workPerformed.identifier' | 'superEvent.location.id' | 'offers.itemOffered' | 'offers.itemOffered.id' | 'offers.offeredThrough' | 'offers.unacceptedPaymentMethod' | 'offers.eligibleQuantity' : never;
+type IUnset<T extends AvailableEventType> = {
     [key in keyof factory.event.IEvent<T>]?: 1;
 };
 /**
@@ -84,11 +84,11 @@ type IUnset<T extends factory.eventType> = {
 export declare class EventRepo {
     private readonly eventModel;
     constructor(connection: Connection);
-    static CREATE_MONGO_CONDITIONS<T extends factory.eventType>(conditions: ISearchConditions<T>): FilterQuery<factory.event.IEvent<T>>[];
+    static CREATE_MONGO_CONDITIONS<T extends AvailableEventType>(conditions: ISearchConditions<T>): FilterQuery<factory.event.IEvent<T>>[];
     /**
      * 複数イベントを作成する
      */
-    createMany<T extends factory.eventType>(params: {
+    createManyEvents<T extends AvailableEventType>(params: {
         attributes: factory.event.IAttributes<T>[];
         expectsNoContent: boolean;
     }): Promise<string[] | void>;
@@ -96,7 +96,7 @@ export declare class EventRepo {
      * 特定の追加特性をキーにして、存在しなければ作成する(複数対応)
      * 存在すれば、eventStatusのみ更新する
      */
-    createManyIfNotExist<T extends factory.eventType>(params: {
+    createManyIfNotExist<T extends AvailableEventType>(params: {
         attributes: factory.event.IAttributes<T>;
         filter: {
             name: string;
@@ -107,28 +107,10 @@ export declare class EventRepo {
             id: string;
         }[];
     } | void>;
-    /**
-     * コンテンツ+バージョンをキーにして、なければ作成する(複数対応)
-     */
-    createScreeningEventSeriesIfNotExistByWorkPerformed(params: {
-        attributes: factory.event.IAttributes<factory.eventType.ScreeningEventSeries>;
-    }[]): Promise<BulkWriteResult | void>;
-    /**
-     * コンテンツ+バージョンをキーにして冪等置換
-     */
-    upsertScreeningEventSeriesByVersion(params: {
-        $set: factory.event.IAttributes<factory.eventType.ScreeningEventSeries>;
-        $unset?: IUnset<factory.eventType.ScreeningEventSeries>;
-    }[]): Promise<{
-        bulkWriteResult4insert: BulkWriteResult;
-        modifiedEvents: {
-            id: string;
-        }[];
-    } | void>;
     /**
      * イベント部分更新
      */
-    updatePartiallyById<T extends factory.eventType>(params: {
+    updatePartiallyById<T extends AvailableEventType>(params: {
         project: {
             id: string;
         };
@@ -138,7 +120,7 @@ export declare class EventRepo {
     /**
      * イベントを保管する
      */
-    save<T extends factory.eventType>(params: {
+    saveEvent<T extends AvailableEventType>(params: {
         id?: string;
         attributes: factory.event.IAttributes<T>;
         /**
@@ -149,7 +131,7 @@ export declare class EventRepo {
     }): Promise<{
         id: string;
     }>;
-    saveMany<T extends factory.eventType>(params: {
+    saveManyEvents<T extends AvailableEventType>(params: {
         id: string;
         attributes: factory.event.IAttributes<T>;
         $unset?: IUnset<T>;
@@ -164,12 +146,12 @@ export declare class EventRepo {
     /**
      * イベントを検索する(inclusion projection)
      */
-    projectFields<T extends factory.eventType>(params: ISearchConditions<T>, inclusion: IKeyOfProjection<T>[]): Promise<Omit<factory.event.IEvent<T>, 'aggregateEntranceGate' | 'aggregateOffer'>[]>;
+    projectEventFields<T extends AvailableEventType>(params: ISearchConditions<T>, inclusion: IKeyOfProjection<T>[]): Promise<Omit<factory.event.IEvent<T>, 'aggregateEntranceGate' | 'aggregateOffer'>[]>;
     /**
      * IDのみで検索する
      * projectionなし
      */
-    findAnyEventById<T extends factory.eventType>(params: {
+    findAnyEventById<T extends AvailableEventType>(params: {
         id: {
             $eq: string;
         };
@@ -184,18 +166,18 @@ export declare class EventRepo {
             };
         };
     }): Promise<Omit<factory.event.IEvent<T>, 'aggregateEntranceGate' | 'aggregateOffer'>>;
-    searchIds<T extends factory.eventType>(params: ISearchConditions<T>): Promise<string[]>;
+    searchEventIds<T extends AvailableEventType>(params: ISearchConditions<T>): Promise<string[]>;
     /**
      * 特定イベントから指定フィールドのみ取得する
      * イベント IDは必ず返ります
      */
-    projectFieldsById<T extends factory.eventType.ScreeningEvent | factory.eventType.Event>(params: {
+    projectEventFieldsById<T extends AvailableEventType>(params: {
         id: string;
     }, inclusion: IKeyOfProjection4minimizedEvent<T>[]): Promise<IMinimizedIndividualEvent<T>>;
     /**
      * イベントをキャンセルする
      */
-    cancel(params: {
+    cancelEvent(params: {
         project: {
             id: string;
         };
@@ -208,23 +190,18 @@ export declare class EventRepo {
         project: {
             id: string;
         };
-        superEvent: {
-            /**
-             * 施設コンテンツID
-             */
-            id: string;
-        };
+        superEventFromDB: Pick<factory.event.screeningEventSeries.IEvent, 'additionalProperty' | 'alternativeHeadline' | 'description' | 'dubLanguage' | 'endDate' | 'headline' | 'id' | 'kanaName' | 'location' | 'name' | 'soundFormat' | 'startDate' | 'subtitleLanguage' | 'typeOf' | 'videoFormat' | 'workPerformed'>;
         startDate: {
             $gte: Date;
         };
     }): Promise<void>;
-    deleteById(params: {
+    deleteEventById(params: {
         project: {
             id: string;
         };
         id: string;
     }): Promise<void>;
-    deleteManyByOrganizerId(params: {
+    deleteManyEventByOrganizerId(params: {
         project: {
             id: string;
         };
@@ -232,15 +209,7 @@ export declare class EventRepo {
             id: string;
         };
     }): Promise<import("mongodb").DeleteResult>;
-    deleteManyByLocationId(params: {
-        project: {
-            id: string;
-        };
-        location: {
-            id: string;
-        };
-    }): Promise<import("mongodb").DeleteResult>;
-    deleteManyByScreeningRoom(params: {
+    deleteManyEventsByScreeningRoom(params: {
         project: {
             id: string;
         };
@@ -278,7 +247,7 @@ export declare class EventRepo {
     /**
      * 興行(プロダクト)から削除する
      */
-    deleteManyByItemOfferedId(params: {
+    deleteManyEventsByItemOfferedId(params: {
         project: {
             id: string;
         };
@@ -290,21 +259,9 @@ export declare class EventRepo {
             };
         };
     }): Promise<import("mongodb").DeleteResult>;
-    deleteManyEndedByIds(params: {
-        typeOf: {
-            $in: factory.eventType[];
-        };
-        project: {
-            id: string;
-        };
-        ids: string[];
-        endDate: {
-            $lte: Date;
-        };
-    }): Promise<import("mongodb").DeleteResult>;
-    deleteManyEndedByProject(params: {
+    deleteManyEventsEndedByProject(params: {
         typeOf: {
-            $in: factory.eventType[];
+            $in: AvailableEventType[];
         };
         project: {
             id: string;
@@ -313,9 +270,9 @@ export declare class EventRepo {
             $lte: Date;
         };
     }): Promise<import("mongodb").DeleteResult>;
-    deleteManyEnded(params: {
+    deleteManyEventsEnded(params: {
         typeOf: {
-            $eq: factory.eventType;
+            $eq: AvailableEventType;
         };
         endDate: {
             $lte: Date;
@@ -337,51 +294,33 @@ export declare class EventRepo {
             validationErrors: import("mongoose").Error[];
         } | undefined;
     }>;
-    getCursor(conditions: FilterQuery<any>, projection: any): import("mongoose").Cursor<Document<unknown, {}, IDocType> & Omit<(import("@chevre/factory/lib/event/anyEvent").IAttributes & {
+    getCursor(conditions: FilterQuery<any>, projection: any): import("mongoose").Cursor<Document<unknown, {}, import("./mongoose/schemas/event").IDocType> & Omit<(import("@chevre/factory/lib/event/anyEvent").IAttributes & {
         _id: string;
     } & Required<{
-        /**
-         * イベントリポジトリ
-         */
         _id: string;
     }>) | (import("@chevre/factory/lib/event/screeningEvent").IAttributes & {
         _id: string;
         alternateName?: any;
         aggregateOffer?: import("@chevre/factory/lib/event/anyEvent").IAggregateOffer | undefined;
     } & Required<{
-        /**
-         * イベントリポジトリ
-         */
         _id: string;
     }>) | (import("@chevre/factory/lib/event/screeningEventSeries").IAttributes & {
         _id: string;
     } & Required<{
-        /**
-         * イベントリポジトリ
-         */
         _id: string;
-    }>), never>, import("mongoose").QueryOptions<Document<unknown, {}, IDocType> & Omit<(import("@chevre/factory/lib/event/anyEvent").IAttributes & {
+    }>), never>, import("mongoose").QueryOptions<Document<unknown, {}, import("./mongoose/schemas/event").IDocType> & Omit<(import("@chevre/factory/lib/event/anyEvent").IAttributes & {
         _id: string;
     } & Required<{
-        /**
-         * イベントリポジトリ
-         */
         _id: string;
     }>) | (import("@chevre/factory/lib/event/screeningEvent").IAttributes & {
         _id: string;
         alternateName?: any;
         aggregateOffer?: import("@chevre/factory/lib/event/anyEvent").IAggregateOffer | undefined;
     } & Required<{
-        /**
-         * イベントリポジトリ
-         */
         _id: string;
     }>) | (import("@chevre/factory/lib/event/screeningEventSeries").IAttributes & {
         _id: string;
     } & Required<{
-        /**
-         * イベントリポジトリ
-         */
         _id: string;
     }>), never>>>;
     addAvailableAtOrFrom(params: {
@@ -392,44 +331,10 @@ export declare class EventRepo {
             };
         };
     }): Promise<void>;
-    deleteAvailableAtOrFrom(params: {
-        id: string;
-        offers: {
-            seller: {
-                makesOffer: {
-                    availableAtOrFrom: {
-                        id: string;
-                    };
-                };
-            };
-        };
-    }): Promise<void>;
-    unsetUnnecessaryFields<T extends factory.eventType>(params: {
+    unsetUnnecessaryFields<T extends AvailableEventType>(params: {
         filter: FilterQuery<factory.event.IEvent<T>>;
         $unset: IUnset<T>;
     }): Promise<import("mongodb").UpdateResult>;
-    /**
-     * 既存施設コンテンツの最大バージョンを集計する
-     */
-    aggregateScreeningEventMaxVersion(params: {
-        project: {
-            id: {
-                $eq: string;
-            };
-        };
-        workPerformed: {
-            identifier: {
-                $eq: string;
-            };
-        };
-        location: {
-            branchCode: {
-                $in: string[];
-            };
-        };
-    }): Promise<{
-        maxVersion: string;
-    }>;
     aggregateEvent(params: {
         project?: {
             id?: {
@@ -438,7 +343,7 @@ export declare class EventRepo {
         };
         startFrom: Date;
         startThrough: Date;
-        typeOf: factory.eventType;
+        typeOf: AvailableEventType;
     }): Promise<IAggregateEvent>;
     private agggregateByStatus;
 }