@chevre/domain 28.0.0-alpha.21 → 28.0.0-alpha.22

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

@@ -1,6 +1,15 @@
 import type { Connection, FilterQuery } from 'mongoose';
 import { factory } from '../factory';
-type ISearchConditions = factory.eventSeries.ISearchConditions;
+type ISearchConditions = Pick<factory.eventSeries.ISearchConditions, 'limit' | 'page' | 'sort' | 'additionalProperty' | 'endFrom' | 'endThrough' | 'id' | 'inSessionFrom' | 'inSessionThrough' | 'location' | 'name' | 'organizer' | 'project' | 'startFrom' | 'startThrough' | 'videoFormat'> & {
+    /**
+     * コンテンツコード
+     */
+    movieIdentifier?: string;
+    /**
+     * コンテンツバージョン
+     */
+    movieVersion?: string;
+};
 type IKeyOfProjection = Exclude<keyof factory.eventSeries.IEvent, 'id' | 'videoFormat'>;
 /**
  * 施設コンテンツリポジトリ
@@ -12,7 +21,7 @@ export declare class EventSeriesRepo {
     /**
      * イベントを検索する(inclusion projection)
      */
-    projectEventSeriesFields(params: ISearchConditions, inclusion: IKeyOfProjection[]): Promise<factory.eventSeries.IEvent[]>;
+    findEventSeries(params: ISearchConditions, inclusion: IKeyOfProjection[]): Promise<factory.eventSeries.IEvent[]>;
     deleteManyByOrganizerId(params: {
         project: {
             id: string;

package/lib/chevre/repo/eventSeries.js

@@ -127,18 +127,25 @@ class EventSeriesRepo {
                 });
             }
         }
-        const workPerformedIdentifierIn = conditions.workPerformed?.identifiers;
-        /* istanbul ignore else */
-        if (Array.isArray(workPerformedIdentifierIn)) {
-            andConditions.push({
-                'workPerformed.identifier': { $exists: true, $in: workPerformedIdentifierIn }
-            });
-        }
-        const workPerformedVersionEq = conditions.workPerformed?.version?.$eq;
+        // const workPerformedIdentifierIn = conditions.workPerformed?.identifiers;
+        // if (Array.isArray(workPerformedIdentifierIn)) {
+        //     andConditions.push({
+        //         'workPerformed.identifier': { $exists: true, $in: workPerformedIdentifierIn }
+        //     });
+        // }
+        // const workPerformedVersionEq = conditions.workPerformed?.version?.$eq;
+        // if (typeof workPerformedVersionEq === 'string') {
+        //     andConditions.push({
+        //         'workPerformed.version': { $exists: true, $eq: workPerformedVersionEq }
+        //     });
+        // }
+        const workPerformedIdentifierEq = conditions.movieIdentifier;
+        if (typeof workPerformedIdentifierEq === 'string') {
+            andConditions.push({ 'workPerformed.identifier': { $exists: true, $eq: workPerformedIdentifierEq } });
+        }
+        const workPerformedVersionEq = conditions.movieVersion;
         if (typeof workPerformedVersionEq === 'string') {
-            andConditions.push({
-                'workPerformed.version': { $exists: true, $eq: workPerformedVersionEq }
-            });
+            andConditions.push({ 'workPerformed.version': { $exists: true, $eq: workPerformedVersionEq } });
         }
         const videoFormatTypeOfEq = conditions.videoFormat?.typeOf?.$eq;
         if (typeof videoFormatTypeOfEq === 'string') {
@@ -153,7 +160,7 @@ class EventSeriesRepo {
     /**
      * イベントを検索する(inclusion projection)
      */
-    async projectEventSeriesFields(params, inclusion) {
+    async findEventSeries(params, inclusion) {
         const conditions = EventSeriesRepo.CREATE_MONGO_CONDITIONS(params);
         let projection;
         const positiveProjectionFields = (Array.isArray(inclusion))

package/lib/chevre/service/event/saveScreeningEvents.js

@@ -89,7 +89,7 @@ function createScreeningEvents(params, options) {
                 }))];
             debug('searching eventSeries... importingEventSeriesIds:', importingEventSeriesIds);
             if (importingEventSeriesIds.length > 0) {
-                screeningEventSerieses = await repos.eventSeries.projectEventSeriesFields({
+                screeningEventSerieses = await repos.eventSeries.findEventSeries({
                     id: { $in: importingEventSeriesIds },
                     project: { id: { $eq: params.project.id } }
                 }, [

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

@@ -118,7 +118,7 @@ function searchEventTicketOffersByEvent(params) {
         let soundFormatTypes = [];
         let videoFormatTypes = [];
         if (event.typeOf === factory_1.factory.eventType.ScreeningEvent) {
-            const superEvents = await repos.eventSeries.projectEventSeriesFields({
+            const superEvents = await repos.eventSeries.findEventSeries({
                 limit: 1,
                 page: 1,
                 id: { $eq: event.superEvent.id }

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

@@ -23,7 +23,7 @@ function searchOfferAppliesToMovieTicket(params) {
         // let soundFormatTypes: string[] = [];
         let videoFormatTypes = [];
         if (event.typeOf === factory_1.factory.eventType.ScreeningEvent) {
-            const superEvents = await repos.eventSeries.projectEventSeriesFields({
+            const superEvents = await repos.eventSeries.findEventSeries({
                 limit: 1,
                 page: 1,
                 id: { $eq: event.superEvent.id }

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

@@ -104,7 +104,7 @@ function searchEventTicketOffersByEvent(params) {
         let soundFormatTypes = [];
         let videoFormatTypes = [];
         if (event.typeOf === factory_1.factory.eventType.ScreeningEvent) {
-            const superEvents = await repos.eventSeries.projectEventSeriesFields({
+            const superEvents = await repos.eventSeries.findEventSeries({
                 limit: 1,
                 page: 1,
                 id: { $eq: event.superEvent.id }

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

@@ -66,7 +66,7 @@ function syncEventSeries2screeningEvents(params) {
     return async (repos) => {
         const now = new Date();
         for (const eventSeriesId of params.ids) {
-            const superEvents = await repos.eventSeries.projectEventSeriesFields({
+            const superEvents = await repos.eventSeries.findEventSeries({
                 limit: 1,
                 page: 1,
                 // typeOf: factory.eventType.ScreeningEventSeries,
@@ -162,7 +162,7 @@ function createInformTasks(params, setting) {
             });
         }
         else {
-            const screeningEventSeries4inform = await repos.eventSeries.projectEventSeriesFields({
+            const screeningEventSeries4inform = await repos.eventSeries.findEventSeries({
                 id: { $in: params.ids }
                 // typeOf: params.typeOf
             }, [

package/lib/chevre/service/task/syncResourcesFromCOA.js

@@ -241,7 +241,7 @@ function syncEvents(params) {
                 titleCode,
                 titleBranchNum
             });
-            const eventSeries = (await repos.eventSeries.projectEventSeriesFields({
+            const eventSeries = (await repos.eventSeries.findEventSeries({
                 id: { $eq: eventSeriesId },
                 project: { id: { $eq: params.project.id } }
             }, [

package/package.json

@@ -88,5 +88,5 @@
     "postversion": "git push origin --tags",
     "prepublishOnly": "npm run clean && npm run build"
   },
-  "version": "28.0.0-alpha.21"
+  "version": "28.0.0-alpha.22"
 }