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

package/lib/chevre/service/offer/event/searchOffersByIds.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.searchOffersByIds = searchOffersByIds;
 const createDebug = require("debug");
@@ -19,19 +10,18 @@ const debug = createDebug('chevre-domain:service:offer');
 // tslint:disable-next-line:max-func-body-length
 function searchTicketOffersByItemOffered(params) {
     // tslint:disable-next-line:max-func-body-length
-    return (repos) => __awaiter(this, void 0, void 0, function* () {
-        var _a, _b, _c, _d;
-        const eventService = (yield repos.product.projectFields({
+    return async (repos) => {
+        const eventService = (await repos.product.projectFields({
             limit: 1,
             page: 1,
-            id: { $eq: String((_a = params.itemOffered) === null || _a === void 0 ? void 0 : _a.id) }
+            id: { $eq: String(params.itemOffered?.id) }
         }, ['hasOfferCatalog', 'project']
         // []
         )).shift();
         if (eventService === undefined) {
             throw new factory.errors.NotFound(factory.product.ProductType.EventService);
         }
-        const offerCatalogItemsOfProduct = (_b = eventService.hasOfferCatalog) === null || _b === void 0 ? void 0 : _b.itemListElement;
+        const offerCatalogItemsOfProduct = eventService.hasOfferCatalog?.itemListElement;
         /**
          * プロダクトのカタログIDリスト
          */
@@ -48,7 +38,7 @@ function searchTicketOffersByItemOffered(params) {
          */
         let subOfferCatalogId = firstCatalogIdOfProduct;
         let isOfferCatalogItem = false;
-        const offerCatalogFirstElement = yield repos.offerCatalog.findFirstItemListElementById({ id: firstCatalogIdOfProduct });
+        const offerCatalogFirstElement = await repos.offerCatalog.findFirstItemListElementById({ id: firstCatalogIdOfProduct });
         if (offerCatalogFirstElement.typeOf === 'OfferCatalog') {
             subOfferCatalogId = offerCatalogFirstElement.id;
             isOfferCatalogItem = true;
@@ -63,19 +53,19 @@ function searchTicketOffersByItemOffered(params) {
         let includedInDataCatalogIds = [subOfferCatalogId];
         if (isOfferCatalogItem) {
             // 複数カタログ対応(2023-09-27~)
-            const offerCatalogItems = yield repos.offerCatalog.findItemListElementById({
+            const offerCatalogItems = await repos.offerCatalog.findItemListElementById({
                 id: firstCatalogIdOfProduct,
                 project: { id: eventService.project.id }
             });
             includedInDataCatalogIds = offerCatalogItems.itemListElement.map((element) => element.id);
         }
         // includedInDataCatalogIdsを明示的に指定可能にする(2024-10-01~)
-        let includedInDataCatalogIdsSpecified = (_c = params.options.includedInDataCatalog) === null || _c === void 0 ? void 0 : _c.id;
+        let includedInDataCatalogIdsSpecified = params.options.includedInDataCatalog?.id;
         if (Array.isArray(includedInDataCatalogIdsSpecified)) {
             includedInDataCatalogIdsSpecified = [...new Set(includedInDataCatalogIdsSpecified)]; // unique
             if (isOfferCatalogItem) {
                 // プロダクトのカタログに含まれるサブカタログにフィルター
-                const includedInDataCatalogIdsSpecifiedInOfferCatalog = yield repos.offerCatalog.searchItemListElement({
+                const includedInDataCatalogIdsSpecifiedInOfferCatalog = await repos.offerCatalog.searchItemListElement({
                     id: { $in: catalogIdsOfProduct },
                     itemListElement: { id: { $in: includedInDataCatalogIdsSpecified } }
                 });
@@ -93,29 +83,28 @@ function searchTicketOffersByItemOffered(params) {
             }
         }
         debug('searchOffersByIds:', 'searchAllByIdsAndOfferCatalogId processing...', eventService.project.id, params.ids.join(','), includedInDataCatalogIds.join(','));
-        const availableOffers = yield repos.offer.searchAllByIdsAndOfferCatalogId({
+        const availableOffers = await repos.offer.searchAllByIdsAndOfferCatalogId({
             ids: params.ids,
             includedInDataCatalog: { id: includedInDataCatalogIds, isOfferCatalogItem },
-            availableAtOrFrom: { id: (_d = params.store) === null || _d === void 0 ? void 0 : _d.id },
+            availableAtOrFrom: { id: params.store?.id },
             unacceptedPaymentMethod: params.unacceptedPaymentMethod,
             excludeAppliesToMovieTicket: params.excludeAppliesToMovieTicket,
             onlyValid: true
         });
         return { availableOffers };
-    });
+    };
 }
 /**
  * イベントから興行(旅客)オファーを検索する
  */
 function searchEventTicketOffersByEvent(params) {
     // tslint:disable-next-line:max-func-body-length
-    return (repos) => __awaiter(this, void 0, void 0, function* () {
-        var _a, _b;
+    return async (repos) => {
         const event = params.event;
         let soundFormatTypes = [];
         let videoFormatTypes = [];
         if (event.typeOf === factory.eventType.ScreeningEvent) {
-            const superEvents = yield repos.eventSeries.projectEventSeriesFields({
+            const superEvents = await repos.eventSeries.projectEventSeriesFields({
                 limit: 1,
                 page: 1,
                 id: { $eq: event.superEvent.id }
@@ -129,15 +118,15 @@ function searchEventTicketOffersByEvent(params) {
             }
             soundFormatTypes = (Array.isArray(superEvent.soundFormat)) ? superEvent.soundFormat.map((f) => f.typeOf) : [];
             // videoFormatTypes = (Array.isArray(superEvent.videoFormat)) ? superEvent.videoFormat.map((f) => f.typeOf) : [];
-            videoFormatTypes = (Array.isArray((_a = superEvent.subEvent) === null || _a === void 0 ? void 0 : _a.videoFormat)) ? superEvent.subEvent.videoFormat : [];
+            videoFormatTypes = (Array.isArray(superEvent.subEvent?.videoFormat)) ? superEvent.subEvent.videoFormat : [];
         }
         const unacceptedPaymentMethod = getUnacceptedPaymentMethodByEvent({ event });
         // 上映方式がなければMovieTicket除外(2023-02-21~)
         const excludeAppliesToMovieTicket = videoFormatTypes.length === 0;
         // 興行設定があれば興行のカタログを参照する(2022-08-31~)
         const eventOffers = event.offers;
-        const { availableOffers } = yield searchTicketOffersByItemOffered({
-            itemOffered: { id: String((_b = eventOffers === null || eventOffers === void 0 ? void 0 : eventOffers.itemOffered) === null || _b === void 0 ? void 0 : _b.id) },
+        const { availableOffers } = await searchTicketOffersByItemOffered({
+            itemOffered: { id: String(eventOffers?.itemOffered?.id) },
             ids: params.ids,
             store: params.store,
             // limit: params.limit,
@@ -151,7 +140,7 @@ function searchEventTicketOffersByEvent(params) {
             // withSortIndex: params.addSortIndex,
             // useIncludeInDataCatalog: params.useIncludeInDataCatalog
         })(repos);
-        const { soundFormatChargeSpecs, videoFormatChargeSpecs, movieTicketTypeChargeSpecs } = yield (0, searchPriceSpecs4event_1.searchPriceSpecs4event)({
+        const { soundFormatChargeSpecs, videoFormatChargeSpecs, movieTicketTypeChargeSpecs } = await (0, searchPriceSpecs4event_1.searchPriceSpecs4event)({
             project: { id: event.project.id },
             soundFormatTypes,
             videoFormatTypes,
@@ -163,7 +152,7 @@ function searchEventTicketOffersByEvent(params) {
             let availability;
             if (params.validateOfferRateLimit) {
                 // レート制限を確認
-                availability = yield (0, checkAvailability_1.checkAvailability)({ event, unitPriceOffer: availableOffer })(repos);
+                availability = await (0, checkAvailability_1.checkAvailability)({ event, unitPriceOffer: availableOffer })(repos);
             }
             offers4event.push((0, factory_1.createCompoundPriceSpec4event)({
                 eligibleQuantity: eventOffers.eligibleQuantity,
@@ -182,12 +171,11 @@ function searchEventTicketOffersByEvent(params) {
             ticketOffers: offers4event,
             unitPriceOffers: availableOffers
         };
-    });
+    };
 }
 function getUnacceptedPaymentMethodByEvent(params) {
-    var _a;
     let unacceptedPaymentMethod = [];
-    const unacceptedPaymentMethodByEvent = (_a = params.event.offers) === null || _a === void 0 ? void 0 : _a.unacceptedPaymentMethod;
+    const unacceptedPaymentMethodByEvent = params.event.offers?.unacceptedPaymentMethod;
     // 施設コンテンツを参照する必要はない(2022-10-31~)
     if (Array.isArray(unacceptedPaymentMethodByEvent)) {
         unacceptedPaymentMethod = unacceptedPaymentMethodByEvent;
@@ -199,10 +187,10 @@ function getUnacceptedPaymentMethodByEvent(params) {
  * パラメータ最適化(2024-09-30~)
  */
 function searchOffersByIds(params) {
-    return (repos) => __awaiter(this, void 0, void 0, function* () {
+    return async (repos) => {
         // const eventType = params.event.typeOf;
         // optimize projection(2024-07-17~)
-        const event = yield repos.event.projectEventFieldsById({ id: params.event.id }, [
+        const event = await repos.event.projectEventFieldsById({ id: params.event.id }, [
             'project', 'typeOf', 'startDate',
             'superEvent.id',
             'offers.itemOffered.id', 'offers.offeredThrough', 'offers.unacceptedPaymentMethod', 'offers.eligibleQuantity'
@@ -220,7 +208,7 @@ function searchOffersByIds(params) {
             case factory.service.webAPI.Identifier.COA:
                 throw new factory.errors.NotImplemented(`booking service '${eventOffers.offeredThrough.identifier}' not implemented`);
             default:
-                const searchOffersResult = yield searchEventTicketOffersByEvent({
+                const searchOffersResult = await searchEventTicketOffersByEvent({
                     ids: params.ids,
                     event,
                     store: params.store,
@@ -237,5 +225,5 @@ function searchOffersByIds(params) {
                 unitPriceOffers = searchOffersResult.unitPriceOffers;
         }
         return { ticketOffers: offers, unitPriceOffers };
-    });
+    };
 }

package/lib/chevre/service/offer/event/searchPriceSpecs4event.js

@@ -1,18 +1,9 @@
 "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.searchPriceSpecs4event = searchPriceSpecs4event;
 const factory = require("../../../factory");
 function searchPriceSpecs4event(params) {
-    return (repos) => __awaiter(this, void 0, void 0, function* () {
+    return async (repos) => {
         let soundFormatChargeSpecs = [];
         let videoFormatChargeSpecs = [];
         let movieTicketTypeChargeSpecs = [];
@@ -27,7 +18,7 @@ function searchPriceSpecs4event(params) {
             }, []))];
         if (params.soundFormatTypes.length > 0) {
             soundFormatChargeSpecs =
-                yield repos.priceSpecification.search({
+                await repos.priceSpecification.search({
                     project: { id: { $eq: params.project.id } },
                     typeOf: factory.priceSpecificationType.CategoryCodeChargeSpecification,
                     appliesToCategoryCode: {
@@ -40,7 +31,7 @@ function searchPriceSpecs4event(params) {
         }
         if ((params.videoFormatTypes.length > 0)) {
             videoFormatChargeSpecs =
-                yield repos.priceSpecification.search({
+                await repos.priceSpecification.search({
                     project: { id: { $eq: params.project.id } },
                     typeOf: factory.priceSpecificationType.CategoryCodeChargeSpecification,
                     appliesToCategoryCode: {
@@ -53,7 +44,7 @@ function searchPriceSpecs4event(params) {
             // 存在する適用決済カード区分の分だけ検索する(2023-03-03~)
             if (movieTicketServiceTypes.length > 0) {
                 movieTicketTypeChargeSpecs =
-                    yield repos.priceSpecification.search({
+                    await repos.priceSpecification.search({
                         project: { id: { $eq: params.project.id } },
                         typeOf: factory.priceSpecificationType.MovieTicketTypeChargeSpecification,
                         appliesToVideoFormats: params.videoFormatTypes,
@@ -64,5 +55,5 @@ function searchPriceSpecs4event(params) {
             }
         }
         return { soundFormatChargeSpecs, videoFormatChargeSpecs, movieTicketTypeChargeSpecs };
-    });
+    };
 }

package/lib/chevre/service/offer/event/voidTransaction/processVoidTransaction4chevre.js

@@ -1,24 +1,15 @@
 "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.processVoidTransaction4chevre = processVoidTransaction4chevre;
 const factory = require("../../../../factory");
 const reserve_1 = require("../../../assetTransaction/reserve");
 function processVoidTransaction4chevre(params) {
-    return (repos, settings) => __awaiter(this, void 0, void 0, function* () {
+    return async (repos, settings) => {
         // const transactionNumber = params.action.object.pendingTransaction?.transactionNumber;
         const transactionNumber = params.action.instrument.transactionNumber;
         if (typeof transactionNumber === 'string') {
             // 取引が存在すれば中止
-            const assetTransactions = yield repos.assetTransaction.search({
+            const assetTransactions = await repos.assetTransaction.search({
                 limit: 1,
                 page: 1,
                 project: { id: { $eq: params.action.project.id } },
@@ -26,8 +17,8 @@ function processVoidTransaction4chevre(params) {
                 transactionNumber: { $eq: transactionNumber }
             }, ['_id']);
             if (assetTransactions.length > 0) {
-                yield (0, reserve_1.cancel)({ transactionNumber })(repos, settings);
+                await (0, reserve_1.cancel)({ transactionNumber })(repos, settings);
             }
         }
-    });
+    };
 }

package/lib/chevre/service/offer/event/voidTransaction/processVoidTransaction4coa.js

@@ -1,24 +1,15 @@
 "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.processVoidTransaction4coa = processVoidTransaction4coa;
 exports.processVoidTransactionByAcceptAction4coa = processVoidTransactionByAcceptAction4coa;
 const cancel_1 = require("../../../assetTransaction/reserveCOA/cancel");
 function processVoidTransaction4coa(params, options) {
-    return (repos) => __awaiter(this, void 0, void 0, function* () {
-        yield (0, cancel_1.cancel)(params, options)(repos);
-    });
+    return async (repos) => {
+        await (0, cancel_1.cancel)(params, options)(repos);
+    };
 }
 function processVoidTransactionByAcceptAction4coa(params, options) {
-    return (repos) => __awaiter(this, void 0, void 0, function* () {
-        yield (0, cancel_1.cancelByAcceptAction)(params, options)(repos);
-    });
+    return async (repos) => {
+        await (0, cancel_1.cancelByAcceptAction)(params, options)(repos);
+    };
 }

package/lib/chevre/service/offer/event/voidTransaction.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.voidTransaction = voidTransaction;
 const factory = require("../../../factory");
@@ -22,17 +13,20 @@ const voidTransactionByActionId_1 = require("./voidTransactionByActionId");
 // tslint:disable-next-line:max-func-body-length
 function voidTransaction(params) {
     // tslint:disable-next-line:max-func-body-length
-    return (repos, settings) => __awaiter(this, void 0, void 0, function* () {
-        var _a, _b, _c;
+    return async (repos, settings) => {
         // support void by action ID(2024-05-26~)
         if (typeof params.id === 'string') {
-            yield (0, voidTransactionByActionId_1.voidTransactionByActionId)(params)(repos, settings);
+            await (0, voidTransactionByActionId_1.voidTransactionByActionId)(params)(repos, settings);
             return;
         }
-        const cancelAction = Object.assign({ startTime: new Date(), agent: { id: params.project.id, typeOf: factory.organizationType.Project } }, (typeof ((_a = params.sameAs) === null || _a === void 0 ? void 0 : _a.id) === 'string') ? { sameAs: { id: params.sameAs.id, typeOf: 'Task' } } : undefined);
-        const transaction = yield repos.transaction.projectFieldsById({ typeOf: params.purpose.typeOf, id: params.purpose.id }, ['typeOf', 'status', 'object']);
+        const cancelAction = {
+            startTime: new Date(),
+            agent: { id: params.project.id, typeOf: factory.organizationType.Project },
+            ...(typeof params.sameAs?.id === 'string') ? { sameAs: { id: params.sameAs.id, typeOf: 'Task' } } : undefined
+        };
+        const transaction = await repos.transaction.projectFieldsById({ typeOf: params.purpose.typeOf, id: params.purpose.id }, ['typeOf', 'status', 'object']);
         // 興行オファー承認アクション検索
-        let authorizeActions = yield repos.action.searchByPurpose({
+        let authorizeActions = await repos.action.searchByPurpose({
             typeOf: factory.actionType.AuthorizeAction,
             purpose: {
                 typeOf: params.purpose.typeOf,
@@ -46,7 +40,7 @@ function voidTransaction(params) {
             // 確定取引に対応(2023-05-07~)
             case factory.transactionStatusType.Confirmed:
                 // OrderCancelledを考慮(2023-08-30~)
-                const orderCancelled = ((_c = (_b = params.purpose.result) === null || _b === void 0 ? void 0 : _b.order) === null || _c === void 0 ? void 0 : _c.orderStatus) === factory.orderStatus.OrderCancelled;
+                const orderCancelled = params.purpose.result?.order?.orderStatus === factory.orderStatus.OrderCancelled;
                 if (!orderCancelled) {
                     // 取り消すべきアクションに絞る
                     authorizeActions = authorizeActions.filter((a) => a.actionStatus !== factory.actionStatusType.CompletedActionStatus);
@@ -62,7 +56,7 @@ function voidTransaction(params) {
             switch (transaction.status) {
                 case factory.transactionStatusType.Confirmed:
                     // 確定取引の場合、不要なオファーのみ除外
-                    yield (0, any_1.voidAcceptedOffer)({
+                    await (0, any_1.voidAcceptedOffer)({
                         // authorizeActions,
                         authorizeActionsWithInstrument: authorizeActions,
                         orderNumber: orderNumberByTransaction
@@ -70,11 +64,11 @@ function voidTransaction(params) {
                     break;
                 default:
                     // orderInTransaction自体を削除
-                    yield repos.orderInTransaction.deleteByOrderNumber({ orderNumber: orderNumberByTransaction });
+                    await repos.orderInTransaction.deleteByOrderNumber({ orderNumber: orderNumberByTransaction });
             }
         }
-        yield Promise.all(authorizeActions.map((action) => __awaiter(this, void 0, void 0, function* () {
-            yield repos.action.cancelWithVoid({ typeOf: action.typeOf, id: action.id, cancelAction });
+        await Promise.all(authorizeActions.map(async (action) => {
+            await repos.action.cancelWithVoid({ typeOf: action.typeOf, id: action.id, cancelAction });
             switch (action.instrument.typeOf) {
                 // case WebAPIIdentifier.COA:
                 case factory.assetTransactionType.COAReserveTransaction:
@@ -82,36 +76,39 @@ function voidTransaction(params) {
                     if (reserveService === undefined) {
                         throw new factory.errors.Internal('repos.reserveService required');
                     }
-                    yield (0, processVoidTransaction4coa_1.processVoidTransaction4coa)({ action }, { asyncCancelPendingReservation: true })({
+                    await (0, processVoidTransaction4coa_1.processVoidTransaction4coa)({ action }, { asyncCancelPendingReservation: true })({
                         action: repos.action,
                         reserveService,
                         task: repos.task
                     });
                     break;
                 default:
-                    yield (0, processVoidTransaction4chevre_1.processVoidTransaction4chevre)({
+                    await (0, processVoidTransaction4chevre_1.processVoidTransaction4chevre)({
                         // action: <factory.action.authorize.offer.eventService.IAction<WebAPIIdentifier.Chevre>>action
                         action
                     })(repos, settings);
             }
-        })));
+        }));
         // acceptActionについても取り消す(2024-05-27~)
-        yield cancelAcceptActions(params)(repos);
-    });
+        await cancelAcceptActions(params)(repos);
+    };
 }
 /**
  * 必要あらばオファー採用アクションを取り消す
  */
 function cancelAcceptActions(params) {
-    return (repos) => __awaiter(this, void 0, void 0, function* () {
-        var _a, _b, _c;
-        const cancelAction = Object.assign({ startTime: new Date(), agent: { id: params.project.id, typeOf: factory.organizationType.Project } }, (typeof ((_a = params.sameAs) === null || _a === void 0 ? void 0 : _a.id) === 'string') ? { sameAs: { id: params.sameAs.id, typeOf: 'Task' } } : undefined);
-        const transaction = yield repos.transaction.projectFieldsById({
+    return async (repos) => {
+        const cancelAction = {
+            startTime: new Date(),
+            agent: { id: params.project.id, typeOf: factory.organizationType.Project },
+            ...(typeof params.sameAs?.id === 'string') ? { sameAs: { id: params.sameAs.id, typeOf: 'Task' } } : undefined
+        };
+        const transaction = await repos.transaction.projectFieldsById({
             typeOf: params.purpose.typeOf,
             id: params.purpose.id
         }, ['typeOf', 'status']);
         // 興行オファー承認アクション検索
-        const completedAuthorizeActions = yield repos.action.searchByPurpose({
+        const completedAuthorizeActions = await repos.action.searchByPurpose({
             typeOf: factory.actionType.AuthorizeAction,
             purpose: {
                 typeOf: params.purpose.typeOf,
@@ -121,7 +118,7 @@ function cancelAcceptActions(params) {
             actionStatus: { $eq: factory.actionStatusType.CompletedActionStatus }
         });
         // 興行オファー採用アクション検索
-        let acceptActions = yield repos.action.searchByPurpose({
+        let acceptActions = await repos.action.searchByPurpose({
             typeOf: factory.actionType.AcceptAction,
             purpose: {
                 typeOf: params.purpose.typeOf,
@@ -134,12 +131,11 @@ function cancelAcceptActions(params) {
                 throw new factory.errors.NotImplemented(`${transaction.status} not implemented`);
             case factory.transactionStatusType.Confirmed:
                 // OrderCancelledを考慮
-                const orderCancelled = ((_c = (_b = params.purpose.result) === null || _b === void 0 ? void 0 : _b.order) === null || _c === void 0 ? void 0 : _c.orderStatus) === factory.orderStatus.OrderCancelled;
+                const orderCancelled = params.purpose.result?.order?.orderStatus === factory.orderStatus.OrderCancelled;
                 if (!orderCancelled) {
                     // 取り消すべきアクションに絞る
                     acceptActions = acceptActions.filter((acceptAction) => {
-                        var _a, _b, _c;
-                        const tmpReserveNum = (_c = (_b = (_a = acceptAction.result) === null || _a === void 0 ? void 0 : _a.result) === null || _b === void 0 ? void 0 : _b.responseBody) === null || _c === void 0 ? void 0 : _c.tmpReserveNum;
+                        const tmpReserveNum = acceptAction.result?.result?.responseBody?.tmpReserveNum;
                         const potentialActionsId = acceptAction.potentialActions.id;
                         // 仮予約番号が発行済、かつ、承認完了済のアクションは除外
                         const authorizeActionExistsByTmpReserveNum = typeof tmpReserveNum === 'string'
@@ -155,16 +151,16 @@ function cancelAcceptActions(params) {
             // no op
         }
         const { reserveService } = repos;
-        yield Promise.all(acceptActions.map((action) => __awaiter(this, void 0, void 0, function* () {
-            yield repos.action.cancelWithVoid({ typeOf: action.typeOf, id: action.id, cancelAction });
+        await Promise.all(acceptActions.map(async (action) => {
+            await repos.action.cancelWithVoid({ typeOf: action.typeOf, id: action.id, cancelAction });
             if (reserveService === undefined) {
                 throw new factory.errors.Internal('repos.reserveService required');
             }
-            yield (0, processVoidTransaction4coa_1.processVoidTransactionByAcceptAction4coa)({ action }, { asyncCancelPendingReservation: true })({
+            await (0, processVoidTransaction4coa_1.processVoidTransactionByAcceptAction4coa)({ action }, { asyncCancelPendingReservation: true })({
                 action: repos.action,
                 reserveService,
                 task: repos.task
             });
-        })));
-    });
+        }));
+    };
 }

package/lib/chevre/service/offer/event/voidTransactionByActionId.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.voidTransactionByActionId = voidTransactionByActionId;
 const factory = require("../../../factory");
@@ -19,33 +10,36 @@ const processVoidTransaction4coa_1 = require("./voidTransaction/processVoidTrans
  * 特定の承認アクションについて処理する
  */
 function voidTransactionByActionId(params) {
-    return (repos, settings) => __awaiter(this, void 0, void 0, function* () {
-        var _a;
+    return async (repos, settings) => {
         if (typeof params.id !== 'string' || params.id === '') {
             throw new factory.errors.ArgumentNull('id');
         }
-        const cancelAction = Object.assign({ startTime: new Date(), agent: { id: params.project.id, typeOf: factory.organizationType.Project } }, (typeof ((_a = params.sameAs) === null || _a === void 0 ? void 0 : _a.id) === 'string') ? { sameAs: { id: params.sameAs.id, typeOf: 'Task' } } : undefined);
-        const transaction = yield repos.transaction.projectFieldsInProgressById({
+        const cancelAction = {
+            startTime: new Date(),
+            agent: { id: params.project.id, typeOf: factory.organizationType.Project },
+            ...(typeof params.sameAs?.id === 'string') ? { sameAs: { id: params.sameAs.id, typeOf: 'Task' } } : undefined
+        };
+        const transaction = await repos.transaction.projectFieldsInProgressById({
             typeOf: factory.transactionType.PlaceOrder,
             id: params.purpose.id
         }, ['typeOf']);
         // if (transaction.agent.id !== params.agent.id) {
         //     throw new factory.errors.Forbidden('Transaction not yours');
         // }
-        const orderNumber = yield repos.transaction.findInProgressOrderNumberById({ id: params.purpose.id });
-        const action = yield repos.action.findById({ typeOf: factory.actionType.AuthorizeAction, id: params.id });
+        const orderNumber = await repos.transaction.findInProgressOrderNumberById({ id: params.purpose.id });
+        const action = await repos.action.findById({ typeOf: factory.actionType.AuthorizeAction, id: params.id });
         if (action.purpose.typeOf !== transaction.typeOf || action.purpose.id !== transaction.id) {
             throw new factory.errors.Argument('Transaction', 'Action not found in the transaction');
         }
         // MongoDBでcompleteステータスであるにも関わらず、Chevreでは削除されている、というのが最悪の状況
         // それだけは回避するためにMongoDBを先に変更
-        yield repos.action.cancelWithVoid({ typeOf: factory.actionType.AuthorizeAction, id: params.id, cancelAction });
+        await repos.action.cancelWithVoid({ typeOf: factory.actionType.AuthorizeAction, id: params.id, cancelAction });
         // add orderInTransaction(2024-01-15~)
         // USE_CREATE_ORDER_ON_OFFER_ACCEPTEDの場合、orderNumber発行済のはず
         // const orderNumberByTransaction = transaction.object.orderNumber;
         const orderNumberByTransaction = orderNumber; // transaction.objectへのアクセス回避(2024-05-30~)
         if (typeof orderNumberByTransaction === 'string') {
-            yield (0, any_1.voidAcceptedOffer)({
+            await (0, any_1.voidAcceptedOffer)({
                 // authorizeActions: [action],
                 authorizeActionsWithInstrument: [action],
                 orderNumber: orderNumberByTransaction
@@ -57,14 +51,14 @@ function voidTransactionByActionId(params) {
                 if (reserveService === undefined) {
                     throw new factory.errors.Internal('repos.reserveService required');
                 }
-                yield (0, processVoidTransaction4coa_1.processVoidTransaction4coa)({ action }, { asyncCancelPendingReservation: false })({
+                await (0, processVoidTransaction4coa_1.processVoidTransaction4coa)({ action }, { asyncCancelPendingReservation: false })({
                     action: repos.action,
                     reserveService,
                     task: repos.task
                 });
                 break;
             default:
-                yield (0, processVoidTransaction4chevre_1.processVoidTransaction4chevre)({
+                await (0, processVoidTransaction4chevre_1.processVoidTransaction4chevre)({
                     action
                 })(repos, settings);
             // const transactionNumber = action.object.pendingTransaction?.transactionNumber;
@@ -73,5 +67,5 @@ function voidTransactionByActionId(params) {
             //     await ReserveTransactionService.cancel({ transactionNumber })(repos);
             // }
         }
-    });
+    };
 }