@chevre/domain 22.14.0-alpha.8 → 23.0.0-alpha.0

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

@@ -2,16 +2,14 @@ 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';
-type AvailableEventType = factory.eventType.Event | factory.eventType.ScreeningEvent;
-export interface IAttributes4patchUpdate<T extends AvailableEventType> {
-    typeOf: T;
+export interface IAttributes4patchUpdate {
+    typeOf: factory.eventType.ScreeningEvent;
     eventStatus?: factory.eventStatusType;
 }
 export interface IUpdateAggregateReservationParams {
     $set: {
-        aggregateReservation: factory.event.event.IAggregateReservation;
-        aggregateOffer?: Pick<factory.event.event.IAggregateOffer, 'aggregateDate' | 'offerCount' | 'typeOf'>;
+        aggregateReservation: factory.event.screeningEvent.IAggregateReservation;
+        aggregateOffer?: Pick<factory.event.screeningEvent.IAggregateOffer, 'aggregateDate' | 'offerCount' | 'typeOf'>;
         maximumAttendeeCapacity?: number;
         remainingAttendeeCapacity?: number;
         checkInCount?: number;
@@ -23,7 +21,7 @@ export interface IUpdateAggregateReservationParams {
         remainingAttendeeCapacity?: '';
     };
 }
-export type ISearchConditions<T extends AvailableEventType> = factory.event.ISearchConditions<T>;
+export type ISearchConditions = factory.event.ISearchConditions<factory.eventType.ScreeningEvent>;
 interface IAggregationByStatus {
     eventCount: number;
     reservationCount: number;
@@ -46,15 +44,15 @@ interface IAggregateEvent {
     statuses: IStatus[];
 }
 export import IMinimizedIndividualEvent = EventFactory.IMinimizedIndividualEvent;
-type IKeyOfProjection<T extends AvailableEventType> = Exclude<keyof factory.event.IEvent<T>, 'id'> | 'aggregateOffer' | 'superEvent.location.id' | 'offers.itemOffered' | 'offers.itemOffered.id';
-type IKeyOfProjection4publicFields<T extends AvailableEventType> = Exclude<keyof factory.event.IEvent<T>, 'id' | 'offers'>;
+type IKeyOfProjection = Exclude<keyof factory.event.IEvent<factory.eventType.ScreeningEvent>, 'id'> | 'aggregateOffer' | 'superEvent.location.id' | 'offers.itemOffered' | 'offers.itemOffered.id';
+type IKeyOfProjection4publicFields = Exclude<keyof factory.event.IEvent<factory.eventType.ScreeningEvent>, 'id' | 'offers'>;
 /**
  * minimizedEvent検索時のprojection候補
  * add(2024-07-18~)
  */
-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;
+type IKeyOfProjection4minimizedEvent = Exclude<keyof IMinimizedIndividualEvent, 'additionalProperty' | 'id'> | 'superEvent.id' | 'location.branchCode' | 'superEvent.workPerformed.identifier' | 'superEvent.location.id' | 'offers.itemOffered' | 'offers.itemOffered.id' | 'offers.offeredThrough' | 'offers.unacceptedPaymentMethod' | 'offers.eligibleQuantity';
+type IUnset = {
+    [key in keyof factory.event.IEvent<factory.eventType.ScreeningEvent>]?: 1;
 };
 export type ICreatingEvent4ttts = Pick<factory.event.IAttributes<factory.eventType.ScreeningEvent>, 'additionalProperty' | 'doorTime' | 'endDate' | 'eventStatus' | 'location' | 'name' | 'offers' | 'organizer' | 'project' | 'startDate' | 'superEvent' | 'typeOf'> & {
     identifier: string;
@@ -65,12 +63,12 @@ export type ICreatingEvent4ttts = Pick<factory.event.IAttributes<factory.eventTy
 export declare class EventRepo {
     private readonly eventModel;
     constructor(connection: Connection);
-    static CREATE_MONGO_CONDITIONS<T extends AvailableEventType>(conditions: ISearchConditions<T>): FilterQuery<factory.event.IEvent<T>>[];
+    static CREATE_MONGO_CONDITIONS(conditions: ISearchConditions): FilterQuery<factory.event.IEvent<factory.eventType.ScreeningEvent>>[];
     /**
      * 複数イベントを作成する
      */
-    createManyEvents<T extends AvailableEventType>(params: {
-        attributes: factory.event.IAttributes<T>[];
+    createManyEvents(params: {
+        attributes: factory.event.IAttributes<factory.eventType.ScreeningEvent>[];
         expectsNoContent: boolean;
     }): Promise<string[] | void>;
     /**
@@ -114,7 +112,7 @@ export declare class EventRepo {
         $set: factory.event.screeningEvent.IAttributes & {
             id?: never;
         };
-        $unset: IUnset<factory.eventType.ScreeningEvent>;
+        $unset: IUnset;
     }[], options: {
         /**
          * falseの場合setOnInsertのみ
@@ -130,23 +128,23 @@ export declare class EventRepo {
     /**
      * イベント部分更新
      */
-    updatePartiallyById<T extends AvailableEventType>(params: {
+    updatePartiallyById(params: {
         project: {
             id: string;
         };
         id: string;
-        attributes: IAttributes4patchUpdate<T>;
+        attributes: IAttributes4patchUpdate;
     }): Promise<void>;
     /**
      * イベントを保管する
      */
-    saveEvent<T extends AvailableEventType>(params: {
+    saveEvent(params: {
         id?: string;
-        attributes: factory.event.IAttributes<T>;
+        attributes: factory.event.IAttributes<factory.eventType.ScreeningEvent>;
         /**
          * ドキュメント作成時には無視される
          */
-        $unset?: IUnset<T>;
+        $unset?: IUnset;
         upsert: false;
     }): Promise<{
         id: string;
@@ -157,7 +155,7 @@ export declare class EventRepo {
     saveManyEvents(params: {
         id: string;
         attributes: factory.event.IAttributes<factory.eventType.ScreeningEvent>;
-        $unset?: IUnset<factory.eventType.ScreeningEvent>;
+        $unset?: IUnset;
         upsert: boolean;
     }[]): Promise<void>;
     /**
@@ -171,11 +169,11 @@ export declare class EventRepo {
     /**
      * イベントを検索する(inclusion projection)
      */
-    projectEventFields<T extends AvailableEventType>(params: ISearchConditions<T>, inclusion: IKeyOfProjection<T>[]): Promise<Omit<factory.event.IEvent<T>, 'aggregateOffer'>[]>;
+    projectEventFields(params: ISearchConditions, inclusion: IKeyOfProjection[]): Promise<Omit<factory.event.IEvent<factory.eventType.ScreeningEvent>, 'aggregateOffer'>[]>;
     /**
      * apiで公開属性を検索する(2024-10-13~)
      */
-    aggregatePublicFields<T extends AvailableEventType>(params: ISearchConditions<T>, inclusion: IKeyOfProjection4publicFields<T>[], options: {
+    aggregatePublicFields(params: ISearchConditions, inclusion: IKeyOfProjection4publicFields[], options: {
         /**
          * offersを属性をprojectするかどうか
          */
@@ -188,12 +186,12 @@ export declare class EventRepo {
          * offers.seller.makesOfferをavailableAtOrFromでfilterする
          */
         sellerMakesOfferAvailableAtIn?: string[];
-    }): Promise<Omit<factory.event.IEvent<T>, 'aggregateOffer'>[]>;
+    }): Promise<Omit<factory.event.IEvent<factory.eventType.ScreeningEvent>, 'aggregateOffer'>[]>;
     /**
      * IDのみで検索する
      * projectionなし
      */
-    findAnyEventById<T extends AvailableEventType>(params: {
+    findAnyEventById(params: {
         id: {
             $eq: string;
         };
@@ -207,15 +205,15 @@ export declare class EventRepo {
                 $eq: string;
             };
         };
-    }): Promise<Omit<factory.event.IEvent<T>, 'aggregateOffer'>>;
-    searchEventIds<T extends AvailableEventType>(params: ISearchConditions<T>): Promise<string[]>;
+    }): Promise<Omit<factory.event.IEvent<factory.eventType.ScreeningEvent>, 'aggregateOffer'>>;
+    searchEventIds(params: ISearchConditions): Promise<string[]>;
     /**
      * 特定イベントから指定フィールドのみ取得する
      * イベント IDは必ず返ります
      */
-    projectEventFieldsById<T extends AvailableEventType>(params: {
+    projectEventFieldsById(params: {
         id: string;
-    }, inclusion: IKeyOfProjection4minimizedEvent<T>[]): Promise<IMinimizedIndividualEvent<T>>;
+    }, inclusion: IKeyOfProjection4minimizedEvent[]): Promise<IMinimizedIndividualEvent>;
     /**
      * イベントをキャンセルする
      */
@@ -232,7 +230,7 @@ export declare class EventRepo {
         project: {
             id: string;
         };
-        superEventFromDB: Pick<factory.event.screeningEventSeries.IEvent, 'additionalProperty' | 'alternativeHeadline' | 'description' | 'dubLanguage' | 'endDate' | 'headline' | 'id' | 'kanaName' | 'location' | 'name' | 'soundFormat' | 'startDate' | 'subtitleLanguage' | 'typeOf' | 'videoFormat' | 'workPerformed'>;
+        superEventFromDB: Pick<factory.eventSeries.IEvent, 'additionalProperty' | 'alternativeHeadline' | 'description' | 'dubLanguage' | 'endDate' | 'headline' | 'id' | 'kanaName' | 'location' | 'name' | 'soundFormat' | 'startDate' | 'subtitleLanguage' | 'typeOf' | 'videoFormat' | 'workPerformed'>;
         startDate: {
             $gte: Date;
         };
@@ -303,7 +301,7 @@ export declare class EventRepo {
     }): Promise<import("mongodb").DeleteResult>;
     deleteManyEventsEndedByProject(params: {
         typeOf: {
-            $in: AvailableEventType[];
+            $in: factory.eventType.ScreeningEvent[];
         };
         project: {
             id: string;
@@ -314,7 +312,7 @@ export declare class EventRepo {
     }): Promise<import("mongodb").DeleteResult>;
     deleteManyEventsEnded(params: {
         typeOf: {
-            $eq: AvailableEventType;
+            $eq: factory.eventType.ScreeningEvent;
         };
         endDate: {
             $lte: Date;
@@ -336,25 +334,23 @@ export declare class EventRepo {
             validationErrors: import("mongoose").Error[];
         } | undefined;
     }>;
-    getCursor(conditions: FilterQuery<any>, projection: any): import("mongoose").Cursor<Document<unknown, {}, IDocType> & ((import("@chevre/factory/lib/event/anyEvent").IAttributes & {
-        _id: string;
-    } & Required<{
+    getCursor(conditions: FilterQuery<any>, projection: any): import("mongoose").Cursor<Document<unknown, {}, import("@chevre/factory/lib/event/screeningEvent").IAttributes & {
         _id: string;
-    }>) | (import("@chevre/factory/lib/event/screeningEvent").IAttributes & {
+        aggregateOffer?: factory.event.screeningEvent.IAggregateOffer;
+    }> & import("@chevre/factory/lib/event/screeningEvent").IAttributes & {
         _id: string;
-        aggregateOffer?: factory.event.event.IAggregateOffer;
+        aggregateOffer?: factory.event.screeningEvent.IAggregateOffer;
     } & Required<{
         _id: string;
-    }>)), import("mongoose").QueryOptions<Document<unknown, {}, IDocType> & ((import("@chevre/factory/lib/event/anyEvent").IAttributes & {
-        _id: string;
-    } & Required<{
+    }>, import("mongoose").QueryOptions<Document<unknown, {}, import("@chevre/factory/lib/event/screeningEvent").IAttributes & {
         _id: string;
-    }>) | (import("@chevre/factory/lib/event/screeningEvent").IAttributes & {
+        aggregateOffer?: factory.event.screeningEvent.IAggregateOffer;
+    }> & import("@chevre/factory/lib/event/screeningEvent").IAttributes & {
         _id: string;
-        aggregateOffer?: factory.event.event.IAggregateOffer;
+        aggregateOffer?: factory.event.screeningEvent.IAggregateOffer;
     } & Required<{
         _id: string;
-    }>))>>;
+    }>>>;
     addAvailableAtOrFrom(params: {
         id: string;
         offers: {
@@ -363,9 +359,9 @@ export declare class EventRepo {
             };
         };
     }): Promise<void>;
-    unsetUnnecessaryFields<T extends AvailableEventType>(params: {
-        filter: FilterQuery<factory.event.IEvent<T>>;
-        $unset: IUnset<T>;
+    unsetUnnecessaryFields(params: {
+        filter: FilterQuery<factory.event.IEvent<factory.eventType.ScreeningEvent>>;
+        $unset: IUnset;
     }): Promise<import("mongoose").UpdateWriteOpResult>;
     aggregateEvent(params: {
         project?: {
@@ -375,7 +371,7 @@ export declare class EventRepo {
         };
         startFrom: Date;
         startThrough: Date;
-        typeOf: AvailableEventType;
+        typeOf: factory.eventType.ScreeningEvent;
     }): Promise<IAggregateEvent>;
     private agggregateByStatus;
 }

package/lib/chevre/repo/event.js

@@ -43,7 +43,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;
+        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;
         const andConditions = [];
         const typeOfEq = conditions.typeOf;
         if (typeof typeOfEq === 'string') {
@@ -145,98 +145,6 @@ class EventRepo {
         }
         let params;
         switch (conditions.typeOf) {
-            case factory.eventType.Event:
-                params = conditions;
-                // tslint:disable-next-line:no-single-line-block-comment
-                /* istanbul ignore else */
-                if (params.offers !== undefined) {
-                    const itemOfferedIdIn4event = (_o = (_m = params.offers.itemOffered) === null || _m === void 0 ? void 0 : _m.id) === null || _o === void 0 ? void 0 : _o.$in;
-                    if (Array.isArray(itemOfferedIdIn4event)) {
-                        andConditions.push({
-                            'offers.itemOffered.id': {
-                                $exists: true,
-                                $in: itemOfferedIdIn4event
-                            }
-                        });
-                    }
-                    // tslint:disable-next-line:no-single-line-block-comment
-                    /* istanbul ignore else */
-                    if (params.offers.itemOffered !== undefined) {
-                        // tslint:disable-next-line:no-single-line-block-comment
-                        /* istanbul ignore else */
-                        if (params.offers.itemOffered.serviceOutput !== undefined) {
-                            // tslint:disable-next-line:no-single-line-block-comment
-                            /* istanbul ignore else */
-                            if (params.offers.itemOffered.serviceOutput.reservedTicket !== undefined) {
-                                // tslint:disable-next-line:no-single-line-block-comment
-                                /* istanbul ignore else */
-                                if (params.offers.itemOffered.serviceOutput.reservedTicket.ticketedSeat !== undefined) {
-                                    // tslint:disable-next-line:no-single-line-block-comment
-                                    /* istanbul ignore else */
-                                    if (Array.isArray(params.offers.itemOffered.serviceOutput.reservedTicket.ticketedSeat.typeOfs)) {
-                                        andConditions.push({
-                                            'offers.itemOffered.serviceOutput.reservedTicket.ticketedSeat.typeOf': {
-                                                $exists: true,
-                                                $in: params.offers.itemOffered.serviceOutput.reservedTicket.ticketedSeat.typeOfs
-                                            }
-                                        });
-                                    }
-                                }
-                            }
-                        }
-                        // tslint:disable-next-line:no-single-line-block-comment
-                        /* istanbul ignore else */
-                        if (params.offers.itemOffered.serviceType !== undefined) {
-                            // tslint:disable-next-line:no-single-line-block-comment
-                            /* istanbul ignore else */
-                            if (Array.isArray(params.offers.itemOffered.serviceType.ids)) {
-                                andConditions.push({
-                                    'offers.itemOffered.serviceType.id': {
-                                        $exists: true,
-                                        $in: params.offers.itemOffered.serviceType.ids
-                                    }
-                                });
-                            }
-                        }
-                    }
-                }
-                const sellerMakesOfferElemMatch4event = (_r = (_q = (_p = params.offers) === null || _p === void 0 ? void 0 : _p.seller) === null || _q === void 0 ? void 0 : _q.makesOffer) === null || _r === void 0 ? void 0 : _r.$elemMatch;
-                if (typeof ((_s = sellerMakesOfferElemMatch4event === null || sellerMakesOfferElemMatch4event === void 0 ? void 0 : sellerMakesOfferElemMatch4event['availableAtOrFrom.id']) === null || _s === void 0 ? void 0 : _s.$eq) === 'string') {
-                    andConditions.push({
-                        'offers.seller.makesOffer': {
-                            $exists: true,
-                            $elemMatch: sellerMakesOfferElemMatch4event
-                        }
-                    });
-                }
-                const reservationForIdentifierEq = (_x = (_w = (_v = (_u = (_t = params.offers) === null || _t === void 0 ? void 0 : _t.itemOffered) === null || _u === void 0 ? void 0 : _u.serviceOutput) === null || _v === void 0 ? void 0 : _v.reservationFor) === null || _w === void 0 ? void 0 : _w.identifier) === null || _x === void 0 ? void 0 : _x.$eq;
-                if (typeof reservationForIdentifierEq === 'string') {
-                    andConditions.push({
-                        'offers.itemOffered.serviceOutput.reservationFor.identifier': {
-                            $exists: true,
-                            $eq: reservationForIdentifierEq
-                        }
-                    });
-                }
-                const reservationForArrivalBusStopBranchCodeEq = (_3 = (_2 = (_1 = (_0 = (_z = (_y = params.offers) === null || _y === void 0 ? void 0 : _y.itemOffered) === null || _z === void 0 ? void 0 : _z.serviceOutput) === null || _0 === void 0 ? void 0 : _0.reservationFor) === null || _1 === void 0 ? void 0 : _1.arrivalBusStop) === null || _2 === void 0 ? void 0 : _2.branchCode) === null || _3 === void 0 ? void 0 : _3.$eq;
-                if (typeof reservationForArrivalBusStopBranchCodeEq === 'string') {
-                    andConditions.push({
-                        'offers.itemOffered.serviceOutput.reservationFor.arrivalBusStop.branchCode': {
-                            $exists: true,
-                            $eq: reservationForArrivalBusStopBranchCodeEq
-                        }
-                    });
-                }
-                const reservationForDepartureBusStopBranchCodeEq = (_9 = (_8 = (_7 = (_6 = (_5 = (_4 = params.offers) === null || _4 === void 0 ? void 0 : _4.itemOffered) === null || _5 === void 0 ? void 0 : _5.serviceOutput) === null || _6 === void 0 ? void 0 : _6.reservationFor) === null || _7 === void 0 ? void 0 : _7.departureBusStop) === null || _8 === void 0 ? void 0 : _8.branchCode) === null || _9 === void 0 ? void 0 : _9.$eq;
-                if (typeof reservationForDepartureBusStopBranchCodeEq === 'string') {
-                    andConditions.push({
-                        'offers.itemOffered.serviceOutput.reservationFor.departureBusStop.branchCode': {
-                            $exists: true,
-                            $eq: reservationForDepartureBusStopBranchCodeEq
-                        }
-                    });
-                }
-                break;
             case factory.eventType.ScreeningEvent:
                 params = conditions;
                 // tslint:disable-next-line:no-single-line-block-comment
@@ -261,7 +169,7 @@ class EventRepo {
                 }
                 // tslint:disable-next-line:no-single-line-block-comment
                 /* istanbul ignore else */
-                const superEventLocationIdEq = (_12 = (_11 = (_10 = params.superEvent) === null || _10 === void 0 ? void 0 : _10.location) === null || _11 === void 0 ? void 0 : _11.id) === null || _12 === void 0 ? void 0 : _12.$eq;
+                const superEventLocationIdEq = (_p = (_o = (_m = params.superEvent) === null || _m === void 0 ? void 0 : _m.location) === null || _o === void 0 ? void 0 : _o.id) === null || _p === void 0 ? void 0 : _p.$eq;
                 if (typeof superEventLocationIdEq === 'string') {
                     andConditions.push({
                         'superEvent.location.id': {
@@ -304,7 +212,7 @@ class EventRepo {
                         });
                     }
                 }
-                const itemOfferedIdIn = (_15 = (_14 = (_13 = params.offers) === null || _13 === void 0 ? void 0 : _13.itemOffered) === null || _14 === void 0 ? void 0 : _14.id) === null || _15 === void 0 ? void 0 : _15.$in;
+                const itemOfferedIdIn = (_s = (_r = (_q = params.offers) === null || _q === void 0 ? void 0 : _q.itemOffered) === null || _r === void 0 ? void 0 : _r.id) === null || _s === void 0 ? void 0 : _s.$in;
                 if (Array.isArray(itemOfferedIdIn)) {
                     andConditions.push({
                         'offers.itemOffered.id': {
@@ -313,7 +221,7 @@ class EventRepo {
                         }
                     });
                 }
-                const itemOfferedTicketedSeatTypeOfIn = (_20 = (_19 = (_18 = (_17 = (_16 = params.offers) === null || _16 === void 0 ? void 0 : _16.itemOffered) === null || _17 === void 0 ? void 0 : _17.serviceOutput) === null || _18 === void 0 ? void 0 : _18.reservedTicket) === null || _19 === void 0 ? void 0 : _19.ticketedSeat) === null || _20 === void 0 ? void 0 : _20.typeOfs;
+                const itemOfferedTicketedSeatTypeOfIn = (_x = (_w = (_v = (_u = (_t = params.offers) === null || _t === void 0 ? void 0 : _t.itemOffered) === null || _u === void 0 ? void 0 : _u.serviceOutput) === null || _v === void 0 ? void 0 : _v.reservedTicket) === null || _w === void 0 ? void 0 : _w.ticketedSeat) === null || _x === void 0 ? void 0 : _x.typeOfs;
                 if (Array.isArray(itemOfferedTicketedSeatTypeOfIn)) {
                     andConditions.push({
                         'offers.itemOffered.serviceOutput.reservedTicket.ticketedSeat.typeOf': {
@@ -322,7 +230,7 @@ class EventRepo {
                         }
                     });
                 }
-                const itemOfferedServiceTypeIdIn = (_23 = (_22 = (_21 = params.offers) === null || _21 === void 0 ? void 0 : _21.itemOffered) === null || _22 === void 0 ? void 0 : _22.serviceType) === null || _23 === void 0 ? void 0 : _23.ids;
+                const itemOfferedServiceTypeIdIn = (_0 = (_z = (_y = params.offers) === null || _y === void 0 ? void 0 : _y.itemOffered) === null || _z === void 0 ? void 0 : _z.serviceType) === null || _0 === void 0 ? void 0 : _0.ids;
                 if (Array.isArray(itemOfferedServiceTypeIdIn)) {
                     andConditions.push({
                         'offers.itemOffered.serviceType.id': {
@@ -331,8 +239,8 @@ class EventRepo {
                         }
                     });
                 }
-                const sellerMakesOfferElemMatch = (_26 = (_25 = (_24 = params.offers) === null || _24 === void 0 ? void 0 : _24.seller) === null || _25 === void 0 ? void 0 : _25.makesOffer) === null || _26 === void 0 ? void 0 : _26.$elemMatch;
-                if (typeof ((_27 = sellerMakesOfferElemMatch === null || sellerMakesOfferElemMatch === void 0 ? void 0 : sellerMakesOfferElemMatch['availableAtOrFrom.id']) === null || _27 === void 0 ? void 0 : _27.$eq) === 'string') {
+                const sellerMakesOfferElemMatch = (_3 = (_2 = (_1 = params.offers) === null || _1 === void 0 ? void 0 : _1.seller) === null || _2 === void 0 ? void 0 : _2.makesOffer) === null || _3 === void 0 ? void 0 : _3.$elemMatch;
+                if (typeof ((_4 = sellerMakesOfferElemMatch === null || sellerMakesOfferElemMatch === void 0 ? void 0 : sellerMakesOfferElemMatch['availableAtOrFrom.id']) === null || _4 === void 0 ? void 0 : _4.$eq) === 'string') {
                     andConditions.push({
                         'offers.seller.makesOffer': {
                             $exists: true,
@@ -704,12 +612,12 @@ class EventRepo {
         return __awaiter(this, void 0, void 0, function* () {
             var _a;
             const conditions = EventRepo.CREATE_MONGO_CONDITIONS(params);
-            let projection = {};
+            let projection;
             const positiveProjectionFields = (Array.isArray(inclusion))
-                ? inclusion.filter((key) => key !== 'id' && key !== '_id')
+                ? inclusion.filter((key) => String(key) !== 'id' && String(key) !== '_id')
                 : [];
             if (Array.isArray(inclusion) && inclusion.length > 0) {
-                projection = Object.assign({ _id: 0, id: { $toString: '$_id' } }, Object.fromEntries(positiveProjectionFields.map((key) => ([key, 1]))));
+                projection = Object.assign(Object.assign({}, Object.fromEntries(positiveProjectionFields.map((key) => ([key, 1])))), { _id: 0, id: { $toString: '$_id' } });
             }
             else {
                 // discontinue(2024-07-24~)
@@ -753,13 +661,7 @@ class EventRepo {
                 positiveProjectionFields = inclusion.filter((key) => AVAILABLE_PUBLIC_PROJECT_FIELDS.includes(key));
                 projection = Object.assign({ _id: 0, id: { $toString: '$_id' } }, Object.fromEntries(positiveProjectionFields.map((key) => ([key, 1]))));
                 if (includeOffers) {
-                    projection = Object.assign(Object.assign(Object.assign({}, projection), { 'offers.typeOf': 1, 
-                        // 'offers.availabilityEnds': 1,
-                        // 'offers.availabilityStarts': 1,
-                        'offers.eligibleQuantity': 1, 'offers.itemOffered': 1, 'offers.offeredThrough': 1, 
-                        // 'offers.validFrom': 1,
-                        // 'offers.validThrough': 1,
-                        'offers.unacceptedPaymentMethod': 1, 'offers.seller.typeOf': 1, 'offers.seller.id': 1, 'offers.seller.name': 1 }), (includeSellerMakesOffer)
+                    projection = Object.assign(Object.assign(Object.assign({}, projection), { 'offers.typeOf': 1, 'offers.eligibleQuantity': 1, 'offers.itemOffered': 1, 'offers.identifier': 1, 'offers.offeredThrough': 1, 'offers.unacceptedPaymentMethod': 1, 'offers.seller.typeOf': 1, 'offers.seller.id': 1, 'offers.seller.name': 1 }), (includeSellerMakesOffer)
                         ? Object.assign({}, (Array.isArray(sellerMakesOfferAvailableAtIn))
                             ? {
                                 'offers.seller.makesOffer': {
@@ -806,7 +708,7 @@ class EventRepo {
     findAnyEventById(params) {
         return __awaiter(this, void 0, void 0, function* () {
             var _a;
-            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')
+            const doc = yield this.eventModel.findOne(Object.assign({ _id: { $eq: params.id.$eq }, 'project.id': { $eq: params.project.id.$eq }, typeOf: { $in: [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,
@@ -846,7 +748,7 @@ class EventRepo {
             };
             if (Array.isArray(inclusion) && inclusion.length > 0) {
                 inclusion.forEach((field) => {
-                    if (field !== '_id' && field !== 'id') {
+                    if (String(field) !== '_id' && String(field) !== 'id') {
                         projection[field] = 1;
                     }
                 });

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

@@ -1,10 +1,10 @@
 import type { BulkWriteResult } from 'mongodb';
 import type { Connection, Document, FilterQuery } from 'mongoose';
 import * as factory from '../factory';
-type ISearchConditions = factory.event.ISearchConditions<factory.eventType.ScreeningEventSeries>;
-type IKeyOfProjection = Exclude<keyof factory.event.IEvent<factory.eventType.ScreeningEventSeries>, 'id'>;
+type ISearchConditions = factory.eventSeries.ISearchConditions;
+type IKeyOfProjection = Exclude<keyof factory.eventSeries.IEvent, 'id'>;
 type IUnset = {
-    [key in keyof factory.event.IEvent<factory.eventType.ScreeningEventSeries>]?: 1;
+    [key in keyof factory.eventSeries.IEvent]?: 1;
 };
 /**
  * 施設コンテンツリポジトリ
@@ -12,25 +12,25 @@ type IUnset = {
 export declare class EventSeriesRepo {
     private readonly eventSeriesModel;
     constructor(connection: Connection);
-    static CREATE_MONGO_CONDITIONS(conditions: ISearchConditions): FilterQuery<factory.event.IEvent<factory.eventType.ScreeningEventSeries>>[];
+    static CREATE_MONGO_CONDITIONS(conditions: ISearchConditions): FilterQuery<factory.eventSeries.IEvent>[];
     /**
      * 複数イベントを作成する
      */
     createManyEventSeries(params: {
-        attributes: factory.event.IAttributes<factory.eventType.ScreeningEventSeries>[];
+        attributes: factory.eventSeries.IAttributes[];
         expectsNoContent: boolean;
     }): Promise<string[] | void>;
     /**
      * コンテンツ+バージョンをキーにして、なければ作成する(複数対応)
      */
     createIfNotExistByWorkPerformed(params: {
-        attributes: factory.event.IAttributes<factory.eventType.ScreeningEventSeries>;
+        attributes: factory.eventSeries.IAttributes;
     }[]): Promise<BulkWriteResult | void>;
     /**
      * コンテンツ+バージョンをキーにして冪等置換
      */
     upsertByVersion(params: {
-        $set: factory.event.IAttributes<factory.eventType.ScreeningEventSeries>;
+        $set: factory.eventSeries.IAttributes;
         $unset?: IUnset;
     }[]): Promise<{
         bulkWriteResult4insert: BulkWriteResult;
@@ -40,7 +40,7 @@ export declare class EventSeriesRepo {
     } | void>;
     saveEventSeries(params: {
         id?: string;
-        attributes: factory.event.IAttributes<factory.eventType.ScreeningEventSeries>;
+        attributes: factory.eventSeries.IAttributes;
         /**
          * ドキュメント作成時には無視される
          */
@@ -53,12 +53,12 @@ export declare class EventSeriesRepo {
      */
     upsertManyEventSeriesById4sskts(params: {
         id: string;
-        attributes: factory.event.IAttributes<factory.eventType.ScreeningEventSeries>;
+        attributes: factory.eventSeries.IAttributes;
     }[]): Promise<void>;
     /**
      * イベントを検索する(inclusion projection)
      */
-    projectEventSeriesFields(params: ISearchConditions, inclusion: IKeyOfProjection[]): Promise<factory.event.IEvent<factory.eventType.ScreeningEventSeries>[]>;
+    projectEventSeriesFields(params: ISearchConditions, inclusion: IKeyOfProjection[]): Promise<factory.eventSeries.IEvent[]>;
     deleteEventSeriesById(params: {
         project: {
             id: string;
@@ -103,15 +103,15 @@ export declare class EventSeriesRepo {
     }): Promise<{
         maxVersion: string;
     }>;
-    getCursor(conditions: FilterQuery<any>, projection: any): import("mongoose").Cursor<Document<unknown, {}, import("@chevre/factory/lib/event/screeningEventSeries").IAttributes & {
+    getCursor(conditions: FilterQuery<any>, projection: any): import("mongoose").Cursor<Document<unknown, {}, factory.eventSeries.IAttributes & {
         _id: string;
-    }> & import("@chevre/factory/lib/event/screeningEventSeries").IAttributes & {
+    }> & factory.eventSeries.IAttributes & {
         _id: string;
     } & Required<{
         _id: string;
-    }>, import("mongoose").QueryOptions<Document<unknown, {}, import("@chevre/factory/lib/event/screeningEventSeries").IAttributes & {
+    }>, import("mongoose").QueryOptions<Document<unknown, {}, factory.eventSeries.IAttributes & {
         _id: string;
-    }> & import("@chevre/factory/lib/event/screeningEventSeries").IAttributes & {
+    }> & factory.eventSeries.IAttributes & {
         _id: string;
     } & Required<{
         _id: string;

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

@@ -1,19 +1,6 @@
 import { IndexDefinition, IndexOptions, Model, Schema, SchemaDefinition } from 'mongoose';
 import * as factory from '../../../factory';
-export type IOrder4report = factory.report.accountingReport.IOrderAsMainEntity;
-export interface IChildReport {
-    typeOf: 'Report';
-    mainEntity: factory.report.accountingReport.IAction;
-}
-export interface IAccountingReport {
-    project: {
-        id: string;
-        typeOf: factory.organizationType.Project;
-    };
-    typeOf: 'Report';
-    hasPart: IChildReport[];
-    mainEntity: IOrder4report;
-}
+type IAccountingReport = factory.report.accountingReport.IReportDocument;
 type IDocType = IAccountingReport;
 type IModel = Model<IDocType>;
 type ISchemaDefinition = SchemaDefinition<IDocType>;
@@ -21,4 +8,4 @@ type ISchema = Schema<IDocType, IModel, {}, {}, {}, {}, ISchemaDefinition, IDocT
 declare const modelName = "AccountingReport";
 declare const indexes: [d: IndexDefinition, o: IndexOptions][];
 declare function createSchema(): ISchema;
-export { createSchema, IModel, indexes, modelName };
+export { createSchema, IDocType, IModel, indexes, modelName };

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

@@ -11,7 +11,7 @@ export interface IAggregateReservation {
         typeOf: factory.eventType;
         startDate: Date;
     };
-    aggregateOffer?: factory.event.event.IAggregateOffer;
+    aggregateOffer?: factory.event.screeningEvent.IAggregateOffer;
 }
 type IDocType = IAggregateReservation;
 type IModel = Model<IDocType>;

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

@@ -1,13 +1,10 @@
 import { IndexDefinition, IndexOptions, Model, Schema, SchemaDefinition } from 'mongoose';
 import * as factory from '../../../factory';
-type IDocTypeAsEvent = factory.event.IAttributes<factory.eventType.Event> & {
-    _id: string;
-};
 type IDocTypeAsScreeningEvent = factory.event.IAttributes<factory.eventType.ScreeningEvent> & {
     _id: string;
-    aggregateOffer?: factory.event.event.IAggregateOffer;
+    aggregateOffer?: factory.event.screeningEvent.IAggregateOffer;
 };
-export type IDocType = IDocTypeAsEvent | IDocTypeAsScreeningEvent;
+export type IDocType = IDocTypeAsScreeningEvent;
 type IModel = Model<IDocType>;
 type ISchemaDefinition = SchemaDefinition<IDocType>;
 type ISchema = Schema<IDocType, IModel, {}, {}, {}, {}, ISchemaDefinition, IDocType>;

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

@@ -1,6 +1,6 @@
 import { IndexDefinition, IndexOptions, Model, Schema, SchemaDefinition } from 'mongoose';
 import * as factory from '../../../factory';
-type IDocTypeAsEventSeries = factory.event.IAttributes<factory.eventType.ScreeningEventSeries> & {
+type IDocTypeAsEventSeries = factory.eventSeries.IAttributes & {
     _id: string;
 };
 export type IDocType = IDocTypeAsEventSeries;

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

@@ -25,7 +25,7 @@ const schemaDefinition = {
     description: mongoose_1.SchemaTypes.Mixed,
     address: mongoose_1.SchemaTypes.Mixed,
     branchCode: { type: String, required: true },
-    containedInPlace: mongoose_1.SchemaTypes.Mixed,
+    containedInPlace: { type: mongoose_1.SchemaTypes.Mixed, required: true },
     containsPlace: [mongoose_1.SchemaTypes.Mixed],
     maximumAttendeeCapacity: Number,
     openingHoursSpecification: mongoose_1.SchemaTypes.Mixed,
@@ -170,20 +170,19 @@ const indexes = [
                 'containedInPlace.branchCode': { $exists: true }
             }
         }
+    ],
+    [
+        // unique index(2025-10-01~)
+        {
+            // 'project.id': 1,
+            'containedInPlace.id': 1, // 施設内ユニーク
+            branchCode: 1
+        },
+        {
+            unique: true,
+            name: 'uniqueBranchCode'
+        }
     ]
-    // [
-    //     {
-    //         typeOf: 1,
-    //         'project.id': 1,
-    //         'containedInPlace.branchCode': 1,
-    //         branchCode: 1,
-    //         'containsPlace.branchCode': 1,
-    //         'containsPlace.containsPlace.branchCode': 1
-    //     },
-    //     {
-    //         name: 'projectSeatsUsingSort'
-    //     }
-    // ]
 ];
 exports.indexes = indexes;
 /**