@chevre/domain 22.1.0-alpha.3 → 22.1.0-alpha.5

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.search<chevre.factory.eventType.ScreeningEvent>(
+    >[]>await eventRepo.projectFields<chevre.factory.eventType.ScreeningEvent>(
         {
             typeOf: chevre.factory.eventType.ScreeningEvent,
             project: { id: { $eq: PROJECT.id } },
@@ -26,8 +26,7 @@ async function main() {
             // startThrough: moment().add(1, 'day').toDate(),
             // startThrough: now
         },
-        ['id', 'typeOf', 'startDate', 'project'],
-        []
+        ['typeOf', 'startDate', 'project']
     );
 
     // console.log(events);

package/example/src/chevre/createManyEvents.ts

@@ -0,0 +1,75 @@
+// tslint:disable:no-console
+import * as mongoose from 'mongoose';
+import { chevre } from '../../../lib/index';
+
+const PROJECT_ID = String(process.env.PROJECT_ID);
+
+async function main() {
+    await mongoose.connect(<string>process.env.MONGOLAB_URI, { autoIndex: false });
+
+    const eventRepo: chevre.repository.Event = await chevre.repository.Event.createInstance(mongoose.connection);
+
+    const ids = await eventRepo.createMany<chevre.factory.eventType.ScreeningEvent>(
+        {
+            attributes: [{
+                typeOf: chevre.factory.eventType.ScreeningEvent,
+                project: { id: PROJECT_ID, typeOf: chevre.factory.organizationType.Project },
+                organizer: { id: '59d20831e53ebc2b4e774466' },
+                location: {
+                    typeOf: chevre.factory.placeType.ScreeningRoom,
+                    branchCode: '70',
+                    name: {
+                        ja: 'シネマ7',
+                        en: 'CINEMA7'
+                    },
+                    address: {
+                        ja: '',
+                        en: ''
+                    }
+                },
+                name: { ja: 'xxx', en: 'xxx' },
+                superEvent: <any>{
+                    typeOf: chevre.factory.eventType.ScreeningEventSeries,
+                    id: '7k9ayl8hc'
+                },
+                offers: {
+                    availabilityEnds: new Date('2024-08-02T00:00:00+09:00'),
+                    availabilityStarts: new Date('2024-08-02T00:00:00+09:00'),
+                    validFrom: new Date('2024-08-02T00:00:00+09:00'),
+                    validThrough: new Date('2024-08-02T00:00:00+09:00'),
+                    typeOf: chevre.factory.offerType.Offer,
+                    eligibleQuantity: { maxValue: 1, typeOf: 'QuantitativeValue' },
+                    itemOffered: {
+                        id: '655dc6b02cbb99d946cb6081',
+                        name: {
+                            ja: '通常興行カタログ（サブカタログ版）'
+                        },
+                        serviceOutput: {
+                            typeOf: chevre.factory.reservationType.EventReservation,
+                            reservedTicket: {
+                                typeOf: 'Ticket'
+                                // ticketedSeat: {
+                                //     typeOf: chevre.fa
+                                // }
+                            }
+                        },
+                        typeOf: chevre.factory.product.ProductType.EventService,
+                        availableChannel: <any>{}
+                    },
+                    seller: <any>{}
+                },
+                eventStatus: chevre.factory.eventStatusType.EventScheduled,
+                doorTime: new Date('2024-08-02T11:00:00+09:00'),
+                startDate: new Date('2024-08-02T11:00:00+09:00'),
+                endDate: new Date('2024-08-02T12:00:00+09:00')
+            }],
+            expectsNoContent: false
+        }
+    );
+    // tslint:disable-next-line:no-null-keyword
+    console.dir(ids, { depth: null });
+}
+
+main()
+    .then(console.log)
+    .catch(console.error);

package/example/src/chevre/{searchEvents.ts → projectEventFields.ts}

@@ -13,7 +13,7 @@ async function main() {
 
     const eventRepo: chevre.repository.Event = await chevre.repository.Event.createInstance(mongoose.connection);
 
-    const events = await eventRepo.search<chevre.factory.eventType.ScreeningEvent>(
+    const events = await eventRepo.projectFields<chevre.factory.eventType.ScreeningEvent>(
         {
             limit: 1,
             page: 1,
@@ -23,8 +23,11 @@ async function main() {
             // id: { $eq: '120162210202407171202250' }
             id: { $eq: 'blxonxv1m' }
         },
-        ['location', 'project', 'startDate', 'typeOf', 'superEvent.location.id', 'offers.itemOffered'],
-        []
+        [
+            'location', 'project', 'startDate', 'typeOf'
+            // 'superEvent.location.id'
+            // 'offers.itemOffered'
+        ]
     );
     // tslint:disable-next-line:no-null-keyword
     console.dir(events, { depth: null });

package/example/src/chevre/searchScreeningEventSeries.ts

@@ -13,7 +13,7 @@ async function main() {
 
     const eventRepo: chevre.repository.Event = await chevre.repository.Event.createInstance(mongoose.connection);
 
-    const events = await eventRepo.search(
+    const events = await eventRepo.projectFields(
         {
             limit: 100,
             page: 1,
@@ -23,8 +23,7 @@ async function main() {
             // id: { $eq: 'al6aff83y' },
             typeOfIn: [chevre.factory.eventType.ScreeningEventSeries]
         },
-        [],
-        []
+        ['eventStatus']
     );
     console.log(events);
     console.log(events.length, 'events found');

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

@@ -69,7 +69,7 @@ interface IAggregateEvent {
     statuses: IStatus[];
 }
 export import IMinimizedIndividualEvent = EventFactory.IMinimizedIndividualEvent;
-type IKeyOfProjection<T extends factory.eventType> = keyof factory.event.IEvent<T> | '_id' | '__v' | 'createdAt' | 'updatedAt' | 'aggregateEntranceGate' | 'aggregateOffer' | 'superEvent.location.id' | 'offers.itemOffered';
+type IKeyOfProjection<T extends factory.eventType> = Exclude<keyof factory.event.IEvent<T>, 'id'> | 'aggregateEntranceGate' | 'aggregateOffer' | 'superEvent.location.id' | 'offers.itemOffered';
 /**
  * minimizedEvent検索時のprojection候補
  * add(2024-07-18~)
@@ -91,7 +91,7 @@ export declare class EventRepo {
     createMany<T extends factory.eventType>(params: {
         attributes: factory.event.IAttributes<T>[];
         expectsNoContent: boolean;
-    }): Promise<factory.event.IEvent<T>[] | void>;
+    }): Promise<string[] | void>;
     /**
      * 特定の追加特性をキーにして、存在しなければ作成する(複数対応)
      * 存在すれば、eventStatusのみ更新する
@@ -162,9 +162,9 @@ export declare class EventRepo {
         id: string;
     }>;
     /**
-     * イベントを検索する
+     * イベントを検索する(inclusion projection)
      */
-    search<T extends factory.eventType>(params: ISearchConditions<T>, inclusion: IKeyOfProjection<T>[], exclusion?: IKeyOfProjection<T>[]): Promise<Omit<factory.event.IEvent<T>, 'aggregateEntranceGate' | 'aggregateOffer'>[]>;
+    projectFields<T extends factory.eventType>(params: ISearchConditions<T>, inclusion: IKeyOfProjection<T>[]): Promise<Omit<factory.event.IEvent<T>, 'aggregateEntranceGate' | 'aggregateOffer'>[]>;
     /**
      * IDのみで検索する
      * projectionなし
@@ -329,9 +329,9 @@ export declare class EventRepo {
     /**
      * 集計属性を更新する
      */
-    updateAggregationById<T extends factory.eventType>(params: {
+    updateAggregationById(params: {
         id: string;
-    }, update: IUpdateAggregateReservationParams): Promise<Pick<factory.event.IEvent<T>, 'id' | 'typeOf' | 'project'>>;
+    }, update: IUpdateAggregateReservationParams): Promise<void>;
     bulkWrite(bulkWriteOps: any[]): Promise<BulkWriteResult & {
         mongoose?: {
             validationErrors: import("mongoose").Error[];
@@ -345,7 +345,7 @@ export declare class EventRepo {
                 makesOffer: factory.event.screeningEvent.ISellerMakesOffer;
             };
         };
-    }): Promise<any>;
+    }): Promise<void>;
     deleteAvailableAtOrFrom(params: {
         id: string;
         offers: {
@@ -357,7 +357,7 @@ export declare class EventRepo {
                 };
             };
         };
-    }): Promise<any>;
+    }): Promise<void>;
     unsetUnnecessaryFields<T extends factory.eventType>(params: {
         filter: FilterQuery<factory.event.IEvent<T>>;
         $unset: IUnset<T>;

package/lib/chevre/repo/event.js

@@ -482,12 +482,14 @@ class EventRepo {
     createMany(params) {
         return __awaiter(this, void 0, void 0, function* () {
             const uniqid = yield Promise.resolve().then(() => require('uniqid'));
-            let docs;
+            // let docs: HydratedDocument<factory.event.IEvent<T>>[];
             const insertingDocs = params.attributes.map((p) => {
                 return Object.assign({ _id: uniqid() }, p);
             });
             try {
-                docs = yield this.eventModel.insertMany(insertingDocs);
+                yield this.eventModel.insertMany(insertingDocs, { rawResult: true } // rawResult(2024-08-02~)
+                );
+                // console.dir(insertResult, { depth: null });
             }
             catch (error) {
                 if (yield (0, errorHandler_1.isMongoError)(error)) {
@@ -500,7 +502,8 @@ class EventRepo {
             if (params.expectsNoContent) {
                 return;
             }
-            return docs.map((doc) => doc.toObject());
+            // return docs.map((doc) => doc.toObject<factory.event.IEvent<T>>());
+            return insertingDocs.map(({ _id }) => _id);
         });
     }
     /**
@@ -827,30 +830,62 @@ class EventRepo {
             // return <factory.event.IEvent<factory.eventType.ScreeningEvent>>doc.toObject();
         });
     }
+    // migrate to projectFields
+    // public async search<T extends factory.eventType>(
+    //     params: ISearchConditions<T>,
+    //     inclusion: IKeyOfProjection<T>[],
+    //     exclusion?: IKeyOfProjection<T>[]
+    // ): Promise<Omit<factory.event.IEvent<T>, 'aggregateEntranceGate' | 'aggregateOffer'>[]> {
+    //     const conditions = EventRepo.CREATE_MONGO_CONDITIONS<T>(params);
+    //     let projection: IProjection<T> = {};
+    //     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 query = this.eventModel.find<HydratedDocument<factory.event.IEvent<T>>>({ $and: conditions }, projection);
+    //     if (typeof params.limit === 'number' && params.limit > 0) {
+    //         const page: number = (typeof params.page === 'number' && params.page > 0) ? params.page : 1;
+    //         query.limit(params.limit)
+    //             .skip(params.limit * (page - 1));
+    //     }
+    //     // tslint:disable-next-line:no-single-line-block-comment
+    //     /* istanbul ignore else */
+    //     if (params.sort?.startDate !== undefined) {
+    //         query.sort({ startDate: params.sort.startDate });
+    //     }
+    //     return query.setOptions({ maxTimeMS: MONGO_MAX_TIME_MS })
+    //         .exec()
+    //         .then((docs) => docs.map((doc) => doc.toObject()));
+    // }
     /**
-     * イベントを検索する
+     * イベントを検索する(inclusion projection)
      */
-    search(params, inclusion, exclusion) {
+    projectFields(params, inclusion) {
         var _a;
         return __awaiter(this, void 0, void 0, function* () {
             const conditions = EventRepo.CREATE_MONGO_CONDITIONS(params);
             let projection = {};
+            const positiveProjectionFields = (Array.isArray(inclusion))
+                ? inclusion.filter((key) => key !== 'id' && key !== '_id')
+                : [];
             if (Array.isArray(inclusion) && inclusion.length > 0) {
-                inclusion.forEach((field) => {
-                    projection[field] = 1;
-                });
+                projection = Object.assign({ _id: 0, id: { $toString: '$_id' } }, Object.fromEntries(positiveProjectionFields.map((key) => ([key, 1]))));
             }
             else {
-                projection = {
-                    __v: 0,
-                    createdAt: 0,
-                    updatedAt: 0
-                };
-                if (Array.isArray(exclusion) && exclusion.length > 0) {
-                    exclusion.forEach((field) => {
-                        projection[field] = 0;
-                    });
-                }
+                // discontinue(2024-07-24~)
+                throw new factory.errors.ArgumentNull('inclusion', 'inclusion must be specified');
             }
             const query = this.eventModel.find({ $and: conditions }, projection);
             if (typeof params.limit === 'number' && params.limit > 0) {
@@ -872,8 +907,8 @@ class EventRepo {
             // console.log(explainResult);
             // return [];
             return query.setOptions({ maxTimeMS: settings_1.MONGO_MAX_TIME_MS })
-                .exec()
-                .then((docs) => docs.map((doc) => doc.toObject()));
+                .lean() // lean(2024-08-01~)
+                .exec();
         });
     }
     /**
@@ -948,10 +983,10 @@ class EventRepo {
      */
     cancel(params) {
         return __awaiter(this, void 0, void 0, function* () {
-            yield this.eventModel.findOneAndUpdate({
-                _id: params.id,
+            yield this.eventModel.updateOne({
+                _id: { $eq: params.id },
                 'project.id': { $eq: params.project.id }
-            }, { eventStatus: factory.eventStatusType.EventCancelled })
+            }, { $set: { eventStatus: factory.eventStatusType.EventCancelled } }, { rawResult: true })
                 .exec();
         });
     }
@@ -960,7 +995,7 @@ class EventRepo {
      */
     syncScreeningEventSeries2screeningEvents(params) {
         return __awaiter(this, void 0, void 0, function* () {
-            const superEvents = yield this.search({
+            const superEvents = yield this.projectFields({
                 limit: 1,
                 page: 1,
                 typeOf: factory.eventType.ScreeningEventSeries,
@@ -970,7 +1005,7 @@ class EventRepo {
                 'additionalProperty', 'alternativeHeadline', 'description', 'dubLanguage',
                 'endDate', 'headline', 'kanaName', 'location', 'name',
                 'soundFormat', 'startDate', 'subtitleLanguage', 'typeOf', 'videoFormat', 'workPerformed'
-            ], []);
+            ]);
             const superEventFromDB = superEvents.shift();
             if (superEventFromDB === undefined) {
                 throw new factory.errors.NotFound(factory.eventType.ScreeningEventSeries);
@@ -1123,23 +1158,18 @@ class EventRepo {
     /**
      * 集計属性を更新する
      */
-    updateAggregationById(params, update
-    // | IUpdateAggregateOfferParams // 廃止(2024-03-28)
-    // | IUpdateAggregateUseActionsParams // 廃止(2024-03-28)
-    ) {
+    updateAggregationById(params, update) {
         return __awaiter(this, void 0, void 0, function* () {
-            const doc = yield this.eventModel.findOneAndUpdate({ _id: params.id }, update, {
-                new: true,
-                projection: {
-                    typeOf: 1,
-                    project: 1
-                }
+            const doc = yield this.eventModel.findOneAndUpdate({ _id: { $eq: params.id } }, update, {
+                new: false,
+                projection: { _id: 1 }
             })
+                .lean()
                 .exec();
             if (doc === null) {
                 throw new factory.errors.NotFound(this.eventModel.modelName);
             }
-            return doc.toObject();
+            // return doc.toObject();
         });
     }
     bulkWrite(bulkWriteOps) {
@@ -1154,23 +1184,23 @@ class EventRepo {
     }
     addAvailableAtOrFrom(params) {
         return __awaiter(this, void 0, void 0, function* () {
-            return this.eventModel.findOneAndUpdate({ _id: { $eq: params.id } }, {
+            yield this.eventModel.updateOne({ _id: { $eq: params.id } }, {
                 $push: {
                     'offers.seller.makesOffer': params.offers.seller.makesOffer
                 }
-            })
+            }, { rawResult: true })
                 .exec();
         });
     }
     deleteAvailableAtOrFrom(params) {
         return __awaiter(this, void 0, void 0, function* () {
-            return this.eventModel.findOneAndUpdate({ _id: { $eq: params.id } }, {
+            yield this.eventModel.updateOne({ _id: { $eq: params.id } }, {
                 $pull: {
                     'offers.seller.makesOffer': {
                         'availableAtOrFrom.id': { $eq: params.offers.seller.makesOffer.availableAtOrFrom.id }
                     }
                 }
-            })
+            }, { rawResult: true })
                 .exec();
         });
     }

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

@@ -25,12 +25,12 @@ function aggregateOffers(params) {
             'location', 'project', 'startDate', 'typeOf', 'superEvent.location.id', 'offers.itemOffered'
         ] // projection(2024-07-21~)
         );
-        const eventCapacity = (yield repos.event.search({
+        const eventCapacity = (yield repos.event.projectFields({
             limit: 1,
             page: 1,
             id: { $eq: params.id },
             typeOf: params.typeOf
-        }, ['maximumAttendeeCapacity', 'remainingAttendeeCapacity'], [])).shift();
+        }, ['maximumAttendeeCapacity', 'remainingAttendeeCapacity'])).shift();
         debug('processing aggregateOffersByEvent...', eventCapacity);
         yield aggregateOffersByEvent({
             event: Object.assign(Object.assign(Object.assign({}, event), (typeof (eventCapacity === null || eventCapacity === void 0 ? void 0 : eventCapacity.maximumAttendeeCapacity) === 'number')
@@ -66,18 +66,16 @@ function aggregateOffersByEvent(params) {
             event,
             screeningRoom: screeningRoom
         })(repos);
-        debug('offers aggregated', aggregateOffer);
-        const update = {
-            $set: Object.assign({}, (typeof (aggregateOffer === null || aggregateOffer === void 0 ? void 0 : aggregateOffer.typeOf) === 'string') ? { aggregateOffer: aggregateOffer } : undefined)
-            // $unset: {
-            //     noExistingAttributeName: 1 // $unsetは空だとエラーになるので
-            // }
-        };
-        debug('update:', update);
-        // 廃止(2024-03-28~)
-        // const saveResult = await repos.event.updateAggregationById<typeof event.typeOf>({ id: event.id }, update);
-        // debug('aggregateOffersByEvent processd', saveResult);
-        // aggregateReservationsにも保管(2024-03-25~)
+        // const update: IUpdateAggregateReservationParams = {
+        //     $set: {
+        //         // updatedAt: new Date(), // $setオブジェクトが空だとMongoエラーになるので
+        //         ...(typeof aggregateOffer?.typeOf === 'string') ? { aggregateOffer: aggregateOffer } : undefined
+        //     }
+        //     // $unset: {
+        //     //     noExistingAttributeName: 1 // $unsetは空だとエラーになるので
+        //     // }
+        // };
+        // aggregateReservationsに保管(2024-03-25~)
         yield repos.aggregateReservation.save({
             project: event.project,
             reservationFor: {

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

@@ -40,7 +40,7 @@ function aggregateScreeningEvent(params) {
                     .add(-1, 'second')
                     .toDate();
                 if (event.typeOf === factory.eventType.Event) {
-                    aggregatingEvents = yield repos.event.search({
+                    aggregatingEvents = yield repos.event.projectFields({
                         limit: 100,
                         page: 1,
                         project: { id: { $eq: event.project.id } },
@@ -49,12 +49,10 @@ function aggregateScreeningEvent(params) {
                         startFrom: startFrom,
                         startThrough: startThrough,
                         location: { branchCode: { $eq: event.location.branchCode } }
-                    }, ['location', 'project', 'startDate', 'typeOf', 'superEvent.location.id', 'offers.itemOffered'], []
-                    // PROJECTION_MINIMIZED_EVENT
-                    );
+                    }, ['location', 'project', 'startDate', 'typeOf', 'superEvent.location.id', 'offers.itemOffered']);
                 }
                 else if (event.typeOf === factory.eventType.ScreeningEvent) {
-                    aggregatingEvents = yield repos.event.search({
+                    aggregatingEvents = yield repos.event.projectFields({
                         limit: 100,
                         page: 1,
                         project: { id: { $eq: event.project.id } },
@@ -63,9 +61,7 @@ function aggregateScreeningEvent(params) {
                         startFrom: startFrom,
                         startThrough: startThrough,
                         location: { branchCode: { $eq: event.location.branchCode } }
-                    }, ['location', 'project', 'startDate', 'typeOf', 'superEvent.location.id', 'offers.itemOffered'], []
-                    // PROJECTION_MINIMIZED_EVENT
-                    );
+                    }, ['location', 'project', 'startDate', 'typeOf', 'superEvent.location.id', 'offers.itemOffered']);
                 }
                 // ID指定されたイベントについてはEventScheduledでなくても集計したいので、集計対象を調整
                 aggregatingEvents = aggregatingEvents.filter((e) => e.id !== event.id);

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

@@ -33,19 +33,16 @@ function aggregateUseActionsOnEvent(params) {
             entranceGates
         })(repos);
         debug('entrances aggregated', aggregateEntranceGate);
-        const update = {
-            $set: {
-                // updatedAt: new Date(), // $setオブジェクトが空だとMongoエラーになるので
-                aggregateEntranceGate
-            }
-            // $unset: {
-            //     noExistingAttributeName: 1 // $unsetは空だとエラーになるので
-            // }
-        };
-        debug('update:', update);
-        // 廃止(2024-03-28~)
-        // await repos.event.updateAggregationById({ id: event.id }, update);
-        // aggregateReservationsにも保管(2024-03-25~)
+        // const update: IUpdateAggregateReservationParams = {
+        //     $set: {
+        //         // updatedAt: new Date(), // $setオブジェクトが空だとMongoエラーになるので
+        //         aggregateEntranceGate
+        //     }
+        //     // $unset: {
+        //     //     noExistingAttributeName: 1 // $unsetは空だとエラーになるので
+        //     // }
+        // };
+        // aggregateReservationsに保管(2024-03-25~)
         yield repos.aggregateReservation.save({
             project: event.project,
             reservationFor: {

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

@@ -138,14 +138,12 @@ function searchEventTicketOffersByEvent(params) {
         let soundFormatTypes = [];
         let videoFormatTypes = [];
         if (event.typeOf === factory.eventType.ScreeningEvent) {
-            const superEvents = yield repos.event.search({
+            const superEvents = yield repos.event.projectFields({
                 limit: 1,
                 page: 1,
                 id: { $eq: event.superEvent.id },
                 typeOf: factory.eventType.ScreeningEventSeries
-            }, ['soundFormat', 'videoFormat'], []
-            // { soundFormat: 1, videoFormat: 1 }
-            );
+            }, ['soundFormat', 'videoFormat']);
             const superEvent = superEvents.shift();
             if (superEvent === undefined) {
                 throw new factory.errors.NotFound(factory.eventType.ScreeningEventSeries);
@@ -362,14 +360,12 @@ function searchOfferAppliesToMovieTicket(params) {
         // let soundFormatTypes: string[] = [];
         let videoFormatTypes = [];
         if (event.typeOf === factory.eventType.ScreeningEvent) {
-            const superEvents = yield repos.event.search({
+            const superEvents = yield repos.event.projectFields({
                 limit: 1,
                 page: 1,
                 id: { $eq: event.superEvent.id },
                 typeOf: factory.eventType.ScreeningEventSeries
-            }, ['soundFormat', 'videoFormat'], []
-            // { soundFormat: 1, videoFormat: 1 }
-            );
+            }, ['soundFormat', 'videoFormat']);
             const superEvent = superEvents.shift();
             if (superEvent === undefined) {
                 throw new factory.errors.NotFound(factory.eventType.ScreeningEventSeries);

package/lib/chevre/service/offer/eventServiceByCOA/acceptOffer.js

@@ -23,7 +23,7 @@ function findCOAInfo(params) {
             typeOf: factory.eventType.ScreeningEvent,
             id: { $eq: params.id }
         };
-        const event = (yield repos.event.search(searchConditions, ['coaInfo'], [])).shift();
+        const event = (yield repos.event.projectFields(searchConditions, ['coaInfo'])).shift();
         if (event === undefined) {
             throw new factory.errors.NotFound(factory.eventType.ScreeningEvent);
         }

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

@@ -129,17 +129,14 @@ function createInformTasks(params) {
         let events4inform;
         const informEvents = settings.onEventChanged.informEvent;
         if (params.typeOf === factory.eventType.Event) {
-            const eventsFromDB = yield repos.event.search({
+            const eventsFromDB = yield repos.event.projectFields({
                 id: { $in: params.ids },
                 typeOf: params.typeOf
             }, [
                 'project', 'organizer', 'typeOf', 'name', 'doorTime', 'endDate',
                 'eventStatus', 'location', 'startDate', 'additionalProperty'
-            ], // inclusion(2024-07-30~)
-            [
-            // 'aggregateEntranceGate', 'aggregateOffer', 'aggregateReservation',
-            // 'remainingAttendeeCapacity', 'checkInCount', 'attendeeCount'
-            ]);
+            ] // inclusion(2024-07-30~)
+            );
             // 最適化(2024-03-26~)
             events4inform = eventsFromDB.map(({ project, organizer, typeOf, name, doorTime, endDate, eventStatus, location, startDate, id, additionalProperty }) => {
                 return {
@@ -149,17 +146,14 @@ function createInformTasks(params) {
             });
         }
         else if (params.typeOf === factory.eventType.ScreeningEvent) {
-            const screeningEvents4inform = yield repos.event.search({
+            const screeningEvents4inform = yield repos.event.projectFields({
                 id: { $in: params.ids },
                 typeOf: params.typeOf
             }, [
                 'project', 'organizer', 'typeOf', 'name', 'doorTime', 'endDate',
                 'eventStatus', 'location', 'startDate', 'superEvent', 'offers', 'additionalProperty'
-            ], // inclusion(2024-07-30~)
-            [
-            // 'aggregateEntranceGate', 'aggregateOffer', 'aggregateReservation',
-            // 'remainingAttendeeCapacity', 'checkInCount', 'attendeeCount'
-            ]);
+            ] // inclusion(2024-07-30~)
+            );
             // 最適化(2024-03-22~)
             events4inform = screeningEvents4inform.map(({ project, organizer, typeOf, name, doorTime, endDate, eventStatus, location, startDate, superEvent, offers, id, additionalProperty }) => {
                 var _a;
@@ -187,17 +181,15 @@ function createInformTasks(params) {
             });
         }
         else {
-            const screeningEventSeries4inform = yield repos.event.search({
+            const screeningEventSeries4inform = yield repos.event.projectFields({
                 id: { $in: params.ids },
                 typeOf: params.typeOf
             }, [
                 'project', 'organizer', 'typeOf', 'name', 'location', 'videoFormat', 'soundFormat', 'workPerformed', 'kanaName', 'eventStatus',
                 'endDate', 'startDate', 'additionalProperty', 'subtitleLanguage', 'dubLanguage',
                 'alternativeHeadline', 'description', 'duration', 'headline'
-            ], // inclusion(2024-07-30~)
-            [
-            // 'offers'
-            ]);
+            ] // inclusion(2024-07-30~)
+            );
             // 最適化(2024-03-25~)
             events4inform = screeningEventSeries4inform.map(({ project, organizer, typeOf, name, location, id, videoFormat, soundFormat, workPerformed, kanaName, eventStatus, endDate, startDate, additionalProperty, subtitleLanguage, dubLanguage, alternativeHeadline, description, duration, headline }) => {
                 return Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign({ project, organizer, typeOf, name, location, id, videoFormat, soundFormat, workPerformed, kanaName, eventStatus }, (endDate !== undefined) ? { endDate } : undefined), (startDate !== undefined) ? { startDate } : undefined), (Array.isArray(additionalProperty)) ? { additionalProperty } : undefined), (subtitleLanguage !== undefined) ? {} : undefined), (dubLanguage !== undefined) ? { dubLanguage } : undefined), (alternativeHeadline !== undefined) ? { alternativeHeadline } : undefined), (description !== undefined) ? { description } : undefined), (typeof duration === 'string') ? { duration } : undefined), (headline !== undefined) ? { headline } : undefined);

package/lib/chevre/service/offer.d.ts

@@ -20,6 +20,7 @@ export declare function addOffers2Seat(params: {
      */
     priceSpecs: ICategoryCodeChargeSpecification[];
 }): factory.place.seat.IPlaceWithOffer;
+type ISeatAsEventOffer = Pick<factory.place.seat.IPlaceWithOffer, 'branchCode' | 'containedInPlace' | 'offers' | 'seatingType' | 'typeOf' | 'name'>;
 /**
  * イベントに対する座席オファーを検索する
  */
@@ -43,4 +44,4 @@ export declare function searchEventSeatOffersWithPaging(params: {
     priceSpecification: PriceSpecificationRepo;
     stockHolder: StockHolderRepo;
     seat: SeatRepo;
-}) => Promise<Pick<factory.place.seat.IPlaceWithOffer, 'branchCode' | 'containedInPlace' | 'offers' | 'seatingType' | 'typeOf'>[]>;
+}) => Promise<ISeatAsEventOffer[]>;

package/lib/chevre/service/offer.js

@@ -28,17 +28,16 @@ function addOffers2Seat(params) {
     const seatingTypes = (Array.isArray(params.seat.seatingType))
         ? params.seat.seatingType
         : (typeof params.seat.seatingType === 'string' && params.seat.seatingType.length > 0) ? [params.seat.seatingType] : [];
-    const priceComponent = params.priceSpecs.filter((priceSpec) => {
+    const priceComponent = params.priceSpecs.filter(({ appliesToCategoryCode }) => {
         // 適用カテゴリーコードに座席タイプが含まれる価格仕様を検索
-        return (Array.isArray(priceSpec.appliesToCategoryCode))
-            && priceSpec.appliesToCategoryCode.some((categoryCode) => {
-                return seatingTypes.includes(categoryCode.codeValue);
-            });
+        return (Array.isArray(appliesToCategoryCode))
+            && appliesToCategoryCode.some(({ codeValue }) => seatingTypes.includes(codeValue));
     })
         .map(({ appliesToCategoryCode, name, price, priceCurrency, typeOf, valueAddedTaxIncluded }) => {
         return {
-            appliesToCategoryCode,
-            // id,
+            // optimize appliesToCategoryCode(2024-08-02~)
+            // appliesToCategoryCode,
+            appliesToCategoryCode: appliesToCategoryCode.map(({ codeValue, inCodeSet }) => ({ codeValue, inCodeSet, typeOf: 'CategoryCode' })),
             name, price, priceCurrency, typeOf, valueAddedTaxIncluded
         };
     });
@@ -50,11 +49,8 @@ function addOffers2Seat(params) {
     if (typeof params.availability === 'string') {
         availability = params.availability;
     }
-    return Object.assign(Object.assign({}, params.seat), { offers: [Object.assign({ 
-                // typeOf: factory.offerType.Offer, // optimize(2023-11-08~)
-                availability }, (priceSpecification.priceComponent.length > 0)
-                ? { priceSpecification } // priceComponentの存在する場合のみ追加(2023-11-08~)
-                : undefined)] });
+    return Object.assign(Object.assign({}, params.seat), { offers: [Object.assign({ availability }, (priceSpecification.priceComponent.length > 0) ? { priceSpecification } : undefined // priceComponentの存在する場合のみ追加(2023-11-08~)
+            )] });
 }
 exports.addOffers2Seat = addOffers2Seat;
 /**
@@ -71,14 +67,6 @@ function searchEventSeatOffersWithPaging(params) {
         const eventOffers = event.offers;
         const reservedSeatsAvailable = ((_b = (_a = eventOffers === null || eventOffers === void 0 ? void 0 : eventOffers.itemOffered.serviceOutput) === null || _a === void 0 ? void 0 : _a.reservedTicket) === null || _b === void 0 ? void 0 : _b.ticketedSeat) !== undefined;
         if (reservedSeatsAvailable) {
-            // 座席タイプ価格仕様を検索
-            const priceSpecs = yield repos.priceSpecification.search({
-                project: { id: { $eq: event.project.id } },
-                typeOf: factory.priceSpecificationType.CategoryCodeChargeSpecification,
-                appliesToCategoryCode: {
-                    inCodeSet: { identifier: { $eq: factory.categoryCode.CategorySetIdentifier.SeatingType } }
-                }
-            });
             const roomBranchCode = String((_d = (_c = eventOffers.itemOffered) === null || _c === void 0 ? void 0 : _c.availableChannel) === null || _d === void 0 ? void 0 : _d.serviceLocation.branchCode);
             const movieTheaterBranchCode = String((_f = (_e = eventOffers.itemOffered) === null || _e === void 0 ? void 0 : _e.availableChannel) === null || _f === void 0 ? void 0 : _f.serviceLocation.containedInPlace.branchCode);
             const seats = yield repos.seat.searchSeats(Object.assign(Object.assign({}, params), { project: { id: { $eq: event.project.id } }, containedInPlace: {
@@ -109,6 +97,28 @@ function searchEventSeatOffersWithPaging(params) {
                         };
                     })
                 });
+                // tslint:disable-next-line:no-suspicious-comment
+                // TODO 必要な座席区分のみ検索?
+                // const uniqueSeatingTypes: string[] = [...new Set(seats.reduce<string[]>(
+                //     (a, { seatingType }) => {
+                //         if (Array.isArray(seatingType)) {
+                //             return [...a, ...seatingType];
+                //         } else if (typeof seatingType === 'string') {
+                //             return [...a, seatingType];
+                //         } else {
+                //             return a;
+                //         }
+                //     },
+                //     []
+                // ))];
+                // 座席タイプ価格仕様を検索
+                const priceSpecs = yield repos.priceSpecification.search({
+                    project: { id: { $eq: event.project.id } },
+                    typeOf: factory.priceSpecificationType.CategoryCodeChargeSpecification,
+                    appliesToCategoryCode: {
+                        inCodeSet: { identifier: { $eq: factory.categoryCode.CategorySetIdentifier.SeatingType } }
+                    }
+                });
                 offers = seats.map((seat, index) => {
                     return addOffers2Seat({
                         seat,

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

@@ -110,10 +110,10 @@ function onReservationCheckedIn(params) {
             yield Promise.all(reservationForIds.map((reservationForId) => __awaiter(this, void 0, void 0, function* () {
                 var _b;
                 // すでにイベントが削除されているケースに備えて、イベント存在検証(2023-09-12~)
-                const existingEvents = yield repos.event.search({
+                const existingEvents = yield repos.event.projectFields({
                     id: { $eq: reservationForId },
                     typeOfIn: [factory.eventType.Event, factory.eventType.ScreeningEvent] // 指定しないとArgumentNullError
-                }, ['typeOf'], []);
+                }, ['typeOf']);
                 if (existingEvents.length > 0) {
                     yield (0, onEventChanged_1.createAggregateScreeningEventIfNotExist)({
                         project: { id: params.project.id },

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

@@ -55,10 +55,10 @@ function preStart(params) {
         // イベント開始日時取得
         let events = [];
         if (eventIds.length > 0) {
-            events = yield repos.event.search({
+            events = yield repos.event.projectFields({
                 id: { $in: eventIds },
                 typeOf: factory.eventType.ScreeningEvent
-            }, ['startDate'], []);
+            }, ['startDate']);
         }
         let returnPolicies = seller.hasMerchantReturnPolicy;
         if (!Array.isArray(returnPolicies)) {

package/package.json

@@ -110,5 +110,5 @@
     "postversion": "git push origin --tags",
     "prepublishOnly": "npm run clean && npm run build && npm test && npm run doc"
   },
-  "version": "22.1.0-alpha.3"
+  "version": "22.1.0-alpha.5"
 }