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

package/example/src/moment.ts

@@ -0,0 +1,21 @@
+// tslint:disable:no-console
+import * as moment from 'moment-timezone';
+
+const importFrom = '2024-04-23T22:45:00.414Z';
+const importThrough = '2024-04-25T22:45:00.414Z';
+const targetImportFrom = moment(importFrom)
+    .tz('Asia/Tokyo')
+    .startOf('day');
+const targetImportThrough = moment(importThrough)
+    .tz('Asia/Tokyo')
+    .endOf('day');
+console.log(targetImportFrom.toDate(), targetImportThrough.toDate());
+
+const targetImportFrom2 = moment(`${moment(importFrom)
+    .tz('Asia/Tokyo')
+    .format('YYYY-MM-DD')}T00:00:00+09:00`);
+const targetImportThrough2 = moment(`${moment(importThrough)
+    .tz('Asia/Tokyo')
+    .format('YYYY-MM-DD')}T00:00:00+09:00`)
+    .add(1, 'day');
+console.log(targetImportFrom2.toDate(), targetImportThrough2.toDate());

package/lib/chevre/service/event.js

@@ -77,7 +77,6 @@ function importFromCOA(params) {
     // tslint:disable-next-line:max-func-body-length
     return (repos) => __awaiter(this, void 0, void 0, function* () {
         const project = params.project;
-        // paramsをそのまま抽出期間に適用するように変更(2024-04-24~)
         // const targetImportFrom = moment(`${moment(params.importFrom)
         //     .tz('Asia/Tokyo')
         //     .format('YYYY-MM-DD')}T00:00:00+09:00`);
@@ -85,24 +84,18 @@ function importFromCOA(params) {
         //     .tz('Asia/Tokyo')
         //     .format('YYYY-MM-DD')}T00:00:00+09:00`)
         //     .add(1, 'day');
-        // const begin: string = moment(targetImportFrom)
-        //     .add(-1, 'day') // 深夜帯スケジュールが前日検索の結果に含まれるため
-        //     .tz('Asia/Tokyo')
-        //     .format('YYYYMMDD'); // COAは日本時間で判断
-        // const end: string = moment(targetImportThrough)
-        //     .add(-1, 'day')
-        //     .tz('Asia/Tokyo')
-        //     .format('YYYYMMDD'); // COAは日本時間で判断
-        const targetImportFrom = moment(`${moment(params.importFrom)
+        const targetImportFrom = moment(params.importFrom)
             .tz('Asia/Tokyo')
-            .format('YYYY-MM-DD')}T00:00:00+09:00`);
-        const targetImportThrough = moment(`${moment(params.importThrough)
+            .startOf('day');
+        const targetImportThrough = moment(params.importThrough)
             .tz('Asia/Tokyo')
-            .format('YYYY-MM-DD')}T00:00:00+09:00`);
+            .endOf('day');
         const begin = moment(targetImportFrom)
+            .add(-1, 'day') // 深夜帯スケジュールが前日検索の結果に含まれるため
             .tz('Asia/Tokyo')
             .format('YYYYMMDD'); // COAは日本時間で判断
         const end = moment(targetImportThrough)
+            // .add(-1, 'day')
             .tz('Asia/Tokyo')
             .format('YYYYMMDD'); // COAは日本時間で判断
         debug('importing screening events...', targetImportFrom, targetImportThrough, begin, end);
@@ -177,8 +170,8 @@ function importFromCOA(params) {
                     screeningRooms,
                     screeningEventSerieses: screeningEventSerieses,
                     project: project,
-                    // targetImportFrom: targetImportFrom.toDate(),
-                    // targetImportThrough: targetImportThrough.toDate(),
+                    targetImportFrom: targetImportFrom.toDate(),
+                    targetImportThrough: targetImportThrough.toDate(),
                     seller: { id: seller.id },
                     instrument: { begin, end }
                 })(repos);
@@ -403,8 +396,14 @@ function createScreeningEvents(params) {
                 acousticKubuns: acousticKubuns,
                 seller: params.seller
             });
-            screeningEvents.push(screeningEvent);
+            // インポート期間で確実に絞る(2024-04-25~)
+            const isStartDateInTarget = moment(screeningEvent.startDate)
+                .isBetween(params.targetImportFrom, params.targetImportThrough, 'second', '[]');
+            if (isStartDateInTarget) {
+                screeningEvents.push(screeningEvent);
+            }
         });
+        debug('createScreeningEvents processed', params.targetImportFrom, params.targetImportThrough, params.instrument.begin, params.instrument.end, 'schedulesFromCOA.length:', schedulesFromCOA.length, 'screeningEvents.length:', screeningEvents.length);
         return screeningEvents;
     });
 }

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": "21.30.0-alpha.13"
+  "version": "21.30.0-alpha.14"
 }