@chevre/domain 22.3.0-alpha.8 → 22.3.0

package/lib/chevre/repo/creativeWork.js

@@ -22,9 +22,25 @@ var __rest = (this && this.__rest) || function (s, e) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.CreativeWorkRepo = void 0;
 const mongoose_1 = require("mongoose");
-const creativeWork_1 = require("./mongoose/schemas/creativeWork");
 const factory = require("../factory");
 const settings_1 = require("../settings");
+const creativeWork_1 = require("./mongoose/schemas/creativeWork");
+const AVAILABLE_PROJECT_FIELDS = [
+    'project',
+    'typeOf',
+    'identifier',
+    'name',
+    'alternativeHeadline',
+    // 'description',
+    'datePublished',
+    'distributor',
+    'headline',
+    'thumbnailUrl',
+    'duration',
+    'contentRating',
+    'offers',
+    'additionalProperty'
+];
 /**
  * コンテンツリポジトリ
  */
@@ -119,21 +135,24 @@ class CreativeWorkRepo {
      */
     saveMovie(params) {
         return __awaiter(this, void 0, void 0, function* () {
+            let savedId;
             let doc;
-            if (params.id === '') {
-                const { $unset } = params, createParams = __rest(params, ["$unset"]);
+            if (typeof params.id !== 'string' || params.id === '') {
+                const { $unset, id } = params, createParams = __rest(params, ["$unset", "id"]); // omit id(2024-09-12~)
                 doc = yield this.creativeWorkModel.create(createParams);
+                savedId = doc.id;
             }
             else {
                 // 上書き禁止属性を除外
                 const { id, identifier, project, typeOf, $unset } = params, setFields = __rest(params, ["id", "identifier", "project", "typeOf", "$unset"]);
-                doc = yield this.creativeWorkModel.findOneAndUpdate({ _id: { $eq: params.id } }, Object.assign({ $set: setFields }, ($unset !== undefined) ? { $unset } : undefined), { upsert: false, new: true })
+                doc = yield this.creativeWorkModel.findOneAndUpdate({ _id: { $eq: params.id } }, Object.assign({ $set: setFields }, ($unset !== undefined) ? { $unset } : undefined), { upsert: false, new: true, projection: { _id: 1 } })
                     .exec();
+                savedId = params.id;
             }
             if (doc === null) {
                 throw new factory.errors.NotFound(this.creativeWorkModel.modelName);
             }
-            return doc.toObject();
+            return { id: savedId };
         });
     }
     /**
@@ -209,28 +228,37 @@ class CreativeWorkRepo {
     /**
      * コンテンツを検索する
      */
-    searchMovies(params, inclusion, exclusion) {
+    projectFields(params, inclusion
+    // exclusion: IKeyOfProjection[]
+    ) {
         var _a;
         return __awaiter(this, void 0, void 0, function* () {
             const conditions = CreativeWorkRepo.CREATE_MONGO_CONDITIONS(params);
-            let projection = {};
+            // let projection: { [key: string]: number } = {};
+            // 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;
+            //         });
+            //     }
+            // }
+            let positiveProjectionFields = AVAILABLE_PROJECT_FIELDS;
             if (Array.isArray(inclusion) && inclusion.length > 0) {
-                inclusion.forEach((field) => {
-                    projection[field] = 1;
-                });
+                positiveProjectionFields = inclusion.filter((key) => AVAILABLE_PROJECT_FIELDS.includes(key));
             }
             else {
-                projection = {
-                    __v: 0,
-                    createdAt: 0,
-                    updatedAt: 0
-                };
-                if (Array.isArray(exclusion) && exclusion.length > 0) {
-                    exclusion.forEach((field) => {
-                        projection[field] = 0;
-                    });
-                }
+                throw new factory.errors.ArgumentNull('inclusion', 'inclusion must be specified');
             }
+            const projection = Object.assign({ _id: 0, id: { $toString: '$_id' } }, Object.fromEntries(positiveProjectionFields.map((key) => ([key, 1]))));
             const query = this.creativeWorkModel.find({ $and: conditions }, projection);
             if (typeof params.limit === 'number' && params.limit > 0) {
                 const page = (typeof params.page === 'number' && params.page > 0) ? params.page : 1;
@@ -243,8 +271,8 @@ class CreativeWorkRepo {
                 query.sort({ identifier: params.sort.identifier });
             }
             return query.setOptions({ maxTimeMS: settings_1.MONGO_MAX_TIME_MS })
-                .exec()
-                .then((docs) => docs.map((doc) => doc.toObject()));
+                .lean() // 2024-09-19~
+                .exec();
         });
     }
     /**
@@ -252,7 +280,7 @@ class CreativeWorkRepo {
      */
     deleteMovie(params) {
         return __awaiter(this, void 0, void 0, function* () {
-            yield this.creativeWorkModel.findOneAndRemove({ _id: { $eq: params.id } })
+            yield this.creativeWorkModel.findOneAndRemove({ _id: { $eq: params.id } }, { projection: { _id: 1 } })
                 .exec();
         });
     }

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

@@ -51,14 +51,14 @@ export declare class CustomerRepo {
     deleteById(params: {
         id: string;
     }): Promise<void>;
-    getCursor(conditions: any, projection: any): import("mongoose").Cursor<import("mongoose").Document<unknown, {}, factory.customer.ICustomer> & Omit<factory.customer.ICustomer & {
+    getCursor(conditions: any, projection: any): import("mongoose").Cursor<import("mongoose").Document<unknown, {}, factory.customer.ICustomer> & factory.customer.ICustomer & {
         _id: import("mongoose").Types.ObjectId;
-    }, never>, import("mongoose").QueryOptions<import("mongoose").Document<unknown, {}, factory.customer.ICustomer> & Omit<factory.customer.ICustomer & {
+    }, import("mongoose").QueryOptions<import("mongoose").Document<unknown, {}, factory.customer.ICustomer> & factory.customer.ICustomer & {
         _id: import("mongoose").Types.ObjectId;
-    }, never>>>;
+    }>>;
     unsetUnnecessaryFields(params: {
         filter: any;
         $unset: any;
-    }): Promise<import("mongodb").UpdateResult>;
+    }): Promise<import("mongoose").UpdateWriteOpResult>;
 }
 export {};

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

@@ -26,7 +26,9 @@ import type { BulkWriteResult } from 'mongodb';
 import type { Connection, Document, FilterQuery } from 'mongoose';
 import * as factory from '../factory';
 import * as EventFactory from '../factory/event';
-export interface IAttributes4patchUpdate<T extends factory.eventType> {
+import { IDocType } from './mongoose/schemas/event';
+type AvailableEventType = factory.eventType.Event | factory.eventType.ScreeningEvent;
+export interface IAttributes4patchUpdate<T extends AvailableEventType> {
     typeOf: T;
     eventStatus?: factory.eventStatusType;
 }
@@ -45,7 +47,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;
@@ -68,13 +70,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;
 };
 /**
@@ -83,24 +85,37 @@ 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>;
     /**
      * 特定の追加特性をキーにして、存在しなければ作成する(複数対応)
-     * 存在すれば、eventStatusのみ更新する
+     * 施設コンテンツとルームは1つに限定
+     * 存在すれば、特定の属性のみ更新する
      */
-    createManyIfNotExist<T extends factory.eventType>(params: {
-        attributes: factory.event.IAttributes<T>;
-        filter: {
+    upsertManyByAdditionalProperty(params: {
+        events: factory.event.IAttributes<factory.eventType.ScreeningEvent>[];
+        additionalPropertyFilter: {
             name: string;
         };
-    }[]): Promise<{
+        eventSeries: {
+            /**
+             * 施設コンテンツID
+             */
+            id: string;
+        };
+        screeningRoom: {
+            /**
+             * ルームコード
+             */
+            branchCode: string;
+        };
+    }): Promise<{
         bulkWriteResult: BulkWriteResult;
         modifiedEvents: {
             id: string;
@@ -109,7 +124,7 @@ export declare class EventRepo {
     /**
      * イベント部分更新
      */
-    updatePartiallyById<T extends factory.eventType>(params: {
+    updatePartiallyById<T extends AvailableEventType>(params: {
         project: {
             id: string;
         };
@@ -119,7 +134,7 @@ export declare class EventRepo {
     /**
      * イベントを保管する
      */
-    save<T extends factory.eventType>(params: {
+    saveEvent<T extends AvailableEventType>(params: {
         id?: string;
         attributes: factory.event.IAttributes<T>;
         /**
@@ -130,7 +145,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>;
@@ -145,12 +160,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;
         };
@@ -165,18 +180,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;
         };
@@ -189,23 +204,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;
         };
@@ -213,15 +223,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;
         };
@@ -259,7 +261,7 @@ export declare class EventRepo {
     /**
      * 興行(プロダクト)から削除する
      */
-    deleteManyByItemOfferedId(params: {
+    deleteManyEventsByItemOfferedId(params: {
         project: {
             id: string;
         };
@@ -271,21 +273,14 @@ 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: {
+    /**
+     * 旧施設コンテンツ廃止専用メソッド
+     * 2024-09-11~
+     */
+    deleteOldEventSeries(): Promise<import("mongodb").DeleteResult>;
+    deleteManyEventsEndedByProject(params: {
         typeOf: {
-            $in: factory.eventType[];
+            $in: AvailableEventType[];
         };
         project: {
             id: string;
@@ -294,9 +289,9 @@ export declare class EventRepo {
             $lte: Date;
         };
     }): Promise<import("mongodb").DeleteResult>;
-    deleteManyEnded(params: {
+    deleteManyEventsEnded(params: {
         typeOf: {
-            $eq: factory.eventType;
+            $eq: AvailableEventType;
         };
         endDate: {
             $lte: Date;
@@ -318,35 +313,25 @@ export declare class EventRepo {
             validationErrors: import("mongoose").Error[];
         } | undefined;
     }>;
-    getCursor(conditions: FilterQuery<any>, projection: any): import("mongoose").Cursor<Document<unknown, {}, import("./mongoose/schemas/event").IDocType> & Omit<(import("@chevre/factory/lib/event/anyEvent").IAttributes & {
+    getCursor(conditions: FilterQuery<any>, projection: any): import("mongoose").Cursor<Document<unknown, {}, IDocType> & ((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, {}, import("./mongoose/schemas/event").IDocType> & Omit<(import("@chevre/factory/lib/event/anyEvent").IAttributes & {
+    }>)), import("mongoose").QueryOptions<Document<unknown, {}, IDocType> & ((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: {
         id: string;
         offers: {
@@ -355,22 +340,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>;
+    }): Promise<import("mongoose").UpdateWriteOpResult>;
     aggregateEvent(params: {
         project?: {
             id?: {
@@ -379,7 +352,7 @@ export declare class EventRepo {
         };
         startFrom: Date;
         startThrough: Date;
-        typeOf: factory.eventType;
+        typeOf: AvailableEventType;
     }): Promise<IAggregateEvent>;
     private agggregateByStatus;
 }