@chevre/domain 22.3.0-alpha.11 → 22.3.0-alpha.12

package/lib/chevre/service/event.js

@@ -92,7 +92,8 @@ function importFromCOA(params) {
             try {
                 // イベント永続化
                 const processStart = process.hrtime.bigint();
-                const screeningEvents = yield saveScreeningEvents(Object.assign({ screeningRooms, project: params.project, targetImportFrom: targetImportFrom.toDate(), targetImportThrough: targetImportThrough.toDate(), seller: { id: seller.id }, instrument }, (Array.isArray(screeningEventSerieses)) ? { screeningEventSerieses } : undefined))(repos);
+                const screeningEvents = yield saveScreeningEvents(Object.assign({ movieTheater,
+                    screeningRooms, project: params.project, targetImportFrom: targetImportFrom.toDate(), targetImportThrough: targetImportThrough.toDate(), seller: { id: seller.id }, instrument }, (Array.isArray(screeningEventSerieses)) ? { screeningEventSerieses } : undefined))(repos);
                 savedScreeningEventsCount = screeningEvents.length;
                 // COAから削除されたイベントをキャンセル済ステータスへ変更
                 cancelledIds = yield cancelDeletedEvents({
@@ -212,6 +213,7 @@ function processUpdateMovieTheater(params) {
 function saveScreeningEventSeries(params) {
     // tslint:disable-next-line:max-func-body-length
     return (repos) => __awaiter(this, void 0, void 0, function* () {
+        const { importingIds } = params;
         const project = params.project;
         // COAから作品取得
         const filmsFromCOA = yield repos.masterService.title({
@@ -259,21 +261,35 @@ function saveScreeningEventSeries(params) {
         let savedEventsCount = 0;
         // saveScreeningEventSeries:trueの場合のみ保管(2022-10-10~)
         if (params.saveScreeningEventSeries === true) {
-            // 更新対象が無限に増えるのを防ぐためにstartDateでフィルター
-            const someMonthsAgo = moment()
-                .add(-COA_IMPORT_SCREENING_EVENT_SERIES_PERIOD_IN_MONTH, 'months');
-            const saveParams = screeningEventSerieses
-                .filter((screeningEventSeries) => {
-                return moment(screeningEventSeries.startDate)
-                    .isAfter(someMonthsAgo);
-            })
-                .map((screeningEventSeries) => {
-                return {
-                    id: screeningEventSeries.id,
-                    attributes: screeningEventSeries,
-                    upsert: true
-                };
-            });
+            let saveParams;
+            if (Array.isArray(importingIds) && importingIds.length > 0) {
+                saveParams = screeningEventSerieses
+                    .filter((screeningEventSeries) => importingIds.includes(screeningEventSeries.id))
+                    .map((screeningEventSeries) => {
+                    return {
+                        id: screeningEventSeries.id,
+                        attributes: screeningEventSeries,
+                        upsert: true
+                    };
+                });
+            }
+            else {
+                // 更新対象が無限に増えるのを防ぐためにstartDateでフィルター
+                const someMonthsAgo = moment()
+                    .add(-COA_IMPORT_SCREENING_EVENT_SERIES_PERIOD_IN_MONTH, 'months');
+                saveParams = screeningEventSerieses
+                    .filter((screeningEventSeries) => {
+                    return moment(screeningEventSeries.startDate)
+                        .isAfter(someMonthsAgo);
+                })
+                    .map((screeningEventSeries) => {
+                    return {
+                        id: screeningEventSeries.id,
+                        attributes: screeningEventSeries,
+                        upsert: true
+                    };
+                });
+            }
             debug('saving', saveParams.length, 'ScreeningEventSeries...');
             yield repos.eventSeries.upsertManyEventSeriesById4sskts(saveParams);
             debug('saved', saveParams.length, 'ScreeningEventSeries');
@@ -370,6 +386,19 @@ function createScreeningEvents(params) {
                     'offers', 'additionalProperty'
                 ]);
                 debug(screeningEventSerieses.length, 'screeningEventSerieses for importing events found.');
+                // 万が一未インポートの施設コンテンツがあれば強制的にインポート(2024-09-09~)
+                if (screeningEventSerieses.length < importingEventSeriesIds.length) {
+                    const saveScreeningEventSeriesResult = yield saveScreeningEventSeries({
+                        locationBranchCode: params.instrument.theaterCode,
+                        movieTheater: params.movieTheater,
+                        project: params.project,
+                        saveScreeningEventSeries: true,
+                        saveScreeningEventSeriesPeriodInMonth: 0,
+                        seller: { id: params.seller.id },
+                        importingIds: importingEventSeriesIds
+                    })(repos);
+                    screeningEventSerieses = saveScreeningEventSeriesResult.screeningEventSerieses;
+                }
             }
             else {
                 screeningEventSerieses = [];

package/package.json

@@ -110,5 +110,5 @@
     "postversion": "git push origin --tags",
     "prepublishOnly": "npm run clean && npm run build && npm test && npm run doc"
   },
-  "version": "22.3.0-alpha.11"
+  "version": "22.3.0-alpha.12"
 }