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

package/example/src/chevre/importEventsFromCOA.ts

@@ -20,13 +20,13 @@ async function main() {
     const sellerRepo = await chevre.repository.Seller.createInstance(mongoose.connection);
 
     const coaAuthClient = new (await chevre.loadCOA()).auth.RefreshToken({
-        endpoint: '',
-        refreshToken: '',
+        endpoint: String(process.env.COA_ENDPOINT),
+        refreshToken: process.env.COA_REFRESH_TOKEN,
         useFetch: true
     });
     const masterService = new (await chevre.loadCOA()).service.Master(
         {
-            endpoint: '',
+            endpoint: String(process.env.COA_ENDPOINT),
             auth: coaAuthClient
         },
         { timeout: 20000 }
@@ -45,6 +45,7 @@ async function main() {
             .toDate(),
         saveMovieTheater: false,
         saveScreeningEventSeries: false,
+        // saveScreeningEventSeries: true,
         saveScreeningEventSeriesPeriodInMonth: 3
     })({
         action: actionRepo,

package/lib/chevre/service/event.js

@@ -73,27 +73,27 @@ function importFromCOA(params) {
         let cancelledIds = [];
         let processTime;
         try {
-            const { screeningEventSerieses, savedEventsCount } = yield saveScreeningEventSeries({
-                locationBranchCode: params.locationBranchCode,
-                movieTheater,
-                project: params.project,
-                saveScreeningEventSeries: params.saveScreeningEventSeries,
-                saveScreeningEventSeriesPeriodInMonth: params.saveScreeningEventSeriesPeriodInMonth,
-                seller: { id: seller.id }
-            })(repos);
-            savedScreeningEventSeriesCount = savedEventsCount;
+            let screeningEventSerieses;
+            if (params.saveScreeningEventSeries === true) {
+                const saveScreeningEventSeriesResult = yield saveScreeningEventSeries({
+                    locationBranchCode: params.locationBranchCode,
+                    movieTheater,
+                    project: params.project,
+                    saveScreeningEventSeries: params.saveScreeningEventSeries,
+                    saveScreeningEventSeriesPeriodInMonth: params.saveScreeningEventSeriesPeriodInMonth,
+                    seller: { id: seller.id }
+                })(repos);
+                screeningEventSerieses = saveScreeningEventSeriesResult.screeningEventSerieses;
+                savedScreeningEventSeriesCount = saveScreeningEventSeriesResult.savedEventsCount;
+            }
+            else {
+                // 施設コンテンツを保管しない場合、DBから施設コンテンツを検索するので、ここでは何もしない(2024-09-09~)
+            }
             try {
                 // イベント永続化
                 const processStart = process.hrtime.bigint();
-                const screeningEvents = yield saveScreeningEvents({
-                    screeningRooms,
-                    screeningEventSerieses: screeningEventSerieses,
-                    project: params.project,
-                    targetImportFrom: targetImportFrom.toDate(),
-                    targetImportThrough: targetImportThrough.toDate(),
-                    seller: { id: seller.id },
-                    instrument
-                })(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({
@@ -213,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({
@@ -260,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');
@@ -327,8 +342,8 @@ function saveScreeningEvents(params) {
     });
 }
 function createScreeningEvents(params) {
+    // tslint:disable-next-line:max-func-body-length
     return (repos) => __awaiter(this, void 0, void 0, function* () {
-        const screeningEventSerieses = params.screeningEventSerieses;
         const project = params.project;
         // COAからイベント取得;
         const schedulesFromCOA = yield repos.masterService.schedule({
@@ -345,6 +360,50 @@ function createScreeningEvents(params) {
             theaterCode: params.instrument.theaterCode,
             kubunClass: '046'
         });
+        let screeningEventSerieses;
+        if (Array.isArray(params.screeningEventSerieses)) {
+            screeningEventSerieses = params.screeningEventSerieses;
+        }
+        else {
+            // 指定がなければDBから検索する(2024-09-09~)
+            const importingEventSeriesIds = [...new Set(schedulesFromCOA.map((scheduleFromCOA) => {
+                    return createScreeningEventSeriesId({
+                        theaterCode: params.instrument.theaterCode,
+                        titleCode: scheduleFromCOA.titleCode,
+                        titleBranchNum: scheduleFromCOA.titleBranchNum
+                    });
+                }))];
+            debug('searching eventSeries... importingEventSeriesIds:', importingEventSeriesIds);
+            if (importingEventSeriesIds.length > 0) {
+                screeningEventSerieses = yield repos.eventSeries.projectEventSeriesFields({
+                    id: { $in: importingEventSeriesIds },
+                    project: { id: { $eq: params.project.id } }
+                }, [
+                    'project', 'typeOf', 'eventStatus', 'identifier',
+                    'name', 'kanaName', 'alternativeHeadline', 'location',
+                    'organizer', 'videoFormat', 'soundFormat', 'workPerformed',
+                    'duration', 'endDate', 'startDate', 'coaInfo',
+                    '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 = [];
+            }
+        }
         // イベントごとに永続化トライ
         const screeningEvents = [];
         schedulesFromCOA.forEach((scheduleFromCOA) => {

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.10"
+  "version": "22.3.0-alpha.12"
 }