@chevre/factory 10.5.0-alpha.0 → 10.5.0-alpha.1

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

@@ -191,7 +191,9 @@ export type ICreateParams = Pick<IAttributes, 'name' | 'duration' | 'endDate' |
 /**
  * 検索条件
  */
-export interface ISearchConditions extends Pick<IBaseSearchConditions<EventType.ScreeningEventSeries>, 'additionalProperty' | 'endFrom' | 'endThrough' | 'eventStatuses' | 'id' | 'inSessionFrom' | 'inSessionThrough' | 'limit' | 'name' | 'organizer' | 'page' | 'project' | 'sort' | 'startFrom' | 'startThrough'> {
+export interface ISearchConditions extends Pick<IBaseSearchConditions, 'additionalProperty' | 'endFrom' | 'endThrough' | 'id' | 'inSessionFrom' | 'inSessionThrough' | 'limit' | 'organizer' | 'page' | 'project' | 'sort' | 'startFrom' | 'startThrough'> {
+    typeOf?: EventType.ScreeningEventSeries;
+    name?: string;
     location?: {
         branchCode?: {
             $eq?: string;
@@ -218,12 +220,6 @@ export interface ISearchConditions extends Pick<IBaseSearchConditions<EventType.
             $in?: string[];
         };
     };
-    soundFormat?: {
-        typeOf?: {
-            $eq?: string;
-            $in?: string[];
-        };
-    };
     workPerformed?: {
         /**
          * コンテンツコード

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

@@ -1,5 +1,6 @@
 import type { COAFactory } from '@coasystems/factory';
 import { IEvent as IBaseEvent, ISearchConditions as IBaseSearchConditions, ISortOrder } from '../event';
+import { EventStatusType } from '../eventStatusType';
 import { IEvent as IEventSeries, IUnacceptedPaymentMethodType } from './eventSeries';
 import { EventType } from '../eventType';
 import { OfferType } from '../offerType';
@@ -231,9 +232,7 @@ export interface IOfferSearchConditions {
         id?: {
             $in?: string[];
         };
-        serviceType?: {
-            ids?: string[];
-        };
+        serviceType?: never;
         serviceOutput?: {
             reservedTicket?: {
                 ticketedSeat?: {
@@ -271,7 +270,12 @@ export interface IOfferSearchConditions {
 /**
  * イベント検索条件
  */
-export interface ISearchConditions extends IBaseSearchConditions<EventType.ScreeningEvent> {
+export interface ISearchConditions extends IBaseSearchConditions {
+    typeOf?: EventType.ScreeningEvent;
+    /**
+     * イベントステータス
+     */
+    eventStatuses?: EventStatusType[];
     location?: {
         /**
          * ルームコード

package/lib/chevre/event.d.ts

@@ -42,7 +42,7 @@ export type IEvent<T extends IAttributes<EventType>> = T & {
 export interface ISortOrder {
     startDate?: SortType;
 }
-export interface ISearchConditions<T extends EventType> {
+export interface ISearchConditions {
     limit?: number;
     page?: number;
     sort?: ISortOrder;
@@ -61,15 +61,6 @@ export interface ISearchConditions<T extends EventType> {
             $eq?: string;
         };
     };
-    /**
-     * イベントタイプ
-     */
-    typeOf?: T;
-    typeOfIn?: EventType[];
-    /**
-     * イベント名称
-     */
-    name?: string;
     /**
      * 開催中 from
      * ISO 8601 date format
@@ -100,10 +91,6 @@ export interface ISearchConditions<T extends EventType> {
      * ISO 8601 date format
      */
     endThrough?: Date;
-    /**
-     * イベントステータス
-     */
-    eventStatuses?: EventStatusType[];
     additionalProperty?: {
         $elemMatch?: {
             name?: {
@@ -114,4 +101,6 @@ export interface ISearchConditions<T extends EventType> {
             };
         };
     };
+    typeOfIn?: never;
+    name?: never;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@chevre/factory",
-  "version": "10.5.0-alpha.0",
+  "version": "10.5.0-alpha.1",
   "main": "./lib/index.js",
   "types": "./lib/index.d.ts",
   "files": [