@chevre/domain 23.2.0-alpha.61 → 23.2.0-alpha.62

package/lib/chevre/service/event/saveScreeningEventSeries.js

@@ -1,13 +1,4 @@
 "use strict";
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.createScreeningEventSeriesId = createScreeningEventSeriesId;
 exports.saveScreeningEventSeries = saveScreeningEventSeries;
@@ -31,14 +22,14 @@ const debug = createDebug('chevre-domain:service:event');
  */
 function saveScreeningEventSeries(params, options) {
     // tslint:disable-next-line:max-func-body-length
-    return (repos) => __awaiter(this, void 0, void 0, function* () {
+    return async (repos) => {
         const { importingIds, locationBranchCode, project } = params;
         const { filterFilmsFromCOA } = options;
         let filteredByTitle = false;
         // COAから作品取得
-        let filmsFromCOA = yield repos.masterService.title({ theaterCode: locationBranchCode });
-        if (typeof (filterFilmsFromCOA === null || filterFilmsFromCOA === void 0 ? void 0 : filterFilmsFromCOA.titleBranchNum) === 'string'
-            && typeof (filterFilmsFromCOA === null || filterFilmsFromCOA === void 0 ? void 0 : filterFilmsFromCOA.titleBranchNum) === 'string') {
+        let filmsFromCOA = await repos.masterService.title({ theaterCode: locationBranchCode });
+        if (typeof filterFilmsFromCOA?.titleBranchNum === 'string'
+            && typeof filterFilmsFromCOA?.titleBranchNum === 'string') {
             filmsFromCOA = filmsFromCOA.filter((film) => {
                 return film.titleBranchNum === filterFilmsFromCOA.titleBranchNum
                     && film.titleCode === filterFilmsFromCOA.titleCode;
@@ -48,24 +39,24 @@ function saveScreeningEventSeries(params, options) {
         }
         debug(filmsFromCOA.length, 'filmsFromCOA processing...');
         // COAから区分マスター抽出
-        const eirinKubuns = yield repos.masterService.kubunName({
+        const eirinKubuns = await repos.masterService.kubunName({
             theaterCode: locationBranchCode,
             kubunClass: '044'
         });
-        const eizouKubuns = yield repos.masterService.kubunName({
+        const eizouKubuns = await repos.masterService.kubunName({
             theaterCode: locationBranchCode,
             kubunClass: '042'
         });
-        const joueihousikiKubuns = yield repos.masterService.kubunName({
+        const joueihousikiKubuns = await repos.masterService.kubunName({
             theaterCode: locationBranchCode,
             kubunClass: '045'
         });
-        const jimakufukikaeKubuns = yield repos.masterService.kubunName({
+        const jimakufukikaeKubuns = await repos.masterService.kubunName({
             theaterCode: locationBranchCode,
             kubunClass: '043'
         });
         debug('kubunNames found.');
-        const availablePaymentMethodTypes = yield repos.categoryCode.projectCategoryCodeFields({
+        const availablePaymentMethodTypes = await repos.categoryCode.projectCategoryCodeFields({
             project: { id: { $eq: params.project.id } },
             inCodeSet: { identifier: { $eq: factory.categoryCode.CategorySetIdentifier.PaymentMethodType } }
         }, ['additionalProperty', 'codeValue']);
@@ -129,20 +120,27 @@ function saveScreeningEventSeries(params, options) {
                 });
             }
             debug('saving', saveParams.length, 'ScreeningEventSeries...');
-            yield repos.eventSeries.upsertManyEventSeriesById4sskts(saveParams);
+            await repos.eventSeries.upsertManyEventSeriesById4sskts(saveParams);
             debug('saved', saveParams.length, 'ScreeningEventSeries');
             savedEventsCount = saveParams.length;
             // コンテンツ永続化(2023-10-23~)
             try {
                 debug('saving', saveParams.length, 'movies...');
-                yield repos.creativeWork.upsertMoviesByIdentifier(saveParams.map((saveScreeningEventSeriesParams) => {
-                    var _a;
+                await repos.creativeWork.upsertMoviesByIdentifier(saveParams.map((saveScreeningEventSeriesParams) => {
                     return {
-                        $set: Object.assign(Object.assign({ typeOf: factory.creativeWorkType.Movie, project: params.project, identifier: saveScreeningEventSeriesParams.attributes.workPerformed.identifier, name: { ja: (_a = saveScreeningEventSeriesParams.attributes.workPerformed.name) === null || _a === void 0 ? void 0 : _a.ja }, offers: { typeOf: factory.offerType.Offer } }, (typeof saveScreeningEventSeriesParams.attributes.workPerformed.contentRating === 'string')
-                            ? { contentRating: saveScreeningEventSeriesParams.attributes.workPerformed.contentRating }
-                            : undefined), (typeof saveScreeningEventSeriesParams.attributes.workPerformed.duration === 'string')
-                            ? { duration: saveScreeningEventSeriesParams.attributes.workPerformed.duration }
-                            : undefined)
+                        $set: {
+                            typeOf: factory.creativeWorkType.Movie,
+                            project: params.project,
+                            identifier: saveScreeningEventSeriesParams.attributes.workPerformed.identifier,
+                            name: { ja: saveScreeningEventSeriesParams.attributes.workPerformed.name?.ja },
+                            offers: { typeOf: factory.offerType.Offer },
+                            ...(typeof saveScreeningEventSeriesParams.attributes.workPerformed.contentRating === 'string')
+                                ? { contentRating: saveScreeningEventSeriesParams.attributes.workPerformed.contentRating }
+                                : undefined,
+                            ...(typeof saveScreeningEventSeriesParams.attributes.workPerformed.duration === 'string')
+                                ? { duration: saveScreeningEventSeriesParams.attributes.workPerformed.duration }
+                                : undefined
+                        }
                     };
                 }));
                 debug('saved', saveParams.length, 'movies');
@@ -153,7 +151,7 @@ function saveScreeningEventSeries(params, options) {
             }
         }
         return { screeningEventSerieses, savedEventsCount };
-    });
+    };
 }
 /**
  * 作品抽出結果から施設コンテンツを作成する
@@ -179,14 +177,20 @@ function createScreeningEventSeriesFromCOA(params) {
     });
     const { additionalProperty, coaInfo } = createScreeningEventSeriesAdditionalPropertyFromCOA(params);
     const { unacceptedPaymentMethod } = createScreeningEventSeriesUnacceptedPaymentMethodFromCOA(params);
-    const workPerformed = Object.assign({ 
+    const workPerformed = {
         // id: `${params.movieTheater.branchCode}-${params.filmFromCOA.titleCode}`, // discontinue(2025-01-03~)
-        identifier: params.filmFromCOA.titleCode, name: {
+        identifier: params.filmFromCOA.titleCode,
+        name: {
             ja: params.filmFromCOA.titleNameOrig
-        }, duration: moment.duration(params.filmFromCOA.showTime, 'm')
-            .toISOString(), contentRating: params.eirinKubuns.filter((kubun) => kubun.kubunCode === params.filmFromCOA.kbnEirin)[0], typeOf: factory.creativeWorkType.Movie }, (typeof params.filmFromCOA.titleBranchNum === 'string' && params.filmFromCOA.titleBranchNum.length > 0)
-        ? { version: params.filmFromCOA.titleBranchNum } // add version(2024-01-31~)
-        : undefined);
+        },
+        duration: moment.duration(params.filmFromCOA.showTime, 'm')
+            .toISOString(),
+        contentRating: params.eirinKubuns.filter((kubun) => kubun.kubunCode === params.filmFromCOA.kbnEirin)[0],
+        typeOf: factory.creativeWorkType.Movie,
+        ...(typeof params.filmFromCOA.titleBranchNum === 'string' && params.filmFromCOA.titleBranchNum.length > 0)
+            ? { version: params.filmFromCOA.titleBranchNum } // add version(2024-01-31~)
+            : undefined
+    };
     // redefine videoFormat(2024-09-18~)
     // const videoFormat: factory.eventSeries.IVideoFormat[] =
     //     params.joueihousikiKubuns.filter(({ kubunCode }) => kubunCode === params.filmFromCOA.kbnJoueihousiki)
@@ -221,12 +225,27 @@ function createScreeningEventSeriesFromCOA(params) {
         endDate: endDate,
         startDate: startDate,
         coaInfo,
-        offers: Object.assign({ typeOf: factory.offerType.Offer }, (Array.isArray(unacceptedPaymentMethod)) ? { unacceptedPaymentMethod: unacceptedPaymentMethod } : undefined),
+        offers: {
+            typeOf: factory.offerType.Offer,
+            ...(Array.isArray(unacceptedPaymentMethod)) ? { unacceptedPaymentMethod: unacceptedPaymentMethod } : undefined
+        },
         additionalProperty
     };
 }
 function createScreeningEventSeriesAdditionalPropertyFromCOA(params) {
-    const coaInfo = Object.assign(Object.assign(Object.assign({ titleBranchNum: params.filmFromCOA.titleBranchNum, kbnEirin: params.eirinKubuns.filter((k) => k.kubunCode === params.filmFromCOA.kbnEirin)[0], kbnEizou: params.eizouKubuns.filter((k) => k.kubunCode === params.filmFromCOA.kbnEizou)[0], kbnJoueihousiki: params.joueihousikiKubuns.filter((k) => k.kubunCode === params.filmFromCOA.kbnJoueihousiki)[0], kbnJimakufukikae: params.jimakufukikaeKubuns.filter((k) => k.kubunCode === params.filmFromCOA.kbnJimakufukikae)[0], flgMvtkUse: params.filmFromCOA.flgMvtkUse, dateMvtkBegin: params.filmFromCOA.dateMvtkBegin }, (typeof params.filmFromCOA.flgMgtkUse === 'string') ? { flgMgtkUse: params.filmFromCOA.flgMgtkUse } : undefined), (typeof params.filmFromCOA.dateMgtkBegin === 'string') ? { dateMgtkBegin: params.filmFromCOA.dateMgtkBegin } : undefined), (typeof params.filmFromCOA.flgNotDiscount === 'string') ? { flgNotDiscount: params.filmFromCOA.flgNotDiscount } : undefined);
+    const coaInfo = {
+        titleBranchNum: params.filmFromCOA.titleBranchNum,
+        kbnEirin: params.eirinKubuns.filter((k) => k.kubunCode === params.filmFromCOA.kbnEirin)[0],
+        kbnEizou: params.eizouKubuns.filter((k) => k.kubunCode === params.filmFromCOA.kbnEizou)[0],
+        kbnJoueihousiki: params.joueihousikiKubuns.filter((k) => k.kubunCode === params.filmFromCOA.kbnJoueihousiki)[0],
+        kbnJimakufukikae: params.jimakufukikaeKubuns.filter((k) => k.kubunCode === params.filmFromCOA.kbnJimakufukikae)[0],
+        flgMvtkUse: params.filmFromCOA.flgMvtkUse,
+        dateMvtkBegin: params.filmFromCOA.dateMvtkBegin,
+        ...(typeof params.filmFromCOA.flgMgtkUse === 'string') ? { flgMgtkUse: params.filmFromCOA.flgMgtkUse } : undefined,
+        ...(typeof params.filmFromCOA.dateMgtkBegin === 'string') ? { dateMgtkBegin: params.filmFromCOA.dateMgtkBegin } : undefined,
+        // add flgNotDiscount(2024-08-27~)
+        ...(typeof params.filmFromCOA.flgNotDiscount === 'string') ? { flgNotDiscount: params.filmFromCOA.flgNotDiscount } : undefined
+    };
     return {
         coaInfo,
         additionalProperty: [
@@ -245,7 +264,7 @@ function createScreeningEventSeriesUnacceptedPaymentMethodFromCOA(params) {
             unacceptedPaymentMethod = [];
         }
         // flgMvtkUseで決済方法区分から動的に
-        unacceptedPaymentMethod.push(...params.availablePaymentMethodTypes.filter(({ additionalProperty }) => { var _a; return ((_a = additionalProperty === null || additionalProperty === void 0 ? void 0 : additionalProperty.find(({ name }) => name === 'flgMvtkUse')) === null || _a === void 0 ? void 0 : _a.value) === '1'; })
+        unacceptedPaymentMethod.push(...params.availablePaymentMethodTypes.filter(({ additionalProperty }) => additionalProperty?.find(({ name }) => name === 'flgMvtkUse')?.value === '1')
             .map(({ codeValue }) => codeValue));
     }
     if (params.filmFromCOA.flgMgtkUse === '0') {
@@ -253,7 +272,7 @@ function createScreeningEventSeriesUnacceptedPaymentMethodFromCOA(params) {
             unacceptedPaymentMethod = [];
         }
         // flgMgtkUseで決済方法区分から動的に
-        unacceptedPaymentMethod.push(...params.availablePaymentMethodTypes.filter(({ additionalProperty }) => { var _a; return ((_a = additionalProperty === null || additionalProperty === void 0 ? void 0 : additionalProperty.find(({ name }) => name === 'flgMgtkUse')) === null || _a === void 0 ? void 0 : _a.value) === '1'; })
+        unacceptedPaymentMethod.push(...params.availablePaymentMethodTypes.filter(({ additionalProperty }) => additionalProperty?.find(({ name }) => name === 'flgMgtkUse')?.value === '1')
             .map(({ codeValue }) => codeValue));
     }
     if (Array.isArray(unacceptedPaymentMethod)) {

package/lib/chevre/service/event/saveScreeningEvents.js

@@ -1,13 +1,4 @@
 "use strict";
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.createScreeningEventIdFromCOA = createScreeningEventIdFromCOA;
 exports.saveScreeningEvents = saveScreeningEvents;
@@ -18,8 +9,8 @@ const factory = require("../../factory");
 const saveScreeningEventSeries_1 = require("./saveScreeningEventSeries");
 const debug = createDebug('chevre-domain:service:event');
 function saveScreeningEvents(params, options) {
-    return (repos) => __awaiter(this, void 0, void 0, function* () {
-        const screeningEvents = yield createScreeningEvents(params, options)(repos);
+    return async (repos) => {
+        const screeningEvents = await createScreeningEvents(params, options)(repos);
         // 永続化
         debug(`storing ${screeningEvents.length} screeningEvents...`);
         const saveParams = [];
@@ -36,14 +27,14 @@ function saveScreeningEvents(params, options) {
                 // no op
             }
         }
-        yield repos.event.saveManyEvents(saveParams);
+        await repos.event.saveManyEvents(saveParams);
         debug(`${screeningEvents.length} screeningEvents stored.`);
         return screeningEvents;
-    });
+    };
 }
 function createScreeningEvents(params, options) {
     // tslint:disable-next-line:max-func-body-length
-    return (repos) => __awaiter(this, void 0, void 0, function* () {
+    return async (repos) => {
         const { filterSchedulesFromCOA } = options;
         // let filteredByTitle: boolean = false;
         const project = params.project;
@@ -54,14 +45,14 @@ function createScreeningEvents(params, options) {
             throw new factory.errors.ArgumentNull('instrument.end');
         }
         // COAからイベント取得;
-        let schedulesFromCOA = yield repos.masterService.schedule({
+        let schedulesFromCOA = await repos.masterService.schedule({
             theaterCode: params.instrument.theaterCode,
             begin: params.instrument.begin, // COAは日本時間で判断
             end: params.instrument.end // COAは日本時間で判断
         });
-        if (typeof (filterSchedulesFromCOA === null || filterSchedulesFromCOA === void 0 ? void 0 : filterSchedulesFromCOA.titleBranchNum) === 'string'
-            && typeof (filterSchedulesFromCOA === null || filterSchedulesFromCOA === void 0 ? void 0 : filterSchedulesFromCOA.titleBranchNum) === 'string'
-            && typeof (filterSchedulesFromCOA === null || filterSchedulesFromCOA === void 0 ? void 0 : filterSchedulesFromCOA.roomCode) === 'string') {
+        if (typeof filterSchedulesFromCOA?.titleBranchNum === 'string'
+            && typeof filterSchedulesFromCOA?.titleBranchNum === 'string'
+            && typeof filterSchedulesFromCOA?.roomCode === 'string') {
             schedulesFromCOA = schedulesFromCOA.filter((scheduleFromCOA) => {
                 return scheduleFromCOA.titleBranchNum === filterSchedulesFromCOA.titleBranchNum
                     && scheduleFromCOA.titleCode === filterSchedulesFromCOA.titleCode
@@ -72,11 +63,11 @@ function createScreeningEvents(params, options) {
         }
         debug(schedulesFromCOA.length, 'schedulesFromCOA processing...');
         // COAから区分マスター抽出
-        const serviceKubuns = yield repos.masterService.kubunName({
+        const serviceKubuns = await repos.masterService.kubunName({
             theaterCode: params.instrument.theaterCode,
             kubunClass: '009'
         });
-        const acousticKubuns = yield repos.masterService.kubunName({
+        const acousticKubuns = await repos.masterService.kubunName({
             theaterCode: params.instrument.theaterCode,
             kubunClass: '046'
         });
@@ -95,7 +86,7 @@ function createScreeningEvents(params, options) {
                 }))];
             debug('searching eventSeries... importingEventSeriesIds:', importingEventSeriesIds);
             if (importingEventSeriesIds.length > 0) {
-                screeningEventSerieses = yield repos.eventSeries.projectEventSeriesFields({
+                screeningEventSerieses = await repos.eventSeries.projectEventSeriesFields({
                     id: { $in: importingEventSeriesIds },
                     project: { id: { $eq: params.project.id } }
                 }, [
@@ -110,7 +101,7 @@ function createScreeningEvents(params, options) {
                 debug(screeningEventSerieses.length, 'screeningEventSerieses for importing events found.');
                 // 万が一未インポートの施設コンテンツがあれば強制的にインポート(2024-09-09~)
                 if (screeningEventSerieses.length < importingEventSeriesIds.length) {
-                    const saveScreeningEventSeriesResult = yield (0, saveScreeningEventSeries_1.saveScreeningEventSeries)({
+                    const saveScreeningEventSeriesResult = await (0, saveScreeningEventSeries_1.saveScreeningEventSeries)({
                         locationBranchCode: params.instrument.theaterCode,
                         movieTheater: params.movieTheater,
                         project: params.project,
@@ -169,7 +160,7 @@ function createScreeningEvents(params, options) {
         });
         debug('createScreeningEvents processed', params.targetImportFrom, params.targetImportThrough, params.instrument.begin, params.instrument.end, 'schedulesFromCOA.length:', schedulesFromCOA.length, 'screeningEvents.length:', screeningEvents.length);
         return screeningEvents;
-    });
+    };
 }
 function minimizeSuperEvent(params) {
     const { workPerformed, 

package/lib/chevre/service/event.js

@@ -1,13 +1,4 @@
 "use strict";
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.saveScreeningEvents = exports.saveScreeningEventSeries = void 0;
 exports.importFromCOA = importFromCOA;
@@ -29,9 +20,9 @@ const debug = createDebug('chevre-domain:service:event');
  */
 function importFromCOA(params) {
     // tslint:disable-next-line:max-func-body-length
-    return (repos) => __awaiter(this, void 0, void 0, function* () {
+    return async (repos) => {
         // 施設更新アクションを分離(2024-04-26~)
-        const { seller, movieTheater, screeningRooms } = yield (0, processUpdateMovieTheater_1.processUpdateMovieTheater)(params)(repos);
+        const { seller, movieTheater, screeningRooms } = await (0, processUpdateMovieTheater_1.processUpdateMovieTheater)(params)(repos);
         // const targetImportFrom = moment(`${moment(params.importFrom)
         //     .tz('Asia/Tokyo')
         //     .format('YYYY-MM-DD')}T00:00:00+09:00`);
@@ -66,13 +57,18 @@ function importFromCOA(params) {
             // typeOf: factory.actionType.UpdateAction,
             typeOf: factory.actionType.ReplaceAction, // Replaceに変更(2024-04-26~)
             agent: { typeOf: factory.organizationType.Project, id: params.project.id },
-            object: Object.assign(Object.assign({}, params), { startDate: `${moment(targetImportFrom) // debug(2024-04-26~)
+            object: {
+                ...params,
+                startDate: `${moment(targetImportFrom) // debug(2024-04-26~)
                     .toISOString()}/${moment(targetImportThrough)
-                    .toISOString()}`, superEvent: { location: { branchCode: params.locationBranchCode } }, typeOf: factory.eventType.ScreeningEvent }),
+                    .toISOString()}`,
+                superEvent: { location: { branchCode: params.locationBranchCode } },
+                typeOf: factory.eventType.ScreeningEvent
+            },
             instrument,
             targetCollection: { typeOf: factory.eventType.ScreeningEvent }
         };
-        const action = yield repos.action.start(actionAttributes);
+        const action = await repos.action.start(actionAttributes);
         let savedScreeningEventsCount = 0;
         let savedScreeningEventSeriesCount = 0;
         let cancelledIds = [];
@@ -80,7 +76,7 @@ function importFromCOA(params) {
         try {
             let screeningEventSerieses;
             if (params.saveScreeningEventSeries === true) {
-                const saveScreeningEventSeriesResult = yield (0, saveScreeningEventSeries_1.saveScreeningEventSeries)({
+                const saveScreeningEventSeriesResult = await (0, saveScreeningEventSeries_1.saveScreeningEventSeries)({
                     locationBranchCode: params.locationBranchCode,
                     movieTheater,
                     project: params.project,
@@ -97,11 +93,19 @@ function importFromCOA(params) {
             try {
                 // イベント永続化
                 const processStart = process.hrtime.bigint();
-                const screeningEvents = yield (0, saveScreeningEvents_1.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);
+                const screeningEvents = await (0, saveScreeningEvents_1.saveScreeningEvents)({
+                    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({
+                cancelledIds = await cancelDeletedEvents({
                     project: params.project,
                     locationBranchCode: params.locationBranchCode,
                     targetImportFrom: targetImportFrom.toDate(),
@@ -132,24 +136,27 @@ function importFromCOA(params) {
         }
         catch (error) {
             try {
-                yield repos.action.giveUp({ typeOf: action.typeOf, id: action.id, error });
+                await repos.action.giveUp({ typeOf: action.typeOf, id: action.id, error });
             }
             catch (__) {
                 // 失敗したら仕方ない
             }
             throw error;
         }
-        const actionResult = Object.assign({ cancelledIds, // キャンセルイベント保管(2024-04-26~)
+        const actionResult = {
+            cancelledIds, // キャンセルイベント保管(2024-04-26~)
             savedScreeningEventsCount,
-            savedScreeningEventSeriesCount }, (processTime !== undefined) ? { processTime } : undefined);
-        yield repos.action.completeWithVoid({ typeOf: action.typeOf, id: action.id, result: actionResult });
-    });
+            savedScreeningEventSeriesCount,
+            ...(processTime !== undefined) ? { processTime } : undefined
+        };
+        await repos.action.completeWithVoid({ typeOf: action.typeOf, id: action.id, result: actionResult });
+    };
 }
 function cancelDeletedEvents(params) {
-    return (repos) => __awaiter(this, void 0, void 0, function* () {
+    return async (repos) => {
         // distinctでidのみ取得(2023-01-25~)
         // COAから削除されたイベントをキャンセル済ステータスへ変更
-        const ids = yield repos.event.searchEventIds({
+        const ids = await repos.event.searchEventIds({
             project: { id: { $eq: params.project.id } },
             typeOf: factory.eventType.ScreeningEvent,
             superEvent: {
@@ -163,7 +170,7 @@ function cancelDeletedEvents(params) {
         debug(`cancelling ${cancelledIds.length} events...`);
         for (const cancelledId of cancelledIds) {
             try {
-                yield repos.event.cancelEvent({
+                await repos.event.cancelEvent({
                     id: cancelledId,
                     project: { id: params.project.id }
                 });
@@ -174,5 +181,5 @@ function cancelDeletedEvents(params) {
         }
         debug(`${cancelledIds.length} events cancelled.`);
         return cancelledIds;
-    });
+    };
 }

package/lib/chevre/service/iam.js

@@ -1,13 +1,4 @@
 "use strict";
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.findProjectPermissionsByMember = findProjectPermissionsByMember;
 exports.findGloablPermissionsByMember = findGloablPermissionsByMember;
@@ -15,10 +6,10 @@ exports.findGloablPermissionsByMember = findGloablPermissionsByMember;
  * プロジェクトメンバーの権限を検索する
  */
 function findProjectPermissionsByMember(params) {
-    return (repos) => __awaiter(this, void 0, void 0, function* () {
+    return async (repos) => {
         let permissions = [];
         // const hasRole = await repos.member.aggregateRoleNames({
-        const roleNames = yield repos.member.findRoleNamesByMember({
+        const roleNames = await repos.member.findRoleNamesByMember({
             project: { id: { $eq: params.project.id } },
             member: {
                 id: { $eq: params.member.id },
@@ -30,25 +21,25 @@ function findProjectPermissionsByMember(params) {
         });
         if (roleNames.length > 0) {
             // permissions = await repos.role.aggregatePermissions({ roleName: { $in: hasRole.map((r) => r.roleName) } });
-            permissions = yield repos.role.findUniquePermissionsByRoleName({ roleName: { $in: roleNames } });
+            permissions = await repos.role.findUniquePermissionsByRoleName({ roleName: { $in: roleNames } });
         }
         return { roleNames, permissions };
-    });
+    };
 }
 /**
  * グローバル権限を検索する
  */
 function findGloablPermissionsByMember(params) {
-    return (repos) => __awaiter(this, void 0, void 0, function* () {
+    return async (repos) => {
         let permissions = [];
-        const roleNames = yield repos.member.findGlobalRoleNamesByMember({
+        const roleNames = await repos.member.findGlobalRoleNamesByMember({
             member: {
                 id: { $eq: params.member.id }
             }
         });
         if (roleNames.length > 0) {
-            permissions = yield repos.role.findUniquePermissionsByRoleName({ roleName: { $in: roleNames } });
+            permissions = await repos.role.findUniquePermissionsByRoleName({ roleName: { $in: roleNames } });
         }
         return { roleNames, permissions };
-    });
+    };
 }