@chevre/domain 23.2.0-alpha.13 → 23.2.0-alpha.14

package/example/src/chevre/eventSeries/migrateEventSeriesVideoFormat.ts

@@ -0,0 +1,80 @@
+// tslint:disable:no-console
+// import * as moment from 'moment';
+import * as mongoose from 'mongoose';
+
+import { chevre } from '../../../../lib/index';
+
+// tslint:disable-next-line:max-func-body-length
+async function main() {
+    await mongoose.connect(<string>process.env.MONGOLAB_URI, { autoIndex: false });
+
+    const eventSeriesRepo = await chevre.repository.EventSeries.createInstance(mongoose.connection);
+
+    const cursor = eventSeriesRepo.getCursor(
+        {
+            // _id: { $eq: 'al9s38bj6' },
+            'project.id': { $ne: 'sskts-development' }
+        },
+        {
+            // _id: 1,
+            // offers: 1,
+            // startDate: 1,
+            // project: 1,
+            // typeOf: 1
+        }
+    );
+    console.log('docs found');
+
+    let i = 0;
+    let updateCount = 0;
+    await cursor.eachAsync(async (doc) => {
+        i += 1;
+        const eventSeries: Pick<
+            chevre.factory.eventSeries.IEvent,
+            'id' | 'videoFormat' | 'subEvent' | 'project' | 'startDate' | 'typeOf'
+        > = doc.toObject();
+
+        const videoFormatByOldAttribute: string[] =
+            (Array.isArray(eventSeries.videoFormat)) ? eventSeries.videoFormat.map(({ typeOf }) => typeOf) : [];
+        const videoFormatByNewAttribute: string[] =
+            (Array.isArray(eventSeries.subEvent?.videoFormat)) ? eventSeries.subEvent.videoFormat : [];
+        const alreadyMigrated = videoFormatByOldAttribute.length === videoFormatByNewAttribute.length
+            && videoFormatByOldAttribute.every((codeValue) => videoFormatByNewAttribute.includes(codeValue))
+            && eventSeries.subEvent?.typeOf === chevre.factory.eventType.ScreeningEvent;
+
+        if (alreadyMigrated) {
+            console.log(
+                'already migrated.', eventSeries.project.id, eventSeries.id, eventSeries.startDate, i);
+        } else {
+            const subEvent: chevre.factory.eventSeries.ISubEvent = {
+                typeOf: chevre.factory.eventType.ScreeningEvent,
+                ...(videoFormatByOldAttribute.length > 0) ? { videoFormat: videoFormatByOldAttribute } : undefined
+            };
+            console.log(
+                'updating...',
+                eventSeries.project.id, eventSeries.id, eventSeries.startDate, i, videoFormatByOldAttribute, subEvent
+            );
+            await eventSeriesRepo.saveEventSeries({
+                id: eventSeries.id,
+                attributes: <any>{
+                    ...{
+                        typeOf: eventSeries.typeOf,
+                        subEvent
+                    }
+                }
+            });
+            updateCount += 1;
+            console.log(
+                'updated.',
+                eventSeries.project.id, eventSeries.id, eventSeries.startDate, i);
+
+        }
+    });
+
+    console.log(i, 'docs checked');
+    console.log(updateCount, 'docs updated');
+}
+
+main()
+    .then()
+    .catch(console.error);

package/example/src/chevre/reIndex.ts

