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

package/example/src/chevre/optimizeActions.ts

@@ -17,8 +17,8 @@ async function main() {
         const updateResult = await actionRepo.unsetUnnecessaryFields({
             filter: {
                 // typeOf: { $eq: chevre.factory.actionType.OrderAction },
-                'agent.typeOf': { $exists: true, $eq: chevre.factory.creativeWorkType.WebApplication },
-                // 'agent.typeOf': { $exists: true, $eq: chevre.factory.personType.Person },
+                // 'agent.typeOf': { $exists: true, $eq: chevre.factory.creativeWorkType.WebApplication },
+                'agent.typeOf': { $exists: true, $eq: chevre.factory.personType.Person },
                 startDate: {
                     // $exists: true,
                     $gte: moment()

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,19 +77,25 @@ function importFromCOA(params) {
     // tslint:disable-next-line:max-func-body-length
     return (repos) => __awaiter(this, void 0, void 0, function* () {
         const project = params.project;
-        const targetImportFrom = moment(`${moment(params.importFrom)
+        // const targetImportFrom = moment(`${moment(params.importFrom)
+        //     .tz('Asia/Tokyo')
+        //     .format('YYYY-MM-DD')}T00:00:00+09:00`);
+        // const targetImportThrough = moment(`${moment(params.importThrough)
+        //     .tz('Asia/Tokyo')
+        //     .format('YYYY-MM-DD')}T00:00:00+09:00`)
+        //     .add(1, 'day');
+        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`)
-            .add(1, 'day');
+            .endOf('day');
         const begin = moment(targetImportFrom)
             .add(-1, 'day') // 深夜帯スケジュールが前日検索の結果に含まれるため
             .tz('Asia/Tokyo')
             .format('YYYYMMDD'); // COAは日本時間で判断
         const end = moment(targetImportThrough)
-            .add(-1, 'day')
+            // .add(-1, 'day')
             .tz('Asia/Tokyo')
             .format('YYYYMMDD'); // COAは日本時間で判断
         debug('importing screening events...', targetImportFrom, targetImportThrough, begin, end);
@@ -97,8 +103,13 @@ function importFromCOA(params) {
             project: { typeOf: factory.organizationType.Project, id: params.project.id },
             typeOf: factory.actionType.UpdateAction,
             agent: { typeOf: factory.organizationType.Project, id: params.project.id },
-            object: Object.assign(Object.assign({}, params), { begin,
-                end, typeOf: factory.eventType.ScreeningEvent })
+            object: Object.assign(Object.assign({}, params), { typeOf: factory.eventType.ScreeningEvent }),
+            instrument: {
+                begin,
+                end,
+                typeOf: 'WebAPI',
+                identifier: factory.service.webAPI.Identifier.COA
+            }
         };
         const action = yield repos.action.start(actionAttributes);
         let savedScreeningEventsCount = 0;
@@ -156,13 +167,13 @@ function importFromCOA(params) {
                 // イベント永続化
                 const screeningEvents = yield saveScreeningEvents({
                     locationBranchCode: params.locationBranchCode,
-                    // movieTheater: movieTheater,
                     screeningRooms,
                     screeningEventSerieses: screeningEventSerieses,
                     project: project,
                     targetImportFrom: targetImportFrom.toDate(),
                     targetImportThrough: targetImportThrough.toDate(),
-                    seller: { id: seller.id }
+                    seller: { id: seller.id },
+                    instrument: { begin, end }
                 })(repos);
                 savedScreeningEventsCount = screeningEvents.length;
                 // COAから削除されたイベントをキャンセル済ステータスへ変更
@@ -330,7 +341,6 @@ function saveScreeningEvents(params) {
 }
 function createScreeningEvents(params) {
     return () => __awaiter(this, void 0, void 0, function* () {
-        // const movieTheater = params.movieTheater;
         const screeningEventSerieses = params.screeningEventSerieses;
         const project = params.project;
         const masterService = new COA.service.Master({
@@ -340,14 +350,8 @@ function createScreeningEvents(params) {
         // COAからイベント取得;
         const schedulesFromCOA = yield masterService.schedule({
             theaterCode: params.locationBranchCode,
-            begin: moment(params.targetImportFrom)
-                .add(-1, 'day') // 深夜帯スケジュールが前日検索の結果に含まれるため
-                .tz('Asia/Tokyo')
-                .format('YYYYMMDD'),
-            end: moment(params.targetImportThrough)
-                .add(-1, 'day')
-                .tz('Asia/Tokyo')
-                .format('YYYYMMDD') // COAは日本時間で判断
+            begin: params.instrument.begin,
+            end: params.instrument.end // COAは日本時間で判断
         });
         // COAから区分マスター抽出
         const serviceKubuns = yield masterService.kubunName({
@@ -392,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.12"
+  "version": "21.30.0-alpha.14"
 }