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

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

@@ -1,21 +1,11 @@
 "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.issueEventOfferTicket = issueEventOfferTicket;
 const moment = require("moment");
 const factory = require("../../../factory");
 const validateStartRequest_1 = require("../../assetTransaction/reserve/validateStartRequest");
 function createOfferTicket(params) {
-    return (repos) => __awaiter(this, void 0, void 0, function* () {
-        var _a;
+    return async (repos) => {
         const { audience, expiresInSeconds, issuedBy, object, validFrom, author, project, instrument } = params;
         const actionAttributes = {
             project: { id: project.id, typeOf: factory.organizationType.Project },
@@ -28,10 +18,10 @@ function createOfferTicket(params) {
                 id: instrument.id
             }
         };
-        const action = yield repos.action.start(actionAttributes);
+        const action = await repos.action.start(actionAttributes);
         let authorizations;
         try {
-            authorizations = yield repos.authorization.issueAuthorization([{
+            authorizations = await repos.authorization.issueAuthorization([{
                     project: { id: project.id, typeOf: factory.organizationType.Project },
                     object,
                     validFrom,
@@ -43,7 +33,7 @@ function createOfferTicket(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 (__) {
                 // 失敗したら仕方ない
@@ -51,55 +41,64 @@ function createOfferTicket(params) {
             throw error;
         }
         const result = authorizations.map(({ code, typeOf }) => ({ code, typeOf }));
-        yield repos.action.completeWithVoid({ typeOf: action.typeOf, id: action.id, result: result });
-        const ticketToken = (_a = authorizations.shift()) === null || _a === void 0 ? void 0 : _a.code;
+        await repos.action.completeWithVoid({ typeOf: action.typeOf, id: action.id, result: result });
+        const ticketToken = authorizations.shift()?.code;
         if (typeof ticketToken !== 'string') {
             // 基本的にありえないフロー
             throw new factory.errors.Internal('code not published by an unexpected reason');
         }
         // チケット作成
-        yield repos.ticket.issueByTicketToken({
+        await repos.ticket.issueByTicketToken({
             project: { id: project.id },
             ticketToken,
             issuedBy
         });
         return { ticketToken };
-    });
+    };
 }
 function issueEventOfferTicket(params) {
-    return (repos) => __awaiter(this, void 0, void 0, function* () {
-        var _a, _b;
+    return async (repos) => {
         const { now, audience, eventId, eventOfferId, ticketedOffer, author, project, instrument } = params;
         // 取引は存在するか
-        const transaction = yield repos.transaction.projectFieldsInProgressById({ typeOf: factory.transactionType.PlaceOrder, id: audience.id }, ['expires', 'typeOf', 'seller']);
+        const transaction = await repos.transaction.projectFieldsInProgressById({ typeOf: factory.transactionType.PlaceOrder, id: audience.id }, ['expires', 'typeOf', 'seller']);
         // イベントは存在するか
-        const event = yield repos.event.projectEventFieldsById({ id: eventId }, ['project', 'offers', 'identifier']);
+        const event = await repos.event.projectEventFieldsById({ id: eventId }, ['project', 'offers', 'identifier']);
         // 取引番号発行
         // const { transactionNumber } = await transactionNumberRepo.publishByTimestamp({ startDate: now });
         const { seller } = transaction;
         // 承認作成
-        const issuedBy = Object.assign({ id: seller.id, typeOf: seller.typeOf }, (typeof seller.name.ja === 'string') ? { name: seller.name.ja } : undefined);
-        const validForMemberTierToken = (_a = ticketedOffer === null || ticketedOffer === void 0 ? void 0 : ticketedOffer.validForMemberTier) === null || _a === void 0 ? void 0 : _a.token;
-        const validForMemberProgramIdentifier = (_b = ticketedOffer === null || ticketedOffer === void 0 ? void 0 : ticketedOffer.validForMemberTier) === null || _b === void 0 ? void 0 : _b.isTierOf.identifier;
-        const authorizationObject = Object.assign(Object.assign(Object.assign({ typeOf: factory.offerType.Offer, itemOffered: {
+        const issuedBy = {
+            id: seller.id,
+            typeOf: seller.typeOf,
+            ...(typeof seller.name.ja === 'string') ? { name: seller.name.ja } : undefined
+        };
+        const validForMemberTierToken = ticketedOffer?.validForMemberTier?.token;
+        const validForMemberProgramIdentifier = ticketedOffer?.validForMemberTier?.isTierOf.identifier;
+        const authorizationObject = {
+            typeOf: factory.offerType.Offer,
+            itemOffered: {
                 typeOf: factory.product.ProductType.EventService,
                 serviceOutput: {
                     typeOf: factory.reservationType.ReservationPackage,
                     reservationFor: { id: eventId }
                 }
-            } }, (typeof eventOfferId === 'string' && eventOfferId !== '') ? { id: eventOfferId } : undefined), (typeof (ticketedOffer === null || ticketedOffer === void 0 ? void 0 : ticketedOffer.token) === 'string' && ticketedOffer.token !== '')
-            ? { token: ticketedOffer.token }
-            : undefined), (typeof validForMemberTierToken === 'string' && validForMemberTierToken !== ''
-            && typeof validForMemberProgramIdentifier === 'string' && validForMemberProgramIdentifier !== '')
-            ? {
-                validForMemberTier: {
-                    token: validForMemberTierToken,
-                    isTierOf: { identifier: validForMemberProgramIdentifier }
+            },
+            ...(typeof eventOfferId === 'string' && eventOfferId !== '') ? { id: eventOfferId } : undefined,
+            ...(typeof ticketedOffer?.token === 'string' && ticketedOffer.token !== '')
+                ? { token: ticketedOffer.token }
+                : undefined,
+            ...(typeof validForMemberTierToken === 'string' && validForMemberTierToken !== ''
+                && typeof validForMemberProgramIdentifier === 'string' && validForMemberProgramIdentifier !== '')
+                ? {
+                    validForMemberTier: {
+                        token: validForMemberTierToken,
+                        isTierOf: { identifier: validForMemberProgramIdentifier }
+                    }
                 }
-            }
-            : undefined);
+                : undefined
+        };
         // validations(eventId,eventOfferIdentifier,offerToken...)
-        yield (0, validateStartRequest_1.validEventOfferByApplicationExists)({
+        await (0, validateStartRequest_1.validEventOfferByApplicationExists)({
             event,
             now,
             availableAt: { id: instrument.id },
@@ -108,7 +107,7 @@ function issueEventOfferTicket(params) {
         })(repos);
         const expiresInSeconds = moment(transaction.expires)
             .diff(now, 'seconds');
-        const { ticketToken } = yield createOfferTicket({
+        const { ticketToken } = await createOfferTicket({
             object: authorizationObject,
             validFrom: now,
             expiresInSeconds,
@@ -119,5 +118,5 @@ function issueEventOfferTicket(params) {
             instrument
         })(repos);
         return { ticketToken };
-    });
+    };
 }

package/lib/chevre/service/offer/event/searchEventTicketOffers.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.searchEventTicketOffers = searchEventTicketOffers;
 const factory = require("../../../factory");
@@ -17,19 +8,18 @@ const searchPriceSpecs4event_1 = require("./searchPriceSpecs4event");
 // 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, _e, _f;
-        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リスト
          */
@@ -46,17 +36,17 @@ 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;
         }
         if (params.withSortIndex) {
             // 明示的にカタログ指定可能にする
-            if (typeof ((_c = params.includedInDataCatalog) === null || _c === void 0 ? void 0 : _c.id) === 'string' && params.includedInDataCatalog.id.length > 0) {
+            if (typeof params.includedInDataCatalog?.id === 'string' && params.includedInDataCatalog.id.length > 0) {
                 if (isOfferCatalogItem) {
                     // カタログに含まれるサブカタログか検証(2024-09-30~)
-                    const offerCatalogIncludingSpecifiedElement = yield repos.offerCatalog.projectFields({
+                    const offerCatalogIncludingSpecifiedElement = await repos.offerCatalog.projectFields({
                         limit: 1,
                         page: 1,
                         id: { $in: catalogIdsOfProduct },
@@ -77,14 +67,14 @@ function searchTicketOffersByItemOffered(params) {
             // サブカタログの適用決済カード条件を考慮
             if (isOfferCatalogItem) {
                 // サブカタログ参照
-                const offerCatalogItem = (yield repos.offerCatalogItem.projectFields({ id: { $in: [subOfferCatalogId] } }, ['relatedOffer']
+                const offerCatalogItem = (await repos.offerCatalogItem.projectFields({ id: { $in: [subOfferCatalogId] } }, ['relatedOffer']
                 // { relatedOffer: 1 }
                 )).shift();
                 if (offerCatalogItem === undefined) {
                     throw new factory.errors.NotFound('OfferCatalogItem');
                 }
                 // 強制的にサブカタログの適用決済カード条件に変更
-                const appliesToMovieTicketBySubCatalog = (_e = (_d = offerCatalogItem.relatedOffer) === null || _d === void 0 ? void 0 : _d.priceSpecification) === null || _e === void 0 ? void 0 : _e.appliesToMovieTicket;
+                const appliesToMovieTicketBySubCatalog = offerCatalogItem.relatedOffer?.priceSpecification?.appliesToMovieTicket;
                 if (Array.isArray(appliesToMovieTicketBySubCatalog)) {
                     priceSpecificationCondition = {
                         appliesToMovieTicket: {
@@ -103,9 +93,9 @@ function searchTicketOffersByItemOffered(params) {
                     };
                 }
             }
-            const { offers, sortedOfferIds } = yield repos.offer.searchByOfferCatalogIdWithSortIndex({
+            const { offers, sortedOfferIds } = await repos.offer.searchByOfferCatalogIdWithSortIndex({
                 offerCatalog: { id: subOfferCatalogId, isOfferCatalogItem },
-                availableAtOrFrom: { id: (_f = params.store) === null || _f === void 0 ? void 0 : _f.id },
+                availableAtOrFrom: { id: params.store?.id },
                 unacceptedPaymentMethod: params.unacceptedPaymentMethod,
                 excludeAppliesToMovieTicket: params.excludeAppliesToMovieTicket,
                 priceSpecification: priceSpecificationCondition,
@@ -119,20 +109,19 @@ function searchTicketOffersByItemOffered(params) {
         else {
             throw new factory.errors.NotImplemented('only withSortIndex: true implemented'); // ID指定での検索はモジュール分離(2024-09-30~)
         }
-    });
+    };
 }
 /**
  * イベントから興行(旅客)オファーを検索する
  */
 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 }
@@ -146,15 +135,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, sortedOfferIds } = 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, sortedOfferIds } = await searchTicketOffersByItemOffered({
+            itemOffered: { id: String(eventOffers?.itemOffered?.id) },
             // ids: params.ids,
             store: params.store,
             limit: params.limit,
@@ -167,7 +156,7 @@ function searchEventTicketOffersByEvent(params) {
             withSortIndex: true,
             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,
@@ -176,11 +165,11 @@ function searchEventTicketOffersByEvent(params) {
         const offers4event = [];
         // 単価オファーから興行オファーを生成(順に処理)
         for (const availableOffer of availableOffers) {
-            const sortIndex = sortedOfferIds === null || sortedOfferIds === void 0 ? void 0 : sortedOfferIds.indexOf(String(availableOffer.id));
+            const sortIndex = sortedOfferIds?.indexOf(String(availableOffer.id));
             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,
@@ -199,12 +188,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;
@@ -215,10 +203,10 @@ function getUnacceptedPaymentMethodByEvent(params) {
  * 興行オファー検索
  */
 function searchEventTicketOffers(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'
@@ -236,7 +224,7 @@ function searchEventTicketOffers(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({
                     event,
                     store: params.store,
                     priceSpecification: params.priceSpecification,
@@ -252,5 +240,5 @@ function searchEventTicketOffers(params) {
                 unitPriceOffers = searchOffersResult.unitPriceOffers;
         }
         return { ticketOffers: offers, unitPriceOffers };
-    });
+    };
 }

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

@@ -1,20 +1,10 @@
 "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.searchOfferAppliesToMovieTicket = searchOfferAppliesToMovieTicket;
 const factory = require("../../../factory");
 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;
@@ -27,14 +17,13 @@ function getUnacceptedPaymentMethodByEvent(params) {
  * また、サブカタログによるカタログが設定されている場合、カタログのひとつめのサブカタログのみが検索対象
  */
 function searchOfferAppliesToMovieTicket(params) {
-    return (repos) => __awaiter(this, void 0, void 0, function* () {
-        var _a, _b, _c, _d, _e;
+    return async (repos) => {
         // optimize(2024-07-18~)
-        const event = yield repos.event.projectEventFieldsById({ id: params.event.id }, ['project', 'startDate', 'typeOf', 'superEvent.id', 'offers.itemOffered.id', 'offers.unacceptedPaymentMethod']);
+        const event = await repos.event.projectEventFieldsById({ id: params.event.id }, ['project', 'startDate', 'typeOf', 'superEvent.id', 'offers.itemOffered.id', 'offers.unacceptedPaymentMethod']);
         // let soundFormatTypes: string[] = [];
         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 }
@@ -48,7 +37,7 @@ function searchOfferAppliesToMovieTicket(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除外
@@ -56,8 +45,8 @@ function searchOfferAppliesToMovieTicket(params) {
         // 興行設定があれば興行のカタログを参照する
         const eventOffers = event.offers;
         let catalogId;
-        if (typeof ((_b = eventOffers.itemOffered) === null || _b === void 0 ? void 0 : _b.id) === 'string') {
-            const eventService = (yield repos.product.projectFields({
+        if (typeof eventOffers.itemOffered?.id === 'string') {
+            const eventService = (await repos.product.projectFields({
                 limit: 1,
                 page: 1,
                 id: { $eq: eventOffers.itemOffered.id }
@@ -68,7 +57,7 @@ function searchOfferAppliesToMovieTicket(params) {
                 throw new factory.errors.NotFound(factory.product.ProductType.EventService);
             }
             // const firstCatalogIdOfProduct = eventService.hasOfferCatalog?.id; // migrate to itemListElement(2024-09-30~)
-            const firstCatalogIdOfProduct = (_d = (_c = eventService.hasOfferCatalog) === null || _c === void 0 ? void 0 : _c.itemListElement.at(0)) === null || _d === void 0 ? void 0 : _d.id;
+            const firstCatalogIdOfProduct = eventService.hasOfferCatalog?.itemListElement.at(0)?.id;
             if (typeof firstCatalogIdOfProduct === 'string') {
                 catalogId = firstCatalogIdOfProduct;
             }
@@ -79,14 +68,14 @@ function searchOfferAppliesToMovieTicket(params) {
         // サブカタログIDを決定
         let subOfferCatalogId = catalogId;
         let isOfferCatalogItem = false;
-        const offerCatalogFirstElement = yield repos.offerCatalog.findFirstItemListElementById({ id: catalogId });
+        const offerCatalogFirstElement = await repos.offerCatalog.findFirstItemListElementById({ id: catalogId });
         if (offerCatalogFirstElement.typeOf === 'OfferCatalog') {
             subOfferCatalogId = offerCatalogFirstElement.id;
             isOfferCatalogItem = true;
         }
         return repos.offer.searchAvaialbleAppliesToMovieTicketByOfferCatalogId({
             subOfferCatalog: { id: subOfferCatalogId, isOfferCatalogItem },
-            availableAtOrFrom: { id: (_e = params.store) === null || _e === void 0 ? void 0 : _e.id },
+            availableAtOrFrom: { id: params.store?.id },
             unacceptedPaymentMethod: unacceptedPaymentMethod,
             excludeAppliesToMovieTicket: excludeAppliesToMovieTicket,
             onlyValid: params.onlyValid === true,
@@ -94,5 +83,5 @@ function searchOfferAppliesToMovieTicket(params) {
             page: params.page,
             useIncludeInDataCatalog: params.options.useIncludeInDataCatalog
         });
-    });
+    };
 }

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

@@ -1,20 +1,10 @@
 "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.searchOfferCatalogItemAvailability = searchOfferCatalogItemAvailability;
 const factory = require("../../../factory");
 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;
@@ -28,8 +18,7 @@ const MAX_LIMIT_SEARCH_OFFER_CATALOG_ITEMS = 10;
 // tslint:disable-next-line:max-func-body-length
 function searchOfferCatalogItemAvailability(params) {
     // tslint:disable-next-line:max-func-body-length
-    return (repos) => __awaiter(this, void 0, void 0, function* () {
-        var _a, _b, _c, _d;
+    return async (repos) => {
         const { considerUnacceptedPaymentMethod, useIncludeInDataCatalog } = params.options;
         if (typeof params.limit !== 'number') {
             throw new factory.errors.Argument('limit', 'must be number');
@@ -43,12 +32,12 @@ function searchOfferCatalogItemAvailability(params) {
         }
         let availabilities = [];
         // optimize(2024-07-18~)
-        const event = yield repos.event.projectEventFieldsById({ id: params.event.id }, ['project', 'offers.itemOffered.id', 'offers.unacceptedPaymentMethod']);
+        const event = await repos.event.projectEventFieldsById({ id: params.event.id }, ['project', 'offers.itemOffered.id', 'offers.unacceptedPaymentMethod']);
         // 興行設定があれば興行のカタログを参照する
         const eventOffers = event.offers;
         let catalogId;
-        if (typeof ((_a = eventOffers.itemOffered) === null || _a === void 0 ? void 0 : _a.id) === 'string') {
-            const eventService = (yield repos.product.projectFields({
+        if (typeof eventOffers.itemOffered?.id === 'string') {
+            const eventService = (await repos.product.projectFields({
                 limit: 1,
                 page: 1,
                 id: { $eq: eventOffers.itemOffered.id }
@@ -58,11 +47,11 @@ function searchOfferCatalogItemAvailability(params) {
             if (eventService === undefined) {
                 throw new factory.errors.NotFound(factory.product.ProductType.EventService);
             }
-            const productCatalogs = (_b = eventService.hasOfferCatalog) === null || _b === void 0 ? void 0 : _b.itemListElement;
+            const productCatalogs = eventService.hasOfferCatalog?.itemListElement;
             /**
              * 明示的なカタログID指定に対応(2024-10-01~)
              */
-            const catalogIdSpecified = (_c = params.options.includedInDataCatalog) === null || _c === void 0 ? void 0 : _c.id;
+            const catalogIdSpecified = params.options.includedInDataCatalog?.id;
             if (typeof catalogIdSpecified === 'string') {
                 const productHasSpecifiedCatalog = Array.isArray(productCatalogs) && productCatalogs.some(({ id }) => id === catalogIdSpecified);
                 if (!productHasSpecifiedCatalog) {
@@ -73,7 +62,7 @@ function searchOfferCatalogItemAvailability(params) {
             else {
                 // 指定のない場合、自動的にひとつめのカタログを選択
                 // const firstCatalogIdOfProduct = eventService.hasOfferCatalog?.id; // migrate to itemListElement(2024-09-30~)
-                const firstCatalogIdOfProduct = (_d = productCatalogs === null || productCatalogs === void 0 ? void 0 : productCatalogs.at(0)) === null || _d === void 0 ? void 0 : _d.id;
+                const firstCatalogIdOfProduct = productCatalogs?.at(0)?.id;
                 if (typeof firstCatalogIdOfProduct === 'string') {
                     catalogId = firstCatalogIdOfProduct;
                 }
@@ -82,9 +71,9 @@ function searchOfferCatalogItemAvailability(params) {
         if (typeof catalogId !== 'string') {
             throw new factory.errors.NotFound('itemOffered.hasOfferCatalog');
         }
-        const offerCatalogFirstElement = yield repos.offerCatalog.findFirstItemListElementById({ id: catalogId });
+        const offerCatalogFirstElement = await repos.offerCatalog.findFirstItemListElementById({ id: catalogId });
         if (offerCatalogFirstElement.typeOf === 'OfferCatalog') {
-            const catalogItemListElements = yield repos.offerCatalog.sliceItemListElementById({
+            const catalogItemListElements = await repos.offerCatalog.sliceItemListElementById({
                 id: catalogId,
                 limit: params.limit,
                 page: params.page
@@ -93,7 +82,7 @@ function searchOfferCatalogItemAvailability(params) {
             if (catalogItemListElements.length > 0) {
                 if (useIncludeInDataCatalog) {
                     // 単価オファーから利用可能なサブカタログを検索
-                    const availableCatalogs = yield repos.offer.searchAvailableCatalogs({
+                    const availableCatalogs = await repos.offer.searchAvailableCatalogs({
                         project: { id: event.project.id },
                         includedInDataCatalog: { id: catalogItemListElements.map((element) => element.id) },
                         availableAtOrFrom: { id: params.availableAtOrFrom.id },
@@ -111,7 +100,7 @@ function searchOfferCatalogItemAvailability(params) {
                     for (const element of catalogItemListElements) {
                         availabilities.push({
                             id: element.id,
-                            isAvailable: yield repos.offer.isCatalogAvailable({
+                            isAvailable: await repos.offer.isCatalogAvailable({
                                 includedInDataCatalog: { id: element.id },
                                 availableAtOrFrom: { id: params.availableAtOrFrom.id },
                                 unacceptedPaymentMethod: (considerUnacceptedPaymentMethod) ? unacceptedPaymentMethod : []
@@ -125,5 +114,5 @@ function searchOfferCatalogItemAvailability(params) {
             // Offerによるカタログの場合はひとまずempty
         }
         return availabilities;
-    });
+    };
 }

package/lib/chevre/service/offer/event/searchOfferCatalogItems.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.searchOfferCatalogItems = searchOfferCatalogItems;
 const factory = require("../../../factory");
@@ -16,8 +7,7 @@ const factory = require("../../../factory");
  */
 function searchOfferCatalogItems(params) {
     // tslint:disable-next-line:max-func-body-length
-    return (repos) => __awaiter(this, void 0, void 0, function* () {
-        var _a, _b, _c, _d;
+    return async (repos) => {
         if (typeof params.limit !== 'number') {
             throw new factory.errors.Argument('limit', 'must be number');
         }
@@ -26,12 +16,12 @@ function searchOfferCatalogItems(params) {
         }
         let offerCatalogItems = [];
         // optimize(2024-07-18~)
-        const event = yield repos.event.projectEventFieldsById({ id: params.event.id }, ['offers.itemOffered.id']);
+        const event = await repos.event.projectEventFieldsById({ id: params.event.id }, ['offers.itemOffered.id']);
         // 興行設定があれば興行のカタログを参照する
         const eventOffers = event.offers;
         let catalogId;
-        if (typeof ((_a = eventOffers.itemOffered) === null || _a === void 0 ? void 0 : _a.id) === 'string') {
-            const eventService = (yield repos.product.projectFields({
+        if (typeof eventOffers.itemOffered?.id === 'string') {
+            const eventService = (await repos.product.projectFields({
                 limit: 1,
                 page: 1,
                 id: { $eq: eventOffers.itemOffered.id }
@@ -41,11 +31,11 @@ function searchOfferCatalogItems(params) {
             if (eventService === undefined) {
                 throw new factory.errors.NotFound(factory.product.ProductType.EventService);
             }
-            const productCatalogs = (_b = eventService.hasOfferCatalog) === null || _b === void 0 ? void 0 : _b.itemListElement;
+            const productCatalogs = eventService.hasOfferCatalog?.itemListElement;
             /**
              * 明示的なカタログID指定に対応(2024-10-01~)
              */
-            const catalogIdSpecified = (_c = params.options.includedInDataCatalog) === null || _c === void 0 ? void 0 : _c.id;
+            const catalogIdSpecified = params.options.includedInDataCatalog?.id;
             if (typeof catalogIdSpecified === 'string') {
                 const productHasSpecifiedCatalog = Array.isArray(productCatalogs) && productCatalogs.some(({ id }) => id === catalogIdSpecified);
                 if (!productHasSpecifiedCatalog) {
@@ -56,7 +46,7 @@ function searchOfferCatalogItems(params) {
             else {
                 // 指定のない場合、自動的にひとつめのカタログを選択
                 // const firstCatalogIdOfProduct = eventService.hasOfferCatalog?.id; // migrate to itemListElement(2024-09-30~)
-                const firstCatalogIdOfProduct = (_d = productCatalogs === null || productCatalogs === void 0 ? void 0 : productCatalogs.at(0)) === null || _d === void 0 ? void 0 : _d.id;
+                const firstCatalogIdOfProduct = productCatalogs?.at(0)?.id;
                 if (typeof firstCatalogIdOfProduct === 'string') {
                     catalogId = firstCatalogIdOfProduct;
                 }
@@ -65,16 +55,16 @@ function searchOfferCatalogItems(params) {
         if (typeof catalogId !== 'string') {
             throw new factory.errors.NotFound('itemOffered.hasOfferCatalog');
         }
-        const offerCatalogFirstElement = yield repos.offerCatalog.findFirstItemListElementById({ id: catalogId });
+        const offerCatalogFirstElement = await repos.offerCatalog.findFirstItemListElementById({ id: catalogId });
         if (offerCatalogFirstElement.typeOf === 'OfferCatalog') {
-            const catalogItemListElements = yield repos.offerCatalog.sliceItemListElementById({
+            const catalogItemListElements = await repos.offerCatalog.sliceItemListElementById({
                 id: catalogId,
                 limit: params.limit,
                 page: params.page
             });
             if (catalogItemListElements.length > 0) {
                 // サブカタログ検索
-                const searchOfferCatalogItemsResult = yield repos.offerCatalogItem.projectFields({
+                const searchOfferCatalogItemsResult = await repos.offerCatalogItem.projectFields({
                     id: { $in: catalogItemListElements.map((element) => element.id) }
                 }, ['description', 'name', 'additionalProperty', 'relatedOffer']);
                 offerCatalogItems = catalogItemListElements.map((element) => {
@@ -82,7 +72,10 @@ function searchOfferCatalogItems(params) {
                     if (offerCatalogItem === undefined) {
                         throw new factory.errors.NotFound('OfferCatalog', `offerCatalogItem '${element.id}' not found`);
                     }
-                    return Object.assign(Object.assign({}, element), offerCatalogItem);
+                    return {
+                        ...element,
+                        ...offerCatalogItem
+                    };
                 });
             }
         }
@@ -90,5 +83,5 @@ function searchOfferCatalogItems(params) {
             // Offerによるカタログの場合はひとまずempty
         }
         return offerCatalogItems;
-    });
+    };
 }