@chevre/domain 22.0.0-alpha.12 → 22.0.0-alpha.13

package/example/src/chevre/searchEvents.ts

@@ -6,7 +6,7 @@ import { chevre } from '../../../lib/index';
 const diff = process.hrtime(startTime);
 console.log(`importing chevre took ${diff[0]} seconds and ${diff[1]} nanoseconds.`);
 
-const PROJECT_ID = process.env.PROJECT_ID;
+// const PROJECT_ID = process.env.PROJECT_ID;
 
 async function main() {
     await mongoose.connect(<string>process.env.MONGOLAB_URI, { autoIndex: false });
@@ -15,18 +15,19 @@ async function main() {
 
     const events = await eventRepo.search<chevre.factory.eventType.ScreeningEvent>(
         {
-            limit: 100,
+            limit: 1,
             page: 1,
             // sort: { startDate: 1 },
             typeOf: chevre.factory.eventType.ScreeningEvent,
-            project: { id: { $eq: PROJECT_ID } }
-            // id: { $eq: 'al6aff83y' },
-            // typeOfIn: [chevre.factory.eventType.Event, chevre.factory.eventType.ScreeningEvent]
+            // project: { id: { $eq: PROJECT_ID } },
+            // id: { $eq: '120162210202407171202250' }
+            id: { $eq: 'blxonxv1m' }
         },
-        ['_id', 'name'],
+        ['_id', 'project', 'typeOf', 'startDate', 'superEvent.id', 'offers.itemOffered.id', 'offers.offeredThrough'],
         []
     );
-    console.log(events);
+    // tslint:disable-next-line:no-null-keyword
+    console.dir(events, { depth: null });
     console.log(events.length, 'events found');
 }
 

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

@@ -1,5 +1,7 @@
 import * as factory from '../factory';
-export type IMinimizedIndividualEvent<T extends factory.eventType.ScreeningEvent | factory.eventType.Event> = T extends factory.eventType.ScreeningEvent ? Pick<factory.event.IEvent<T>, 'project' | 'organizer' | 'id' | 'typeOf' | 'additionalProperty' | 'name' | 'doorTime' | 'endDate' | 'eventStatus' | 'location' | 'startDate' | 'superEvent' | 'offers' | 'coaInfo' | 'identifier'> : T extends factory.eventType.Event ? Pick<factory.event.IEvent<T>, 'project' | 'organizer' | 'id' | 'typeOf' | 'additionalProperty' | 'name' | 'doorTime' | 'endDate' | 'eventStatus' | 'location' | 'startDate' | 'offers'> : never;
+export type IMinimizedIndividualEvent<T extends factory.eventType.ScreeningEvent | factory.eventType.Event> = T extends factory.eventType.ScreeningEvent ? Pick<factory.event.IEvent<T>, 'project' | 'organizer' | 'id' | 'typeOf' | 'additionalProperty' | 'name' | 'doorTime' | 'endDate' | 'eventStatus' | 'location' | 'startDate' | 'superEvent' | 'offers' | 'coaInfo' | 'identifier'> : T extends factory.eventType.Event ? Pick<factory.event.IEvent<T>, 'project' | 'organizer' | 'id' | 'typeOf' | 'additionalProperty' | 'name' | 'doorTime' | 'endDate' | 'eventStatus' | 'location' | 'startDate' | 'offers'> & {
+    superEvent?: never;
+} : never;
 /**
  * 興行イベントのsuperEventを作成する
  */

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

@@ -68,7 +68,7 @@ interface IStatus {
 interface IAggregateEvent {
     statuses: IStatus[];
 }
-type IKeyOfProjection<T extends factory.eventType> = keyof factory.event.IEvent<T> | '_id' | '__v' | 'createdAt' | 'updatedAt' | 'aggregateEntranceGate' | 'aggregateOffer';
+type IKeyOfProjection<T extends factory.eventType> = keyof factory.event.IEvent<T> | '_id' | '__v' | 'createdAt' | 'updatedAt' | 'aggregateEntranceGate' | 'aggregateOffer' | 'superEvent.id' | 'offers.itemOffered.id' | 'offers.offeredThrough';
 type IUnset<T extends factory.eventType> = {
     [key in keyof factory.event.IEvent<T>]?: 1;
 };

package/lib/chevre/service/assetTransaction/reserve/start.js

@@ -127,7 +127,7 @@ function createObjectAttributes(params, options) {
             // 興行オファー検索
             const searchEventTicketOffersResult = yield OfferService.event.searchEventTicketOffers({
                 ids: acceptedOfferIds,
-                event: { id: event.id },
+                event: { id: event.id, typeOf: event.typeOf },
                 // 対応アプリケーション条件追加(2023-01-27~)
                 store: { id: (_a = params.availableAtOrFrom) === null || _a === void 0 ? void 0 : _a.id },
                 priceSpecification: {},

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

@@ -93,7 +93,10 @@ function validateCreateRequest(params) {
         // const event = await repos.event.findMinimizedIndividualEventById<factory.eventType.ScreeningEvent>({
         //     id: params.object.reservationFor.id
         // });
-        const event = { id: params.object.reservationFor.id };
+        const event = {
+            id: params.object.reservationFor.id,
+            typeOf: factory.eventType.ScreeningEvent // ひとまずfix(2024-07-17~)
+        };
         return { transaction, event };
     });
 }
@@ -131,7 +134,7 @@ function validateAcceptedOffers(params) {
             const searchEventTicketOffersResult = yield (0, searchEventTicketOffers_1.searchEventTicketOffers)({
                 // 受け入れたオファーIDだけ取得する(2023-01-26~)
                 ids: offerIds,
-                event: { id: params.event.id },
+                event: { id: params.event.id, typeOf: params.event.typeOf },
                 store: params.store,
                 priceSpecification: {},
                 includedInDataCatalog: { id: '' },

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

@@ -30,6 +30,7 @@ declare function searchEventTicketOffers(params: {
      */
     event: {
         id: string;
+        typeOf: factory.eventType.Event | factory.eventType.ScreeningEvent;
     };
     /**
      * どのアプリケーションに対して

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

@@ -172,7 +172,6 @@ function searchEventTicketOffersByEvent(params) {
             withSortIndex: params.addSortIndex,
             useIncludeInDataCatalog: params.useIncludeInDataCatalog
         })(repos);
-        // 冗長な検索について最適化(2023-03-03~)
         const { soundFormatChargeSpecs, videoFormatChargeSpecs, movieTicketTypeChargeSpecs } = yield searchPriceSpecs4event({
             project: { id: event.project.id },
             soundFormatTypes,
@@ -312,7 +311,27 @@ function checkAvailability(params) {
  */
 function searchEventTicketOffers(params) {
     return (repos) => __awaiter(this, void 0, void 0, function* () {
-        const event = yield repos.event.findMinimizedIndividualEventById({ id: params.event.id });
+        // optimize projection(2024-07-17~)
+        let event;
+        // event = await repos.event.findMinimizedIndividualEventById({ id: params.event.id });
+        const eventType = params.event.typeOf;
+        if (eventType === factory.eventType.Event) {
+            event = (yield repos.event.search({
+                limit: 1, page: 1,
+                id: { $eq: params.event.id },
+                typeOf: eventType
+            }, ['_id', 'project', 'typeOf', 'startDate', 'offers.itemOffered.id', 'offers.offeredThrough'], [])).shift();
+        }
+        else if (eventType === factory.eventType.ScreeningEvent) {
+            event = (yield repos.event.search({
+                limit: 1, page: 1,
+                id: { $eq: params.event.id },
+                typeOf: eventType
+            }, ['_id', 'project', 'typeOf', 'startDate', 'superEvent.id', 'offers.itemOffered.id', 'offers.offeredThrough'], [])).shift();
+        }
+        if (event === undefined) {
+            throw new factory.errors.NotFound(params.event.typeOf);
+        }
         let offers;
         let unitPriceOffers;
         const eventOffers = event.offers;

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.0.0-alpha.12"
+  "version": "22.0.0-alpha.13"
 }