@@ -11,7 +11,7 @@ mongoose.Model.on('index', (...args) => {
 async function main() {
     await mongoose.connect(<string>process.env.MONGOLAB_URI, { autoIndex: false });
 
-    await chevre.repository.EventOffer.createInstance(mongoose.connection);
+    await chevre.repository.EventSeries.createInstance(mongoose.connection);
     console.log('success!');
 }
 

package/lib/chevre/repo/eventSeries.js

@@ -184,21 +184,25 @@ class EventSeriesRepo {
         }
         const videoFormatTypeOfEq = (_t = (_s = conditions.videoFormat) === null || _s === void 0 ? void 0 : _s.typeOf) === null || _t === void 0 ? void 0 : _t.$eq;
         if (typeof videoFormatTypeOfEq === 'string') {
-            andConditions.push({
-                'videoFormat.typeOf': {
-                    $exists: true,
-                    $eq: videoFormatTypeOfEq
-                }
-            });
+            // 新しい参照先へ変更(2025-12-31~)
+            // andConditions.push({
+            //     'videoFormat.typeOf': {
+            //         $exists: true,
+            //         $eq: videoFormatTypeOfEq
+            //     }
+            // });
+            andConditions.push({ 'subEvent.videoFormat': { $exists: true, $eq: videoFormatTypeOfEq } });
         }
         const videoFormatTypeOfIn = (_v = (_u = conditions.videoFormat) === null || _u === void 0 ? void 0 : _u.typeOf) === null || _v === void 0 ? void 0 : _v.$in;
         if (Array.isArray(videoFormatTypeOfIn)) {
-            andConditions.push({
-                'videoFormat.typeOf': {
-                    $exists: true,
-                    $in: videoFormatTypeOfIn
-                }
-            });
+            // 新しい参照先へ変更(2025-12-31~)
+            // andConditions.push({
+            //     'videoFormat.typeOf': {
+            //         $exists: true,
+            //         $in: videoFormatTypeOfIn
+            //     }
+            // });
+            andConditions.push({ 'subEvent.videoFormat': { $exists: true, $in: videoFormatTypeOfIn } });
         }
         const soundFormatTypeOfEq = (_x = (_w = conditions.soundFormat) === null || _w === void 0 ? void 0 : _w.typeOf) === null || _x === void 0 ? void 0 : _x.$eq;
         if (typeof soundFormatTypeOfEq === 'string') {

package/lib/chevre/repo/mongoose/schemas/eventSeries.js

@@ -147,6 +147,15 @@ const indexes = [
             }
         }
     ],
+    [
+        { 'subEvent.videoFormat': 1, startDate: 1 },
+        {
+            name: 'subEventVideoFormat',
+            partialFilterExpression: {
+                'subEvent.videoFormat': { $exists: true }
+            }
+        }
+    ],
     [
         { 'soundFormat.typeOf': 1, startDate: 1 },
         {

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

@@ -127,7 +127,7 @@ function searchTicketOffersByItemOffered(params) {
 function searchEventTicketOffersByEvent(params) {
     // tslint:disable-next-line:max-func-body-length
     return (repos) => __awaiter(this, void 0, void 0, function* () {
-        var _a;
+        var _a, _b;
         const event = params.event;
         let soundFormatTypes = [];
         let videoFormatTypes = [];
@@ -137,13 +137,16 @@ function searchEventTicketOffersByEvent(params) {
                 page: 1,
                 id: { $eq: event.superEvent.id }
                 // typeOf: factory.eventType.ScreeningEventSeries
-            }, ['soundFormat', 'videoFormat', 'subEvent']);
+            }, 
+            // ['soundFormat', 'videoFormat', 'subEvent']
+            ['soundFormat', 'subEvent']);
             const superEvent = superEvents.shift();
             if (superEvent === undefined) {
                 throw new factory.errors.NotFound(factory.eventType.ScreeningEventSeries);
             }
             soundFormatTypes = (Array.isArray(superEvent.soundFormat)) ? superEvent.soundFormat.map((f) => f.typeOf) : [];
-            videoFormatTypes = (Array.isArray(superEvent.videoFormat)) ? superEvent.videoFormat.map((f) => f.typeOf) : [];
+            // videoFormatTypes = (Array.isArray(superEvent.videoFormat)) ? superEvent.videoFormat.map((f) => f.typeOf) : [];
+            videoFormatTypes = (Array.isArray((_a = superEvent.subEvent) === null || _a === void 0 ? void 0 : _a.videoFormat)) ? superEvent.subEvent.videoFormat : [];
         }
         const unacceptedPaymentMethod = getUnacceptedPaymentMethodByEvent({ event });
         // 上映方式がなければMovieTicket除外(2023-02-21~)
@@ -151,7 +154,7 @@ function searchEventTicketOffersByEvent(params) {
         // 興行設定があれば興行のカタログを参照する(2022-08-31~)
         const eventOffers = event.offers;
         const { availableOffers, sortedOfferIds } = yield searchTicketOffersByItemOffered({
-            itemOffered: { id: String((_a = eventOffers === null || eventOffers === void 0 ? void 0 : eventOffers.itemOffered) === null || _a === void 0 ? void 0 : _a.id) },
+            itemOffered: { id: String((_b = eventOffers === null || eventOffers === void 0 ? void 0 : eventOffers.itemOffered) === null || _b === void 0 ? void 0 : _b.id) },
             // ids: params.ids,
             store: params.store,
             limit: params.limit,

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

@@ -28,7 +28,7 @@ function getUnacceptedPaymentMethodByEvent(params) {
  */
 function searchOfferAppliesToMovieTicket(params) {
     return (repos) => __awaiter(this, void 0, void 0, function* () {
-        var _a, _b, _c, _d;
+        var _a, _b, _c, _d, _e;
         // optimize(2024-07-18~)
         const event = yield repos.event.projectEventFieldsById({ id: params.event.id }, ['project', 'startDate', 'typeOf', 'superEvent.id', 'offers.itemOffered.id', 'offers.unacceptedPaymentMethod']);
         // let soundFormatTypes: string[] = [];
@@ -39,13 +39,16 @@ function searchOfferAppliesToMovieTicket(params) {
                 page: 1,
                 id: { $eq: event.superEvent.id }
                 // typeOf: factory.eventType.ScreeningEventSeries
-            }, ['soundFormat', 'videoFormat', 'subEvent']);
+            }, 
+            // ['soundFormat', 'videoFormat', 'subEvent']
+            ['soundFormat', 'subEvent']);
             const superEvent = superEvents.shift();
             if (superEvent === undefined) {
                 throw new factory.errors.NotFound(factory.eventType.ScreeningEventSeries);
             }
             // soundFormatTypes = (Array.isArray(superEvent.soundFormat)) ? superEvent.soundFormat.map((f) => f.typeOf) : [];
-            videoFormatTypes = (Array.isArray(superEvent.videoFormat)) ? superEvent.videoFormat.map((f) => f.typeOf) : [];
+            // videoFormatTypes = (Array.isArray(superEvent.videoFormat)) ? superEvent.videoFormat.map((f) => f.typeOf) : [];
+            videoFormatTypes = (Array.isArray((_a = superEvent.subEvent) === null || _a === void 0 ? void 0 : _a.videoFormat)) ? superEvent.subEvent.videoFormat : [];
         }
         const unacceptedPaymentMethod = getUnacceptedPaymentMethodByEvent({ event });
         // 上映方式がなければMovieTicket除外
@@ -53,7 +56,7 @@ function searchOfferAppliesToMovieTicket(params) {
         // 興行設定があれば興行のカタログを参照する
         const eventOffers = event.offers;
         let catalogId;
-        if (typeof ((_a = eventOffers.itemOffered) === null || _a === void 0 ? void 0 : _a.id) === 'string') {
+        if (typeof ((_b = eventOffers.itemOffered) === null || _b === void 0 ? void 0 : _b.id) === 'string') {
             const eventService = (yield repos.product.projectFields({
                 limit: 1,
                 page: 1,
@@ -65,7 +68,7 @@ function searchOfferAppliesToMovieTicket(params) {
                 throw new factory.errors.NotFound(factory.product.ProductType.EventService);
             }
             // const firstCatalogIdOfProduct = eventService.hasOfferCatalog?.id; // migrate to itemListElement(2024-09-30~)
-            const firstCatalogIdOfProduct = (_c = (_b = eventService.hasOfferCatalog) === null || _b === void 0 ? void 0 : _b.itemListElement.at(0)) === null || _c === void 0 ? void 0 : _c.id;
+            const firstCatalogIdOfProduct = (_d = (_c = eventService.hasOfferCatalog) === null || _c === void 0 ? void 0 : _c.itemListElement.at(0)) === null || _d === void 0 ? void 0 : _d.id;
             if (typeof firstCatalogIdOfProduct === 'string') {
                 catalogId = firstCatalogIdOfProduct;
             }
@@ -83,7 +86,7 @@ function searchOfferAppliesToMovieTicket(params) {
         }
         return repos.offer.searchAvaialbleAppliesToMovieTicketByOfferCatalogId({
             subOfferCatalog: { id: subOfferCatalogId, isOfferCatalogItem },
-            availableAtOrFrom: { id: (_d = params.store) === null || _d === void 0 ? void 0 : _d.id },
+            availableAtOrFrom: { id: (_e = params.store) === null || _e === void 0 ? void 0 : _e.id },
             unacceptedPaymentMethod: unacceptedPaymentMethod,
             excludeAppliesToMovieTicket: excludeAppliesToMovieTicket,
             onlyValid: params.onlyValid === true,

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

@@ -110,7 +110,7 @@ function searchTicketOffersByItemOffered(params) {
 function searchEventTicketOffersByEvent(params) {
     // tslint:disable-next-line:max-func-body-length
     return (repos) => __awaiter(this, void 0, void 0, function* () {
-        var _a;
+        var _a, _b;
         const event = params.event;
         let soundFormatTypes = [];
         let videoFormatTypes = [];
@@ -120,13 +120,16 @@ function searchEventTicketOffersByEvent(params) {
                 page: 1,
                 id: { $eq: event.superEvent.id }
                 // typeOf: factory.eventType.ScreeningEventSeries
-            }, ['soundFormat', 'videoFormat', 'subEvent']);
+            }, 
+            // ['soundFormat', 'videoFormat', 'subEvent']
+            ['soundFormat', 'subEvent']);
             const superEvent = superEvents.shift();
             if (superEvent === undefined) {
                 throw new factory.errors.NotFound(factory.eventType.ScreeningEventSeries);
             }
             soundFormatTypes = (Array.isArray(superEvent.soundFormat)) ? superEvent.soundFormat.map((f) => f.typeOf) : [];
-            videoFormatTypes = (Array.isArray(superEvent.videoFormat)) ? superEvent.videoFormat.map((f) => f.typeOf) : [];
+            // videoFormatTypes = (Array.isArray(superEvent.videoFormat)) ? superEvent.videoFormat.map((f) => f.typeOf) : [];
+            videoFormatTypes = (Array.isArray((_a = superEvent.subEvent) === null || _a === void 0 ? void 0 : _a.videoFormat)) ? superEvent.subEvent.videoFormat : [];
         }
         const unacceptedPaymentMethod = getUnacceptedPaymentMethodByEvent({ event });
         // 上映方式がなければMovieTicket除外(2023-02-21~)
@@ -134,7 +137,7 @@ function searchEventTicketOffersByEvent(params) {
         // 興行設定があれば興行のカタログを参照する(2022-08-31~)
         const eventOffers = event.offers;
         const { availableOffers } = yield searchTicketOffersByItemOffered({
-            itemOffered: { id: String((_a = eventOffers === null || eventOffers === void 0 ? void 0 : eventOffers.itemOffered) === null || _a === void 0 ? void 0 : _a.id) },
+            itemOffered: { id: String((_b = eventOffers === null || eventOffers === void 0 ? void 0 : eventOffers.itemOffered) === null || _b === void 0 ? void 0 : _b.id) },
             ids: params.ids,
             store: params.store,
             // limit: params.limit,

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

@@ -165,15 +165,17 @@ function createInformTasks(params, setting) {
                 id: { $in: params.ids }
                 // typeOf: params.typeOf
             }, [
-                'project', 'organizer', 'typeOf', 'name', 'location', 'videoFormat', 'soundFormat', 'workPerformed', 'kanaName', 'eventStatus',
+                'project', 'organizer', 'typeOf', 'name', 'location', 'soundFormat', 'workPerformed', 'kanaName', 'eventStatus',
                 'endDate', 'startDate', 'additionalProperty', 'subtitleLanguage', 'dubLanguage',
                 'alternativeHeadline', 'description', 'duration', 'headline', 'subEvent'
             ] // inclusion(2024-07-30~)
             );
             // 最適化(2024-03-25~)
-            events4inform = screeningEventSeries4inform.map(({ project, organizer, typeOf, name, location, id, videoFormat, soundFormat, workPerformed, kanaName, eventStatus, endDate, startDate, additionalProperty, subtitleLanguage, dubLanguage, alternativeHeadline, description, duration, headline }) => {
-                return Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign({ project, organizer, typeOf, name, location, id, videoFormat, soundFormat, workPerformed, kanaName, eventStatus,
-                    endDate, startDate }, (Array.isArray(additionalProperty)) ? { additionalProperty } : undefined), (subtitleLanguage !== undefined) ? {} : undefined), (dubLanguage !== undefined) ? { dubLanguage } : undefined), (alternativeHeadline !== undefined) ? { alternativeHeadline } : undefined), (description !== undefined) ? { description } : undefined), (typeof duration === 'string') ? { duration } : undefined), (headline !== undefined) ? { headline } : undefined);
+            events4inform = screeningEventSeries4inform.map(({ project, organizer, typeOf, name, location, id, soundFormat, workPerformed, kanaName, eventStatus, endDate, startDate, additionalProperty, subtitleLanguage, dubLanguage, alternativeHeadline, description, duration, headline, subEvent }) => {
+                return Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign({ project, organizer, typeOf, name, location, id, soundFormat, workPerformed, kanaName, eventStatus,
+                    endDate, startDate, videoFormat: (Array.isArray(subEvent === null || subEvent === void 0 ? void 0 : subEvent.videoFormat))
+                        ? subEvent.videoFormat.map((codeValue) => ({ typeOf: codeValue, name: codeValue }))
+                        : [] }, (Array.isArray(additionalProperty)) ? { additionalProperty } : undefined), (subtitleLanguage !== undefined) ? {} : undefined), (dubLanguage !== undefined) ? { dubLanguage } : undefined), (alternativeHeadline !== undefined) ? { alternativeHeadline } : undefined), (description !== undefined) ? { description } : undefined), (typeof duration === 'string') ? { duration } : undefined), (headline !== undefined) ? { headline } : undefined);
             });
         }
         if (events4inform.length > 0) {

package/package.json

@@ -116,5 +116,5 @@
     "postversion": "git push origin --tags",
     "prepublishOnly": "npm run clean && npm run build && npm test && npm run doc"
   },
-  "version": "23.2.0-alpha.13"
+  "version": "23.2.0-alpha.14"
 }