@cinerino/sdk 17.0.0 → 17.1.0

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

@@ -1,7 +1,7 @@
 import { factory } from '../../factory';
 type IKeyOfProjection = keyof factory.event.screeningEvent.IEvent;
 type IProjection = Partial<Record<IKeyOfProjection, 0>>;
-export type IFindParams = Pick<factory.event.screeningEvent.ISearchConditions, 'limit' | 'page' | 'sort' | 'additionalProperty' | 'eventStatuses' | 'id' | 'identifiers' | 'inSessionFrom' | 'inSessionThrough' | 'location' | 'offers' | 'startFrom' | 'startThrough' | 'superEvent'> & {
+export type IFindParams = Pick<factory.event.screeningEvent.ISearchConditions, 'limit' | 'page' | 'sort' | 'additionalProperty' | 'eventStatuses' | 'id' | 'identifiers' | 'inSessionFrom' | 'inSessionThrough' | 'location' | 'startFrom' | 'startThrough' | 'superEvent'> & {
     typeOf: factory.eventType.ScreeningEvent;
     $projection?: IProjection;
     $minimumProjection?: boolean;
@@ -9,6 +9,24 @@ export type IFindParams = Pick<factory.event.screeningEvent.ISearchConditions, '
      * offer.seller.makesOfferをアプリケーションIDでfilterする(max:2)
      */
     sellerMakesOfferAvailableAtIn?: string[];
+    offers?: Pick<factory.event.screeningEvent.IOfferSearchConditions, 'seller'> & {
+        /**
+         * apiリクエストクライアントがseller.makesOffer.$elemMatchに含まれるものを検索
+         */
+        availableFrom?: Date;
+        /**
+         * apiリクエストクライアントがseller.makesOffer.$elemMatchに含まれるものを検索
+         */
+        availableThrough?: Date;
+        /**
+         * apiリクエストクライアントがseller.makesOffer.$elemMatchに含まれるものを検索
+         */
+        validFrom?: Date;
+        /**
+         * apiリクエストクライアントがseller.makesOffer.$elemMatchに含まれるものを検索
+         */
+        validThrough?: Date;
+    };
 };
 /**
  * イベントのサブカタログ検索結果

package/lib/abstract/chevreConsole/event.d.ts

@@ -19,7 +19,7 @@ export declare class EventService extends Service {
     /**
      * イベント検索
      */
-    projectFields(params: Omit<factory.event.screeningEvent.ISearchConditions, 'project' | 'organizer'> & {
+    projectFields(params: Pick<factory.event.screeningEvent.ISearchConditions, 'additionalProperty' | 'endFrom' | 'endThrough' | 'eventStatuses' | 'id' | 'identifiers' | 'inSessionFrom' | 'inSessionThrough' | 'limit' | 'location' | 'offers' | 'page' | 'sort' | 'startFrom' | 'startThrough' | 'superEvent' | 'typeOf'> & {
         typeOf: factory.eventType.ScreeningEvent;
         $projection?: IProjection;
     }): Promise<IAdminSearchedEvent[]>;

package/lib/abstract/cinerino/service/event.d.ts

@@ -20,13 +20,10 @@ type IScreeningEventOffer4COA = Omit<factory.event.screeningEvent.IOffer4COA, 's
 type IScreeningEventExtensibleOffer = Omit<factory.event.screeningEvent.IExtensibleEventOffer, 'seller'> & {
     seller: ISeller;
 };
-type IEvent = Omit<factory.event.screeningEvent.IEvent, 'offers' | 'superEvent'> & {
+type IEventAsFindResult = Pick<factory.event.screeningEvent.IEvent, 'id' | 'additionalProperty' | 'aggregateReservation' | 'attendeeCount' | 'checkInCount' | 'coaInfo' | 'doorTime' | 'endDate' | 'eventStatus' | 'identifier' | 'location' | 'maximumAttendeeCapacity' | 'name' | 'organizer' | 'project' | 'remainingAttendeeCapacity' | 'startDate' | 'typeOf' | 'maximumPhysicalAttendeeCapacity'> & {
     offers?: IScreeningEventOffer | IScreeningEventOffer4COA | IScreeningEventExtensibleOffer;
     superEvent: Omit<factory.event.screeningEvent.ISuperEvent, 'soundFormat'>;
 };
-type IMinimizedEvent = Pick<factory.event.screeningEvent.IEvent, 'additionalProperty' | 'doorTime' | 'endDate' | 'eventStatus' | 'id' | 'location' | 'maximumAttendeeCapacity' | 'remainingAttendeeCapacity' | 'startDate'> & {
-    superEvent: Omit<factory.event.screeningEvent.ISuperEvent, 'soundFormat'>;
-};
 type IEventSeriesAsFindResult = Pick<factory.eventSeries.IEvent, 'additionalProperty' | 'alternativeHeadline' | 'coaInfo' | 'description' | 'dubLanguage' | 'duration' | 'endDate' | 'eventStatus' | 'headline' | 'identifier' | 'kanaName' | 'location' | 'name' | 'offers' | 'organizer' | 'project' | 'soundFormat' | 'startDate' | 'subtitleLanguage' | 'typeOf' | 'workPerformed' | 'subEvent' | 'id'>;
 /**
  * COA券種オファーインターフェース
@@ -119,9 +116,9 @@ export interface ICOATicketOffer {
 export declare class EventService extends Service {
     constructor(options: IAdditionalOptions & Pick<IOptions, 'auth' | 'endpoint' | 'transporter' | 'project' | 'defaultPath'>);
     /**
-     * イベント検索
+     * イベント(公開属性)検索
      */
-    search(params: Pick<IFindParams, 'limit' | 'page' | 'sort' | 'additionalProperty' | 'eventStatuses' | 'id' | 'identifiers' | 'inSessionFrom' | 'inSessionThrough' | 'location' | 'offers' | 'startFrom' | 'startThrough' | 'superEvent' | '$projection' | 'sellerMakesOfferAvailableAtIn' | 'typeOf'>): Promise<ISearchResult<IEvent[]>>;
+    findEvents(params: Pick<IFindParams, 'limit' | 'page' | 'sort' | 'additionalProperty' | 'eventStatuses' | 'id' | 'identifiers' | 'inSessionFrom' | 'inSessionThrough' | 'location' | 'offers' | 'startFrom' | 'startThrough' | 'superEvent' | '$projection' | 'sellerMakesOfferAvailableAtIn' | 'typeOf'>): Promise<IEventAsFindResult[]>;
     /**
      * 施設コンテンツ検索
      */
@@ -131,13 +128,6 @@ export declare class EventService extends Service {
             [key in keyof factory.eventSeries.IEvent]?: 0;
         };
     }): Promise<IEventSeriesAsFindResult[]>;
-    /**
-     * イベント検索(最小限の属性)
-     */
-    projectMinimumFields(params: Omit<factory.event.screeningEvent.ISearchConditions, 'project' | 'organizer' | 'typeOfIn'> & {
-        typeOf: factory.eventType.ScreeningEvent;
-        $projection?: never;
-    }): Promise<IMinimizedEvent[]>;
     /**
      * イベント集計検索
      */
@@ -158,7 +148,7 @@ export declare class EventService extends Service {
          * 興行イベント
          */
         typeOf: factory.eventType.ScreeningEvent;
-    }): Promise<IEvent>;
+    }): Promise<IEventAsFindResult>;
     /**
      * イベントに対する座席検索
      * ルームの複数セクション非対応

package/lib/abstract/cinerino/service/event.js

@@ -12,33 +12,11 @@ class EventService extends service_1.Service {
         super({ ...options, retryableStatusCodes: [http_status_1.status.BAD_GATEWAY, http_status_1.status.FORBIDDEN, http_status_1.status.UNAUTHORIZED] });
     }
     /**
-     * イベント検索
+     * イベント(公開属性)検索
      */
