@chevre/domain 21.14.0 → 21.15.0-alpha.1

package/example/src/chevre/aggregateAllEvents.ts

@@ -14,14 +14,18 @@ async function main() {
 
     const now = new Date();
 
-    const events = await eventRepo.search<chevre.factory.eventType.ScreeningEvent>({
-        typeOf: chevre.factory.eventType.ScreeningEvent,
-        project: { id: { $eq: project.id } },
-        startFrom: now
-        // startFrom: moment().add(-1, 'day').toDate(),
-        // startThrough: moment().add(1, 'day').toDate(),
-        // startThrough: now
-    });
+    const events = await eventRepo.search<chevre.factory.eventType.ScreeningEvent>(
+        {
+            typeOf: chevre.factory.eventType.ScreeningEvent,
+            project: { id: { $eq: project.id } },
+            startFrom: now
+            // startFrom: moment().add(-1, 'day').toDate(),
+            // startThrough: moment().add(1, 'day').toDate(),
+            // startThrough: now
+        },
+        [],
+        []
+    );
 
     // console.log(events);
     console.log(events.length);

package/example/src/chevre/searchEvents.ts

@@ -15,18 +15,16 @@ async function main() {
 
     const events = await eventRepo.search(
         {
-            // limit: 100,
-            // page: 1,
+            limit: 100,
+            page: 1,
             // sort: { startDate: 1 },
             // typeOf: chevre.factory.eventType.ScreeningEvent,
             project: { id: { $eq: PROJECT_ID } },
-            id: { $eq: 'al6aff83y' },
+            // id: { $eq: 'al6aff83y' },
             typeOfIn: [chevre.factory.eventType.Event, chevre.factory.eventType.ScreeningEvent]
         },
-        {
-            _id: 1
-            // name: 1
-        }
+        ['_id', 'name'],
+        []
     );
     console.log(events);
     console.log(events.length, 'events found');

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

@@ -4,5 +4,5 @@ export type IMinimizedIndividualEvent<T extends factory.eventType.ScreeningEvent
  * 興行イベントのsuperEventを作成する
  */
 export declare function minimizeSuperEvent(params: {
-    superEventFromDB: factory.event.screeningEventSeries.IEvent;
+    superEventFromDB: Omit<factory.event.screeningEventSeries.IEvent, 'offers'>;
 }): factory.event.screeningEvent.ISuperEvent;

package/lib/chevre/factory/event.js

@@ -6,10 +6,7 @@ const factory = require("../factory");
  * 興行イベントのsuperEventを作成する
  */
 function minimizeSuperEvent(params) {
-    const workPerformed = Object.assign(Object.assign(Object.assign(Object.assign({ 
-        // 不要なので廃止(2022-12-19~)
-        // project: { typeOf: chevre.factory.organizationType.Project, id: params.project.id },
-        typeOf: factory.creativeWorkType.Movie, identifier: String(params.superEventFromDB.workPerformed.identifier) }, (typeof params.superEventFromDB.workPerformed.id === 'string')
+    const workPerformed = Object.assign(Object.assign(Object.assign(Object.assign({ typeOf: factory.creativeWorkType.Movie, identifier: String(params.superEventFromDB.workPerformed.identifier) }, (typeof params.superEventFromDB.workPerformed.id === 'string')
         ? { id: params.superEventFromDB.workPerformed.id }
         : undefined), (params.superEventFromDB.workPerformed.name !== undefined)
         ? { name: params.superEventFromDB.workPerformed.name }
@@ -18,10 +15,7 @@ function minimizeSuperEvent(params) {
         : undefined), (typeof params.superEventFromDB.workPerformed.contentRating === 'string')
         ? { contentRating: params.superEventFromDB.workPerformed.contentRating }
         : undefined);
-    const location = Object.assign(Object.assign({ 
-        // 不要なので廃止(2022-12-19~)
-        // project: { typeOf: chevre.factory.organizationType.Project, id: params.project.id },
-        typeOf: factory.placeType.MovieTheater, id: params.superEventFromDB.location.id, branchCode: params.superEventFromDB.location.branchCode }, (params.superEventFromDB.location.name !== undefined)
+    const location = Object.assign(Object.assign({ typeOf: factory.placeType.MovieTheater, id: params.superEventFromDB.location.id, branchCode: params.superEventFromDB.location.branchCode }, (params.superEventFromDB.location.name !== undefined)
         ? { name: params.superEventFromDB.location.name }
         : undefined), (typeof params.superEventFromDB.location.kanaName === 'string')
         ? { kanaName: params.superEventFromDB.location.kanaName }

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

@@ -23,7 +23,7 @@
 /// <reference types="mongoose/types/virtuals" />
 /// <reference types="mongoose/types/inferschematype" />
 import type { BulkWriteResult } from 'mongodb';
-import type { Connection } from 'mongoose';
+import type { Connection, FilterQuery } from 'mongoose';
 import * as factory from '../factory';
 import * as EventFactory from '../factory/event';
 export interface IAttributes4patchUpdate<T extends factory.eventType> {
@@ -74,38 +74,23 @@ interface IStatus {
     status: factory.eventStatusType;
     aggregation: IAggregationByStatus;
 }
-export interface IAggregateEvent {
+interface IAggregateEvent {
     statuses: IStatus[];
 }
-type IKeyOfProjection<T extends factory.eventType> = keyof factory.event.IEvent<T> & '_id';
-type IProjection<T extends factory.eventType> = {
-    [key in IKeyOfProjection<T>]?: 0 | 1;
+type IKeyOfProjection<T extends factory.eventType> = keyof factory.event.IEvent<T> | '_id' | '__v' | 'createdAt' | 'updatedAt';
+type IUnset<T extends factory.eventType> = {
+    [key in keyof factory.event.IEvent<T>]?: 1;
 };
 export import IMinimizedIndividualEvent = EventFactory.IMinimizedIndividualEvent;
-export declare const PROJECTION_MINIMIZED_EVENT: {
-    project: number;
-    organizer: number;
-    _id: number;
-    typeOf: number;
-    additionalProperty: number;
-    name: number;
-    doorTime: number;
-    endDate: number;
-    eventStatus: number;
-    location: number;
-    startDate: number;
-    superEvent: number;
-    offers: number;
-    coaInfo: number;
-    identifier: number;
-};
+export declare const keyOfMinimizedScreeningEvent: IKeyOfProjection<factory.eventType.ScreeningEvent>[];
+export declare const keyOfMinimizedEvent: IKeyOfProjection<factory.eventType.Event>[];
 /**
  * イベントリポジトリ
  */
 export declare class MongoRepository {
     private readonly eventModel;
     constructor(connection: Connection);
-    static CREATE_MONGO_CONDITIONS<T extends factory.eventType>(conditions: ISearchConditions<T>): any[];
+    static CREATE_MONGO_CONDITIONS<T extends factory.eventType>(conditions: ISearchConditions<T>): FilterQuery<factory.event.IEvent<T>>[];
     /**
      * 複数イベントを作成する
      */
@@ -150,13 +135,13 @@ export declare class MongoRepository {
     save<T extends factory.eventType>(params: {
         id?: string;
         attributes: factory.event.IAttributes<T>;
-        $unset?: IProjection<T>;
+        $unset?: IUnset<T>;
         upsert?: boolean;
     }): Promise<factory.event.IEvent<T>>;
     saveMany<T extends factory.eventType>(params: {
         id: string;
         attributes: factory.event.IAttributes<T>;
-        $unset?: IProjection<T>;
+        $unset?: IUnset<T>;
         upsert: boolean;
     }[]): Promise<void>;
     save4ttts(params: {
@@ -166,7 +151,7 @@ export declare class MongoRepository {
     /**
      * イベントを検索する
      */
-    search<T extends factory.eventType>(params: ISearchConditions<T>, projection?: IProjection<T>): Promise<factory.event.IEvent<T>[]>;
+    search<T extends factory.eventType>(params: ISearchConditions<T>, inclusion: IKeyOfProjection<T>[], exclusion: IKeyOfProjection<T>[]): Promise<factory.event.IEvent<T>[]>;
     searchIds<T extends factory.eventType>(params: ISearchConditions<T>): Promise<string[]>;
     findMinimizedIndividualEventById<T extends factory.eventType.ScreeningEvent | factory.eventType.Event>(params: {
         id: string;
@@ -297,10 +282,10 @@ export declare class MongoRepository {
             validationErrors: import("mongoose").Error[];
         } | undefined;
     }>;
-    getCursor(conditions: any, projection: any): import("mongoose").Cursor<any, import("mongoose").QueryOptions<any>>;
+    getCursor(conditions: FilterQuery<any>, projection: any): import("mongoose").Cursor<any, import("mongoose").QueryOptions<any>>;
     unsetUnnecessaryFields(params: {
-        filter: any;
-        $unset: any;
+        filter: FilterQuery<any>;
+        $unset: IUnset<any>;
     }): Promise<import("mongodb").UpdateResult>;
     /**
      * 既存施設コンテンツの最大バージョンを集計する

package/lib/chevre/repo/event.js

@@ -20,13 +20,21 @@ var __rest = (this && this.__rest) || function (s, e) {
     return t;
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.MongoRepository = exports.PROJECTION_MINIMIZED_EVENT = void 0;
+exports.MongoRepository = exports.keyOfMinimizedEvent = exports.keyOfMinimizedScreeningEvent = void 0;
 const factory = require("../factory");
 const EventFactory = require("../factory/event");
 const event_1 = require("./mongoose/schemas/event");
 const errorHandler_1 = require("../errorHandler");
 const settings_1 = require("../settings");
-exports.PROJECTION_MINIMIZED_EVENT = {
+exports.keyOfMinimizedScreeningEvent = [
+    'project', 'organizer', '_id', 'typeOf', 'additionalProperty', 'name',
+    'doorTime', 'endDate', 'eventStatus', 'location', 'startDate', 'superEvent', 'offers', 'coaInfo', 'identifier'
+];
+exports.keyOfMinimizedEvent = [
+    'project', 'organizer', '_id', 'typeOf', 'additionalProperty', 'name',
+    'doorTime', 'endDate', 'eventStatus', 'location', 'startDate', 'offers', 'identifier'
+];
+const PROJECTION_MINIMIZED_EVENT = {
     project: 1,
     organizer: 1,
     _id: 1,
@@ -735,32 +743,48 @@ class MongoRepository {
             return doc.toObject();
         });
     }
-    // public async count<T extends factory.eventType>(
-    //     params: ISearchConditions<T>
-    // ): Promise<number> {
-    //     const conditions = MongoRepository.CREATE_MONGO_CONDITIONS(params);
-    //     return this.eventModel.countDocuments(
-    //         { $and: conditions }
-    //     )
-    //         .setOptions({ maxTimeMS: MONGO_MAX_TIME_MS })
-    //         .exec();
-    // }
     /**
      * イベントを検索する
      */
-    search(params, projection) {
+    search(params, 
+    // projection?: IProjection<T>
+    inclusion, exclusion) {
         var _a;
         return __awaiter(this, void 0, void 0, function* () {
             const conditions = MongoRepository.CREATE_MONGO_CONDITIONS(params);
-            const positiveProjectionExists = (projection !== undefined && projection !== null)
-                ? Object.values(projection)
-                    .some((value) => value !== 0)
-                : false;
-            const query = this.eventModel.find({ $and: conditions }, 
+            let projection = {};
+            if (Array.isArray(inclusion) && inclusion.length > 0) {
+                inclusion.forEach((field) => {
+                    projection[field] = 1;
+                });
+            }
+            else {
+                projection = {
+                    __v: 0,
+                    createdAt: 0,
+                    updatedAt: 0
+                };
+                if (Array.isArray(exclusion) && exclusion.length > 0) {
+                    exclusion.forEach((field) => {
+                        projection[field] = 0;
+                    });
+                }
+            }
+            // const positiveProjectionExists: boolean = (projection !== undefined && projection !== null)
+            //     ? Object.values(projection)
+            //         .some((value) => value !== 0)
+            //     : false;
+            const query = this.eventModel.find({ $and: conditions }, projection
             // :1対応(2023-01-25~)
-            (positiveProjectionExists)
-                ? projection
-                : Object.assign(Object.assign({}, projection), { __v: 0, createdAt: 0, updatedAt: 0 }));
+            // (positiveProjectionExists)
+            //     ? projection
+            //     : {
+            //         ...projection,
+            //         __v: 0,
+            //         createdAt: 0,
+            //         updatedAt: 0
+            //     }
+            );
             if (typeof params.limit === 'number' && params.limit > 0) {
                 const page = (typeof params.page === 'number' && params.page > 0) ? params.page : 1;
                 query.limit(params.limit)
@@ -792,42 +816,9 @@ class MongoRepository {
                 .exec();
         });
     }
-    // searchに置き換え(2023-07-13~)
-    // public async findById<T extends factory.eventType>(
-    //     params: {
-    //         project: { id: string };
-    //         id: string;
-    //     },
-    //     projection?: IProjection
-    // ): Promise<factory.event.IEvent<T>> {
-    //     const positiveProjectionExists: boolean = (projection !== undefined && projection !== null)
-    //         ? Object.values(projection)
-    //             .some((value) => value !== 0)
-    //         : false;
-    //     const doc = await this.eventModel.findOne(
-    //         {
-    //             _id: params.id,
-    //             'project.id': { $eq: params.project.id }
-    //         },
-    //         // :1対応(2023-01-25~)
-    //         (positiveProjectionExists)
-    //             ? projection
-    //             : {
-    //                 ...projection,
-    //                 __v: 0,
-    //                 createdAt: 0,
-    //                 updatedAt: 0
-    //             }
-    //     )
-    //         .exec();
-    //     if (doc === null) {
-    //         throw new factory.errors.NotFound(this.eventModel.modelName);
-    //     }
-    //     return doc.toObject();
-    // }
     findMinimizedIndividualEventById(params) {
         return __awaiter(this, void 0, void 0, function* () {
-            const doc = yield this.eventModel.findOne({ _id: params.id }, exports.PROJECTION_MINIMIZED_EVENT)
+            const doc = yield this.eventModel.findOne({ _id: params.id }, PROJECTION_MINIMIZED_EVENT)
                 .exec();
             if (doc === null) {
                 throw new factory.errors.NotFound(this.eventModel.modelName);
@@ -858,7 +849,7 @@ class MongoRepository {
                 typeOf: factory.eventType.ScreeningEventSeries,
                 id: { $eq: params.superEvent.id },
                 project: { id: { $eq: params.project.id } }
-            });
+            }, [], ['offers']);
             const superEventFromDB = superEvents.shift();
             if (superEventFromDB === undefined) {
                 throw new factory.errors.NotFound(factory.eventType.ScreeningEventSeries);

package/lib/chevre/service/aggregation/event/aggregateScreeningEvent.js

@@ -26,8 +26,6 @@ const debug = createDebug('chevre-domain:service');
 function aggregateScreeningEvent(params) {
     return (repos) => __awaiter(this, void 0, void 0, function* () {
         // 集計対象イベント検索
-        // イベント取得属性最適化(2023-01-23~)
-        // const event = await repos.event.findById<factory.eventType.ScreeningEvent | factory.eventType.Event>(params);
         const event = yield repos.event.findMinimizedIndividualEventById(params);
         let aggregatingEvents = [event];
         // プロジェクト限定(2023-02-22~)
@@ -43,17 +41,34 @@ function aggregateScreeningEvent(params) {
                     .add(1, 'hour')
                     .add(-1, 'second')
                     .toDate();
-                // 取得属性最適化(2023-01-25~)
-                aggregatingEvents = yield repos.event.search({
-                    limit: 100,
-                    page: 1,
-                    project: { id: { $eq: event.project.id } },
-                    typeOf: event.typeOf,
-                    eventStatuses: [factory.eventStatusType.EventScheduled],
-                    startFrom: startFrom,
-                    startThrough: startThrough,
-                    location: { branchCode: { $eq: event.location.branchCode } }
-                }, event_1.PROJECTION_MINIMIZED_EVENT);
+                if (event.typeOf === factory.eventType.Event) {
+                    aggregatingEvents = yield repos.event.search({
+                        limit: 100,
+                        page: 1,
+                        project: { id: { $eq: event.project.id } },
+                        typeOf: event.typeOf,
+                        eventStatuses: [factory.eventStatusType.EventScheduled],
+                        startFrom: startFrom,
+                        startThrough: startThrough,
+                        location: { branchCode: { $eq: event.location.branchCode } }
+                    }, event_1.keyOfMinimizedEvent, []
+                    // PROJECTION_MINIMIZED_EVENT
+                    );
+                }
+                else if (event.typeOf === factory.eventType.ScreeningEvent) {
+                    aggregatingEvents = yield repos.event.search({
+                        limit: 100,
+                        page: 1,
+                        project: { id: { $eq: event.project.id } },
+                        typeOf: event.typeOf,
+                        eventStatuses: [factory.eventStatusType.EventScheduled],
+                        startFrom: startFrom,
+                        startThrough: startThrough,
+                        location: { branchCode: { $eq: event.location.branchCode } }
+                    }, event_1.keyOfMinimizedScreeningEvent, []
+                    // PROJECTION_MINIMIZED_EVENT
+                    );
+                }
                 // ID指定されたイベントについてはEventScheduledでなくても集計したいので、集計対象を調整
                 aggregatingEvents = aggregatingEvents.filter((e) => e.id !== event.id);
                 aggregatingEvents = [event, ...aggregatingEvents];

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

@@ -100,18 +100,14 @@ function searchEventTicketOffersByEvent(params) {
         let soundFormatTypes = [];
         let videoFormatTypes = [];
         if (event.typeOf === factory.eventType.ScreeningEvent) {
-            // 取得属性最適化(2023-01-25~)
-            // const superEvent: Pick<factory.event.IEvent<factory.eventType.ScreeningEventSeries>, 'soundFormat' | 'videoFormat'> =
-            //     await repos.event.findById<factory.eventType.ScreeningEventSeries>(
-            //         { id: event.superEvent.id },
-            //         { soundFormat: 1, videoFormat: 1 }
-            //     );
             const superEvents = yield repos.event.search({
                 limit: 1,
                 page: 1,
                 id: { $eq: event.superEvent.id },
                 typeOf: factory.eventType.ScreeningEventSeries
-            }, { soundFormat: 1, videoFormat: 1 });
+            }, ['soundFormat', 'videoFormat'], []
+            // { soundFormat: 1, videoFormat: 1 }
+            );
             const superEvent = superEvents.shift();
             if (superEvent === undefined) {
                 throw new factory.errors.NotFound(factory.eventType.ScreeningEventSeries);
@@ -327,7 +323,9 @@ function searchOfferAppliesToMovieTicket(params) {
                 page: 1,
                 id: { $eq: event.superEvent.id },
                 typeOf: factory.eventType.ScreeningEventSeries
-            }, { soundFormat: 1, videoFormat: 1 });
+            }, ['soundFormat', 'videoFormat'], []
+            // { soundFormat: 1, videoFormat: 1 }
+            );
             const superEvent = superEvents.shift();
             if (superEvent === undefined) {
                 throw new factory.errors.NotFound(factory.eventType.ScreeningEventSeries);

package/lib/chevre/service/offer.js

@@ -236,13 +236,31 @@ function createAggregateScreeningEventIfNotExist(params) {
 exports.createAggregateScreeningEventIfNotExist = createAggregateScreeningEventIfNotExist;
 function createInformTasks(params) {
     return (repos) => __awaiter(this, void 0, void 0, function* () {
-        const events4inform = yield repos.event.search({
-            id: { $in: params.ids },
-            typeOf: params.typeOf
-        }, {
-            aggregateEntranceGate: 0, aggregateOffer: 0, aggregateReservation: 0,
-            remainingAttendeeCapacity: 0, checkInCount: 0, attendeeCount: 0
-        });
+        let events4inform;
+        if (params.typeOf === factory.eventType.Event) {
+            events4inform = yield repos.event.search({
+                id: { $in: params.ids },
+                typeOf: params.typeOf
+            }, [], [
+                'aggregateEntranceGate', 'aggregateOffer', 'aggregateReservation',
+                'remainingAttendeeCapacity', 'checkInCount', 'attendeeCount'
+            ]);
+        }
+        else if (params.typeOf === factory.eventType.ScreeningEvent) {
+            events4inform = yield repos.event.search({
+                id: { $in: params.ids },
+                typeOf: params.typeOf
+            }, [], [
+                'aggregateEntranceGate', 'aggregateOffer', 'aggregateReservation',
+                'remainingAttendeeCapacity', 'checkInCount', 'attendeeCount'
+            ]);
+        }
+        else {
+            events4inform = yield repos.event.search({
+                id: { $in: params.ids },
+                typeOf: params.typeOf
+            }, [], []);
+        }
         if (events4inform.length > 0) {
             const taskRunsAt = new Date();
             const informTasks = [];

package/lib/chevre/service/reserve/potentialActions/onReservationCheckedIn.js

@@ -114,7 +114,9 @@ function onReservationCheckedIn(params) {
                 const existingEvents = yield repos.event.search({
                     id: { $eq: reservationForId },
                     typeOfIn: [factory.eventType.Event, factory.eventType.ScreeningEvent] // 指定しないとArgumentNullError
-                }, { _id: 1 });
+                }, ['_id'], []
+                // { _id: 1 }
+                );
                 if (existingEvents.length > 0) {
                     yield (0, offer_1.createAggregateScreeningEventIfNotExist)({
                         project: { id: params.project.id },

package/lib/chevre/service/transaction/returnOrder.js

@@ -53,9 +53,11 @@ function start(params) {
             events = yield repos.event.search({
                 id: { $in: eventIds },
                 typeOf: factory.eventType.ScreeningEvent
-            }, {
-                startDate: 1
-            });
+            }, ['startDate'], []
+            // {
+            //     startDate: 1
+            // }
+            );
         }
         let returnPolicies = seller.hasMerchantReturnPolicy;
         if (!Array.isArray(returnPolicies)) {

package/package.json

@@ -117,5 +117,5 @@
     "postversion": "git push origin --tags",
     "prepublishOnly": "npm run clean && npm run build && npm test && npm run doc"
   },
-  "version": "21.14.0"
+  "version": "21.15.0-alpha.1"
 }