@chevre/domain 23.0.0-alpha.0 → 23.0.0-alpha.2

package/example/src/chevre/aggregation/createAggregateEventTasks.ts

@@ -13,7 +13,7 @@ async function main() {
     const taskRepo = await chevre.repository.Task.createInstance(mongoose.connection);
 
     const events = <Pick<
-        chevre.factory.event.IEvent<chevre.factory.eventType.ScreeningEvent>,
+        chevre.factory.event.screeningEvent.IEvent,
         'id' | 'typeOf' | 'startDate' | 'project'
     >[]>await eventRepo.projectEventFields(
         {

package/example/src/chevre/checkEventDuration.ts

@@ -35,7 +35,7 @@ async function main() {
     await cursor.eachAsync(async (doc) => {
         i += 1;
         const event: Pick<
-            chevre.factory.event.IEvent<chevre.factory.eventType.ScreeningEvent>,
+            chevre.factory.event.screeningEvent.IEvent,
             'startDate' | 'endDate' | 'project' | 'id'
         > = doc.toObject();
 

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

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

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

@@ -21,7 +21,7 @@ export interface IUpdateAggregateReservationParams {
         remainingAttendeeCapacity?: '';
     };
 }
-export type ISearchConditions = factory.event.ISearchConditions<factory.eventType.ScreeningEvent>;
+export type ISearchConditions = factory.event.screeningEvent.ISearchConditions;
 interface IAggregationByStatus {
     eventCount: number;
     reservationCount: number;
@@ -44,17 +44,17 @@ interface IAggregateEvent {
     statuses: IStatus[];
 }
 export import IMinimizedIndividualEvent = EventFactory.IMinimizedIndividualEvent;
-type IKeyOfProjection = Exclude<keyof factory.event.IEvent<factory.eventType.ScreeningEvent>, 'id'> | 'aggregateOffer' | 'superEvent.location.id' | 'offers.itemOffered' | 'offers.itemOffered.id';
-type IKeyOfProjection4publicFields = Exclude<keyof factory.event.IEvent<factory.eventType.ScreeningEvent>, 'id' | 'offers'>;
+type IKeyOfProjection = Exclude<keyof factory.event.screeningEvent.IEvent, 'id'> | 'aggregateOffer' | 'superEvent.location.id' | 'offers.itemOffered' | 'offers.itemOffered.id';
+type IKeyOfProjection4publicFields = Exclude<keyof factory.event.screeningEvent.IEvent, 'id' | 'offers'>;
 /**
  * minimizedEvent検索時のprojection候補
  * add(2024-07-18~)
  */
 type IKeyOfProjection4minimizedEvent = Exclude<keyof IMinimizedIndividualEvent, 'additionalProperty' | 'id'> | 'superEvent.id' | 'location.branchCode' | 'superEvent.workPerformed.identifier' | 'superEvent.location.id' | 'offers.itemOffered' | 'offers.itemOffered.id' | 'offers.offeredThrough' | 'offers.unacceptedPaymentMethod' | 'offers.eligibleQuantity';
 type IUnset = {
-    [key in keyof factory.event.IEvent<factory.eventType.ScreeningEvent>]?: 1;
+    [key in keyof factory.event.screeningEvent.IEvent]?: 1;
 };
-export type ICreatingEvent4ttts = Pick<factory.event.IAttributes<factory.eventType.ScreeningEvent>, 'additionalProperty' | 'doorTime' | 'endDate' | 'eventStatus' | 'location' | 'name' | 'offers' | 'organizer' | 'project' | 'startDate' | 'superEvent' | 'typeOf'> & {
+export type ICreatingEvent4ttts = Pick<factory.event.screeningEvent.IAttributes, 'additionalProperty' | 'doorTime' | 'endDate' | 'eventStatus' | 'location' | 'name' | 'offers' | 'organizer' | 'project' | 'startDate' | 'superEvent' | 'typeOf'> & {
     identifier: string;
 };
 /**
@@ -63,12 +63,12 @@ export type ICreatingEvent4ttts = Pick<factory.event.IAttributes<factory.eventTy
 export declare class EventRepo {
     private readonly eventModel;
     constructor(connection: Connection);
-    static CREATE_MONGO_CONDITIONS(conditions: ISearchConditions): FilterQuery<factory.event.IEvent<factory.eventType.ScreeningEvent>>[];
+    static CREATE_MONGO_CONDITIONS(conditions: ISearchConditions): FilterQuery<factory.event.screeningEvent.IEvent>[];
     /**
      * 複数イベントを作成する
      */
     createManyEvents(params: {
-        attributes: factory.event.IAttributes<factory.eventType.ScreeningEvent>[];
+        attributes: factory.event.screeningEvent.IAttributes[];
         expectsNoContent: boolean;
     }): Promise<string[] | void>;
     /**
@@ -77,7 +77,7 @@ export declare class EventRepo {
      * 存在すれば、特定の属性のみ更新する
      */
     upsertManyByAdditionalProperty(params: {
-        events: factory.event.IAttributes<factory.eventType.ScreeningEvent>[];
+        events: factory.event.screeningEvent.IAttributes[];
         additionalPropertyFilter: {
             name: string;
         };
@@ -140,7 +140,7 @@ export declare class EventRepo {
      */
     saveEvent(params: {
         id?: string;
-        attributes: factory.event.IAttributes<factory.eventType.ScreeningEvent>;
+        attributes: factory.event.screeningEvent.IAttributes;
         /**
          * ドキュメント作成時には無視される
          */
@@ -154,7 +154,7 @@ export declare class EventRepo {
      */
     saveManyEvents(params: {
         id: string;
-        attributes: factory.event.IAttributes<factory.eventType.ScreeningEvent>;
+        attributes: factory.event.screeningEvent.IAttributes;
         $unset?: IUnset;
         upsert: boolean;
     }[]): Promise<void>;
@@ -169,7 +169,7 @@ export declare class EventRepo {
     /**
      * イベントを検索する(inclusion projection)
      */
-    projectEventFields(params: ISearchConditions, inclusion: IKeyOfProjection[]): Promise<Omit<factory.event.IEvent<factory.eventType.ScreeningEvent>, 'aggregateOffer'>[]>;
+    projectEventFields(params: ISearchConditions, inclusion: IKeyOfProjection[]): Promise<Omit<factory.event.screeningEvent.IEvent, 'aggregateOffer'>[]>;
     /**
      * apiで公開属性を検索する(2024-10-13~)
      */
@@ -186,7 +186,7 @@ export declare class EventRepo {
          * offers.seller.makesOfferをavailableAtOrFromでfilterする
          */
         sellerMakesOfferAvailableAtIn?: string[];
-    }): Promise<Omit<factory.event.IEvent<factory.eventType.ScreeningEvent>, 'aggregateOffer'>[]>;
+    }): Promise<Omit<factory.event.screeningEvent.IEvent, 'aggregateOffer'>[]>;
     /**
      * IDのみで検索する
      * projectionなし
@@ -205,7 +205,7 @@ export declare class EventRepo {
                 $eq: string;
             };
         };
-    }): Promise<Omit<factory.event.IEvent<factory.eventType.ScreeningEvent>, 'aggregateOffer'>>;
+    }): Promise<Omit<factory.event.screeningEvent.IEvent, 'aggregateOffer'>>;
     searchEventIds(params: ISearchConditions): Promise<string[]>;
     /**
      * 特定イベントから指定フィールドのみ取得する
@@ -360,7 +360,7 @@ export declare class EventRepo {
         };
     }): Promise<void>;
     unsetUnnecessaryFields(params: {
-        filter: FilterQuery<factory.event.IEvent<factory.eventType.ScreeningEvent>>;
+        filter: FilterQuery<factory.event.screeningEvent.IEvent>;
         $unset: IUnset;
     }): Promise<import("mongoose").UpdateWriteOpResult>;
     aggregateEvent(params: {

package/lib/chevre/repo/event.js

@@ -261,7 +261,6 @@ class EventRepo {
     createManyEvents(params) {
         return __awaiter(this, void 0, void 0, function* () {
             const uniqid = yield Promise.resolve().then(() => require('uniqid'));
-            // let docs: HydratedDocument<factory.event.IEvent<T>>[];
             const insertingDocs = params.attributes.map((p) => {
                 return Object.assign({ _id: uniqid() }, p);
             });

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

@@ -1,6 +1,6 @@
 import { IndexDefinition, IndexOptions, Model, Schema, SchemaDefinition } from 'mongoose';
 import * as factory from '../../../factory';
-type IDocTypeAsScreeningEvent = factory.event.IAttributes<factory.eventType.ScreeningEvent> & {
+type IDocTypeAsScreeningEvent = factory.event.screeningEvent.IAttributes & {
     _id: string;
     aggregateOffer?: factory.event.screeningEvent.IAggregateOffer;
 };

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

@@ -213,7 +213,7 @@ function getUnacceptedPaymentMethodByEvent(params) {
  */
 function searchEventTicketOffers(params) {
     return (repos) => __awaiter(this, void 0, void 0, function* () {
-        const eventType = params.event.typeOf;
+        // const eventType = params.event.typeOf;
         // optimize projection(2024-07-17~)
         const event = yield repos.event.projectEventFieldsById({ id: params.event.id }, [
             'project', 'typeOf', 'startDate',

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

@@ -197,7 +197,7 @@ function getUnacceptedPaymentMethodByEvent(params) {
  */
 function searchOffersByIds(params) {
     return (repos) => __awaiter(this, void 0, void 0, function* () {
-        const eventType = params.event.typeOf;
+        // const eventType = params.event.typeOf;
         // optimize projection(2024-07-17~)
         const event = yield repos.event.projectEventFieldsById({ id: params.event.id }, [
             'project', 'typeOf', 'startDate',

package/lib/chevre/service/validation/validateEvent.js

@@ -16,7 +16,7 @@ exports.validateEvent = validateEvent;
 function validateEvent(__) {
     return (__2) => __awaiter(this, void 0, void 0, function* () {
         // const event: Pick<factory.event.screeningEvent.IEvent, 'id' | 'startDate'> =
-        //     await repos.event.projectEventFieldsById<factory.eventType.ScreeningEvent>(
+        //     await repos.event.projectEventFieldsById(
         //         { id: params.id },
         //         ['startDate']
         //     );

package/package.json

@@ -11,8 +11,8 @@
   "dependencies": {
     "@aws-sdk/client-cognito-identity-provider": "3.600.0",
     "@aws-sdk/credential-providers": "3.600.0",
-    "@chevre/factory": "5.0.0-alpha.0",
-    "@cinerino/sdk": "12.5.0-alpha.1",
+    "@chevre/factory": "5.0.0-alpha.2",
+    "@cinerino/sdk": "12.5.0-alpha.2",
     "@motionpicture/coa-service": "9.6.0",
     "@motionpicture/gmo-service": "5.4.0-alpha.1",
     "@sendgrid/client": "8.1.4",
@@ -115,5 +115,5 @@
     "postversion": "git push origin --tags",
     "prepublishOnly": "npm run clean && npm run build && npm test && npm run doc"
   },
-  "version": "23.0.0-alpha.0"
+  "version": "23.0.0-alpha.2"
 }