-    async search(params) {
-        // separate ScreeningEventSeries(2024-10-21~)
-        if (params?.typeOf !== factory_1.factory.eventType.ScreeningEvent) {
-            throw new factory_1.factory.errors.Argument('typeOf', `typeOf must be ${factory_1.factory.eventType.ScreeningEvent}`);
-        }
-        else {
-            return this.fetch({
-                uri: '/events',
-                method: 'GET',
-                qs: params,
-                expectedStatusCodes: [http_status_1.status.OK]
-            })
-                .then(async (response) => {
-                return {
-                    data: await response.json()
-                };
-            });
-        }
-    }
-    /**
-     * 施設コンテンツ検索
-     */
-    async searchEventSeries(params) {
+    async findEvents(params) {
         return this.fetch({
-            uri: '/eventSeries',
+            uri: '/events',
             method: 'GET',
             qs: params,
             expectedStatusCodes: [http_status_1.status.OK]
@@ -46,22 +24,39 @@ class EventService extends service_1.Service {
             .then(async (response) => response.json());
     }
     /**
-     * イベント検索(最小限の属性)
+     * 施設コンテンツ検索
      */
-    async projectMinimumFields(params) {
-        // $minimumProjectionなので$projectionは無効
-        const { $projection, ...query } = params; // eslint-disable-line @typescript-eslint/no-unused-vars
+    async searchEventSeries(params) {
         return this.fetch({
-            uri: '/events',
+            uri: '/eventSeries',
             method: 'GET',
-            qs: {
-                ...query,
-                $minimumProjection: true
-            },
+            qs: params,
             expectedStatusCodes: [http_status_1.status.OK]
         })
             .then(async (response) => response.json());
     }
+    // /**
+    //  * イベント検索(最小限の属性)
+    //  */
+    // public async projectMinimumFields(
+    //     params: Omit<factory.event.screeningEvent.ISearchConditions, 'project' | 'organizer' | 'typeOfIn'> & {
+    //         typeOf: factory.eventType.ScreeningEvent;
+    //         $projection?: never; // $minimumProjectionなので$projectionは無効
+    //     }
+    // ): Promise<IMinimizedEvent[]> {
+    //     // $minimumProjectionなので$projectionは無効
+    //     const { $projection, ...query } = params; // eslint-disable-line @typescript-eslint/no-unused-vars
+    //     return this.fetch({
+    //         uri: '/events',
+    //         method: 'GET',
+    //         qs: {
+    //             ...query,
+    //             $minimumProjection: true
+    //         },
+    //         expectedStatusCodes: [status.OK]
+    //     })
+    //         .then(async (response) => response.json());
+    // }
     /**
      * イベント集計検索
      */
@@ -87,20 +82,12 @@ class EventService extends service_1.Service {
         ].includes(typeOf)) {
             throw new factory_1.factory.errors.Argument('typeOf', 'invalid event type');
         }
-        // reimplement using search(2025-05-19~)
-        // return this.fetch({
-        //     uri: `/events/${encodeURIComponent(String(id))}`,
-        //     method: 'GET',
-        //     expectedStatusCodes: [status.OK],
-        //     qs: { typeOf }
-        // })
-        //     .then(async (response) => response.json());
-        const event = (await this.search({
+        const event = (await this.findEvents({
             limit: 1,
             page: 1,
             typeOf,
             id: { $eq: String(id) }
-        })).data.shift();
+        })).shift();
         if (event === undefined) {
             throw new factory_1.factory.errors.NotFound(typeOf);
         }