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

package/example/src/chevre/importEventsFromCOA.ts

@@ -30,8 +30,8 @@ async function main() {
             .add(1, 'day')
             .toDate(),
         saveMovieTheater: false,
-        saveScreeningEventSeries: true,
-        saveScreeningEventSeriesPeriodInMonth: 24
+        saveScreeningEventSeries: false,
+        saveScreeningEventSeriesPeriodInMonth: 3
     })({
         action: actionRepo,
         categoryCode: categoryCodeRepo,

package/example/src/chevre/optimizeActions.ts

@@ -16,9 +16,8 @@ async function main() {
     for (let index = 0; index < 24 * 1000; index++) {
         const updateResult = await actionRepo.unsetUnnecessaryFields({
             filter: {
-                // typeOf: { $eq: chevre.factory.actionType.OrderAction },
+                typeOf: { $eq: chevre.factory.actionType.SendAction },
                 // 'agent.typeOf': { $exists: true, $eq: chevre.factory.creativeWorkType.WebApplication },
-                'agent.typeOf': { $exists: true, $eq: chevre.factory.personType.Person },
                 startDate: {
                     // $exists: true,
                     $gte: moment()
@@ -31,12 +30,12 @@ async function main() {
                 // _id: { $eq: '61da235d94a80f000af85f6b' }
             },
             $unset: {
-                'agent.identifier': 1,
-                'agent.memberOf': 1,
-                'agent.email': 1,
-                'agent.familyName': 1,
-                'agent.givenName': 1,
-                'agent.telephone': 1
+                'recipient.identifier': 1,
+                'recipient.memberOf': 1,
+                'recipient.email': 1,
+                'recipient.familyName': 1,
+                'recipient.givenName': 1,
+                'recipient.telephone': 1
                 // 'object.project': 1,
                 // 'object.seller': 1,
                 // 'object.customer': 1,

package/lib/chevre/service/event.d.ts

@@ -9,13 +9,7 @@ import type { MongoRepository as SellerRepo } from '../repo/seller';
 import type { MongoRepository as TaskRepo } from '../repo/task';
 import * as factory from '../factory';
 import { createEvent } from './event/createEvent';
-/**
- * Googleで作品画像を検索する
- */
-/**
- * イベントをインポートする
- */
-export declare function importFromCOA(params: {
+interface IImportFromCOAParams {
     project: {
         id: string;
         typeOf: factory.organizationType.Project;
@@ -35,7 +29,11 @@ export declare function importFromCOA(params: {
      */
     saveScreeningEventSeries: boolean;
     saveScreeningEventSeriesPeriodInMonth: number;
-}): (repos: {
+}
+/**
+ * イベントをインポートする
+ */
+export declare function importFromCOA(params: IImportFromCOAParams): (repos: {
     action: ActionRepo;
     categoryCode: CategoryCodeRepo;
     creativeWork: CreativeWorkRepo;

package/lib/chevre/service/event.js

@@ -30,53 +30,18 @@ const coaAuthClient = new COA.auth.RefreshToken({
     refreshToken: credentials_1.credentials.coa.refreshToken,
     useFetch: credentials_1.credentials.coa.useFetch
 });
-/**
- * Googleで作品画像を検索する
- */
-// export async function findMovieImage(params: {
-//     query: string;
-// }): Promise<string | undefined> {
-//     // カスタム検索エンジンIDの指定がなければ検索しない
-//     if (typeof credentials.customSearch.engineId !== 'string' || typeof credentials.customSearch.apiKey !== 'string') {
-//         return;
-//     }
-//     return new Promise<string | undefined>((resolve) => {
-//         customsearch.cse.list(
-//             {
-//                 cx: credentials.customSearch.engineId,
-//                 q: params.query,
-//                 auth: credentials.customSearch.apiKey,
-//                 num: 1,
-//                 rights: 'cc_publicdomain cc_sharealike',
-//                 // start: 0,
-//                 // imgSize: 'medium',
-//                 searchType: 'image'
-//             },
-//             (err: any, res: any) => {
-//                 if (!(err instanceof Error)) {
-//                     if (typeof res.data === 'object' && Array.isArray(res.data.items) && res.data.items.length > 0) {
-//                         resolve(<string>res.data.items[0].image.thumbnailLink);
-//                         // resolve(<string>res.data.items[0].link);
-//                         return;
-//                         // thumbnails.push({
-//                         //     eventId: event.id,
-//                         //     link: res.data.items[0].link,
-//                         //     thumbnailLink: res.data.items[0].image.thumbnailLink
-//                         // });
-//                     }
-//                 }
-//                 resolve();
-//             }
-//         );
-//     });
-// }
 /**
  * イベントをインポートする
  */
 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 masterService = new COA.service.Master({
+            endpoint: credentials_1.credentials.coa.endpoint,
+            auth: coaAuthClient
+        }, { timeout: credentials_1.credentials.coa.timeout });
+        // 施設更新アクションを分離(2024-04-26~)
+        const { seller, movieTheater, screeningRooms } = yield processUpdateMovieTheater(params)(Object.assign(Object.assign({}, repos), { masterService }));
         // const targetImportFrom = moment(`${moment(params.importFrom)
         //     .tz('Asia/Tokyo')
         //     .format('YYYY-MM-DD')}T00:00:00+09:00`);
@@ -99,65 +64,33 @@ function importFromCOA(params) {
             .tz('Asia/Tokyo')
             .format('YYYYMMDD'); // COAは日本時間で判断
         debug('importing screening events...', targetImportFrom, targetImportThrough, begin, end);
+        const instrument = {
+            theaterCode: params.locationBranchCode,
+            begin,
+            end,
+            typeOf: 'WebAPI',
+            identifier: factory.service.webAPI.Identifier.COA
+        };
         const actionAttributes = {
             project: { typeOf: factory.organizationType.Project, id: params.project.id },
-            typeOf: factory.actionType.UpdateAction,
+            // typeOf: factory.actionType.UpdateAction,
+            typeOf: factory.actionType.ReplaceAction,
             agent: { typeOf: factory.organizationType.Project, id: params.project.id },
-            object: Object.assign(Object.assign({}, params), { typeOf: factory.eventType.ScreeningEvent }),
-            instrument: {
-                begin,
-                end,
-                typeOf: 'WebAPI',
-                identifier: factory.service.webAPI.Identifier.COA
-            }
+            object: Object.assign(Object.assign({}, params), { startDate: `${moment(targetImportFrom) // debug(2024-04-26~)
+                    .toISOString()}/${moment(targetImportThrough)
+                    .toISOString()}`, superEvent: { location: { branchCode: params.locationBranchCode } }, typeOf: factory.eventType.ScreeningEvent }),
+            instrument
         };
         const action = yield repos.action.start(actionAttributes);
         let savedScreeningEventsCount = 0;
         let savedScreeningEventSeriesCount = 0;
+        let cancelledIds = [];
+        let processTime;
         try {
-            const masterService = new COA.service.Master({
-                endpoint: credentials_1.credentials.coa.endpoint,
-                auth: coaAuthClient
-            }, { timeout: credentials_1.credentials.coa.timeout });
-            // 同ブランチコードの販売者を検索する
-            const sellersWithSameBranchCode = yield repos.seller.search({
-                limit: 1,
-                page: 1,
-                project: { id: { $eq: project.id } },
-                branchCode: { $eq: params.locationBranchCode }
-            }, ['_id'], []);
-            const seller = sellersWithSameBranchCode.shift();
-            if (typeof (seller === null || seller === void 0 ? void 0 : seller.id) !== 'string') {
-                throw new factory.errors.NotFound('Seller', `Seller with branchCod '${params.locationBranchCode}' not found`);
-            }
-            // saveMovieTheater:trueの場合のみ、施設保管(2022-10-10~)
-            if (params.saveMovieTheater === true) {
-                const savingMovieTheater = createMovieTheaterFromCOA(project, { id: seller.id }, yield masterService.theater({ theaterCode: params.locationBranchCode }), yield masterService.screen({ theaterCode: params.locationBranchCode }));
-                yield repos.movieTheater.saveMovieTheaterByBranchCode4coa(savingMovieTheater);
-                // } else {
-                //     movieTheater = await repos.place.findMovieTheaterByBranchCode({
-                //         project: { id: project.id },
-                //         branchCode: creatingMovieTheater.branchCode
-                //     });
-            }
-            const movieTheaters = yield repos.movieTheater.searchMovieTheaters({
-                limit: 1,
-                page: 1,
-                project: { id: { $eq: project.id } },
-                branchCode: { $eq: params.locationBranchCode }
-            }, ['_id', 'typeOf', 'branchCode', 'name', 'kanaName'], []);
-            const movieTheater = movieTheaters.shift();
-            if (movieTheater === undefined) {
-                throw new factory.errors.NotFound(factory.placeType.MovieTheater);
-            }
-            const screeningRooms = yield repos.screeningRoom.searchScreeningRooms({
-                project: { id: { $eq: project.id } },
-                containedInPlace: { branchCode: { $eq: movieTheater.branchCode } }
-            });
             const { screeningEventSerieses, savedEventsCount } = yield saveScreeningEventSeries({
                 locationBranchCode: params.locationBranchCode,
                 movieTheater,
-                project: project,
+                project: params.project,
                 saveScreeningEventSeries: params.saveScreeningEventSeries,
                 saveScreeningEventSeriesPeriodInMonth: params.saveScreeningEventSeriesPeriodInMonth,
                 seller: { id: seller.id }
@@ -165,25 +98,27 @@ function importFromCOA(params) {
             savedScreeningEventSeriesCount = savedEventsCount;
             try {
                 // イベント永続化
+                const processStart = process.hrtime.bigint();
                 const screeningEvents = yield saveScreeningEvents({
-                    locationBranchCode: params.locationBranchCode,
                     screeningRooms,
                     screeningEventSerieses: screeningEventSerieses,
-                    project: project,
+                    project: params.project,
                     targetImportFrom: targetImportFrom.toDate(),
                     targetImportThrough: targetImportThrough.toDate(),
                     seller: { id: seller.id },
-                    instrument: { begin, end }
+                    instrument
                 })(repos);
                 savedScreeningEventsCount = screeningEvents.length;
                 // COAから削除されたイベントをキャンセル済ステータスへ変更
-                yield cancelDeletedEvents({
+                cancelledIds = yield cancelDeletedEvents({
                     project: params.project,
                     locationBranchCode: params.locationBranchCode,
                     targetImportFrom: targetImportFrom.toDate(),
                     targetImportThrough: targetImportThrough.toDate(),
                     idsShouldBe: screeningEvents.map((e) => e.id)
                 })(repos);
+                const processEnd = process.hrtime.bigint();
+                processTime = processEnd - processStart;
             }
             catch (error) {
                 let throwsError = true;
@@ -213,12 +148,82 @@ function importFromCOA(params) {
             }
             throw error;
         }
-        // アクション完了
-        const actionResult = { savedScreeningEventsCount, savedScreeningEventSeriesCount };
+        const actionResult = Object.assign({ cancelledIds,
+            savedScreeningEventsCount,
+            savedScreeningEventSeriesCount }, (processTime !== undefined) ? { processTime } : undefined);
         yield repos.action.completeWithVoid({ typeOf: action.typeOf, id: action.id, result: actionResult });
     });
 }
 exports.importFromCOA = importFromCOA;
+// tslint:disable-next-line:max-func-body-length
+function processUpdateMovieTheater(params) {
+    return (repos) => __awaiter(this, void 0, void 0, function* () {
+        const actionAttributes = {
+            project: { typeOf: factory.organizationType.Project, id: params.project.id },
+            typeOf: factory.actionType.ReplaceAction,
+            agent: { typeOf: factory.organizationType.Project, id: params.project.id },
+            object: Object.assign(Object.assign({}, params), { branchCode: params.locationBranchCode, typeOf: factory.placeType.MovieTheater }),
+            instrument: {
+                theaterCode: params.locationBranchCode,
+                typeOf: 'WebAPI',
+                identifier: factory.service.webAPI.Identifier.COA
+            }
+        };
+        const action = yield repos.action.start(actionAttributes);
+        let seller;
+        let movieTheater;
+        let screeningRooms;
+        let processTime;
+        try {
+            // 同ブランチコードの販売者を検索する
+            const sellersWithSameBranchCode = yield repos.seller.search({
+                limit: 1,
+                page: 1,
+                project: { id: { $eq: params.project.id } },
+                branchCode: { $eq: params.locationBranchCode }
+            }, ['_id'], []);
+            const sellerWithSameBranchCode = sellersWithSameBranchCode.shift();
+            if (typeof (sellerWithSameBranchCode === null || sellerWithSameBranchCode === void 0 ? void 0 : sellerWithSameBranchCode.id) !== 'string') {
+                throw new factory.errors.NotFound('Seller', `Seller with branchCode '${params.locationBranchCode}' not found`);
+            }
+            seller = { id: sellerWithSameBranchCode.id };
+            // saveMovieTheater:trueの場合のみ、施設保管(2022-10-10~)
+            if (params.saveMovieTheater === true) {
+                const processStart = process.hrtime.bigint();
+                const savingMovieTheater = createMovieTheaterFromCOA(params.project, { id: seller.id }, yield repos.masterService.theater({ theaterCode: params.locationBranchCode }), yield repos.masterService.screen({ theaterCode: params.locationBranchCode }));
+                yield repos.movieTheater.saveMovieTheaterByBranchCode4coa(savingMovieTheater);
+                const processEnd = process.hrtime.bigint();
+                processTime = processEnd - processStart;
+            }
+            const movieTheaters = yield repos.movieTheater.searchMovieTheaters({
+                limit: 1,
+                page: 1,
+                project: { id: { $eq: params.project.id } },
+                branchCode: { $eq: params.locationBranchCode }
+            }, ['_id', 'typeOf', 'branchCode', 'name', 'kanaName'], []);
+            movieTheater = movieTheaters.shift();
+            if (movieTheater === undefined) {
+                throw new factory.errors.NotFound(factory.placeType.MovieTheater);
+            }
+            screeningRooms = yield repos.screeningRoom.searchScreeningRooms({
+                project: { id: { $eq: params.project.id } },
+                containedInPlace: { branchCode: { $eq: movieTheater.branchCode } }
+            });
+        }
+        catch (error) {
+            try {
+                yield repos.action.giveUp({ typeOf: action.typeOf, id: action.id, error });
+            }
+            catch (__) {
+                // 失敗したら仕方ない
+            }
+            throw error;
+        }
+        const actionResult = Object.assign({ screeningRoomsCount: screeningRooms.length }, (processTime !== undefined) ? { processTime } : undefined);
+        yield repos.action.completeWithVoid({ typeOf: action.typeOf, id: action.id, result: actionResult });
+        return { seller, movieTheater, screeningRooms };
+    });
+}
 function saveScreeningEventSeries(params) {
     // tslint:disable-next-line:max-func-body-length
     return (repos) => __awaiter(this, void 0, void 0, function* () {
@@ -349,24 +354,24 @@ function createScreeningEvents(params) {
         }, { timeout: credentials_1.credentials.coa.timeout });
         // COAからイベント取得;
         const schedulesFromCOA = yield masterService.schedule({
-            theaterCode: params.locationBranchCode,
+            theaterCode: params.instrument.theaterCode,
             begin: params.instrument.begin,
             end: params.instrument.end // COAは日本時間で判断
         });
         // COAから区分マスター抽出
         const serviceKubuns = yield masterService.kubunName({
-            theaterCode: params.locationBranchCode,
+            theaterCode: params.instrument.theaterCode,
             kubunClass: '009'
         });
         const acousticKubuns = yield masterService.kubunName({
-            theaterCode: params.locationBranchCode,
+            theaterCode: params.instrument.theaterCode,
             kubunClass: '046'
         });
         // イベントごとに永続化トライ
         const screeningEvents = [];
         schedulesFromCOA.forEach((scheduleFromCOA) => {
             const screeningEventSeriesId = createScreeningEventSeriesId({
-                theaterCode: params.locationBranchCode,
+                theaterCode: params.instrument.theaterCode,
                 titleCode: scheduleFromCOA.titleCode,
                 titleBranchNum: scheduleFromCOA.titleBranchNum
             });
@@ -435,6 +440,7 @@ function cancelDeletedEvents(params) {
             }
         }
         debug(`${cancelledIds.length} events cancelled.`);
+        return cancelledIds;
     });
 }
 /**

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