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

package/lib/chevre/service/offer/onEventChanged.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.onEventChanged = onEventChanged;
 const createDebug = require("debug");
@@ -18,22 +9,22 @@ const debug = createDebug('chevre-domain:service:offer:onEventChanged');
  * イベント変更時処理
  */
 function onEventChanged(params) {
-    return (repos) => __awaiter(this, void 0, void 0, function* () {
+    return async (repos) => {
         if (params.id.length > 0) {
-            const setting = yield repos.setting.findOne({ project: { id: { $eq: '*' } } }, ['onResourceUpdated', 'onEventChanged', 'useInformResourceTypes']);
-            const useInformResourceTypes = setting === null || setting === void 0 ? void 0 : setting.useInformResourceTypes;
+            const setting = await repos.setting.findOne({ project: { id: { $eq: '*' } } }, ['onResourceUpdated', 'onEventChanged', 'useInformResourceTypes']);
+            const useInformResourceTypes = setting?.useInformResourceTypes;
             const useInform = params.useInform === true
                 && Array.isArray(useInformResourceTypes) && useInformResourceTypes.includes(params.typeOf);
             // ScreeningEventであれば集計タスク -> migrate to agg(2024-10-31~)
             // inform to agg(2024-10-30~)
-            yield createInform2aggTasks({
+            await createInform2aggTasks({
                 project: { id: params.project.id },
                 ids: params.id,
                 typeOf: params.typeOf,
                 isNew: params.isNew
             }, setting)(repos);
             if (useInform) {
-                yield createInformTasks({
+                await createInformTasks({
                     project: { id: params.project.id },
                     ids: params.id,
                     typeOf: params.typeOf
@@ -43,7 +34,7 @@ function onEventChanged(params) {
                 switch (params.typeOf) {
                     case factory.eventType.ScreeningEventSeries:
                         // 施設コンテンツを興行イベントへ同期(2023-07-28~)
-                        yield syncEventSeries2screeningEvents({
+                        await syncEventSeries2screeningEvents({
                             project: { id: params.project.id },
                             ids: params.id
                         })(repos);
@@ -55,7 +46,7 @@ function onEventChanged(params) {
             if (params.typeOf === factory.eventType.ScreeningEvent) {
                 if (repos.pendingReservation !== undefined) {
                     // sync pendingReservations.expires(2025-05-08~)
-                    yield syncEventEndDate2pendingReservations({
+                    await syncEventEndDate2pendingReservations({
                         ids: params.id,
                         typeOf: params.typeOf
                     })({
@@ -66,13 +57,13 @@ function onEventChanged(params) {
                 }
             }
         }
-    });
+    };
 }
 function syncEventSeries2screeningEvents(params) {
-    return (repos) => __awaiter(this, void 0, void 0, function* () {
+    return async (repos) => {
         const now = new Date();
         for (const eventSeriesId of params.ids) {
-            const superEvents = yield repos.eventSeries.projectEventSeriesFields({
+            const superEvents = await repos.eventSeries.projectEventSeriesFields({
                 limit: 1,
                 page: 1,
                 // typeOf: factory.eventType.ScreeningEventSeries,
@@ -89,26 +80,25 @@ function syncEventSeries2screeningEvents(params) {
             if (superEventFromDB === undefined) {
                 throw new factory.errors.NotFound(factory.eventType.ScreeningEventSeries);
             }
-            yield repos.event.syncScreeningEventSeries2screeningEvents({
+            await repos.event.syncScreeningEventSeries2screeningEvents({
                 project: { id: params.project.id },
                 // superEvent: { id: eventSeriesId },
                 superEventFromDB,
                 startDate: { $gte: now }
             });
         }
-    });
+    };
 }
 function createInformTasks(params, setting) {
     // tslint:disable-next-line:max-func-body-length
-    return (repos
+    return async (repos
     // settings: Settings
-    ) => __awaiter(this, void 0, void 0, function* () {
-        var _a;
+    ) => {
         let events4inform;
         // const informEvents = settings.onEventChanged.informEvent;
-        const informEvents = (_a = setting === null || setting === void 0 ? void 0 : setting.onResourceUpdated) === null || _a === void 0 ? void 0 : _a.informResource;
+        const informEvents = setting?.onResourceUpdated?.informResource;
         if (params.typeOf === factory.eventType.ScreeningEvent) {
-            const screeningEvents4inform = yield repos.event.projectEventFields({
+            const screeningEvents4inform = await repos.event.projectEventFields({
                 id: { $in: params.ids },
                 typeOf: params.typeOf
             }, [
@@ -118,17 +108,22 @@ function createInformTasks(params, setting) {
             );
             // 最適化(2024-03-22~)
             events4inform = screeningEvents4inform.map(({ project, organizer, typeOf, name, doorTime, endDate, eventStatus, location, startDate, superEvent, offers, id, additionalProperty, identifier }) => {
-                var _a, _b;
-                const sellerMakesOffersAsNotification = (Array.isArray((_a = offers.seller) === null || _a === void 0 ? void 0 : _a.makesOffer))
+                const sellerMakesOffersAsNotification = (Array.isArray(offers.seller?.makesOffer))
                     ? offers.seller.makesOffer.map((eventSellerMakesOffer) => {
-                        return Object.assign({ availabilityEnds: eventSellerMakesOffer.availabilityEnds, availabilityStarts: eventSellerMakesOffer.availabilityStarts, validFrom: eventSellerMakesOffer.validFrom, validThrough: eventSellerMakesOffer.validThrough, availableAtOrFrom: [eventSellerMakesOffer.availableAtOrFrom] }, (typeof eventSellerMakesOffer.identifier === 'string')
-                            ? { identifier: eventSellerMakesOffer.identifier }
-                            : undefined // support notify identifier(2025-11-01~)
-                        );
+                        return {
+                            availabilityEnds: eventSellerMakesOffer.availabilityEnds,
+                            availabilityStarts: eventSellerMakesOffer.availabilityStarts,
+                            validFrom: eventSellerMakesOffer.validFrom,
+                            validThrough: eventSellerMakesOffer.validThrough,
+                            availableAtOrFrom: [eventSellerMakesOffer.availableAtOrFrom],
+                            ...(typeof eventSellerMakesOffer.identifier === 'string')
+                                ? { identifier: eventSellerMakesOffer.identifier }
+                                : undefined // support notify identifier(2025-11-01~)
+                        };
                     })
                     : [];
                 let eventOfferAsNotification;
-                if (((_b = offers.offeredThrough) === null || _b === void 0 ? void 0 : _b.identifier) === factory.service.webAPI.Identifier.COA) {
+                if (offers.offeredThrough?.identifier === factory.service.webAPI.Identifier.COA) {
                     eventOfferAsNotification = {
                         typeOf: offers.typeOf,
                         itemOffered: offers.itemOffered
@@ -157,13 +152,16 @@ function createInformTasks(params, setting) {
                         }
                     };
                 }
-                return Object.assign({ project, organizer, typeOf, name, doorTime, endDate,
-                    eventStatus, location, startDate, superEvent, id, additionalProperty, offers: eventOfferAsNotification }, (typeof identifier === 'string') ? { identifier } : undefined // support notify identifier(2025-11-01~)
-                );
+                return {
+                    project, organizer, typeOf, name, doorTime, endDate,
+                    eventStatus, location, startDate, superEvent, id, additionalProperty,
+                    offers: eventOfferAsNotification,
+                    ...(typeof identifier === 'string') ? { identifier } : undefined // support notify identifier(2025-11-01~)
+                };
             });
         }
         else {
-            const screeningEventSeries4inform = yield repos.eventSeries.projectEventSeriesFields({
+            const screeningEventSeries4inform = await repos.eventSeries.projectEventSeriesFields({
                 id: { $in: params.ids }
                 // typeOf: params.typeOf
             }, [
@@ -174,27 +172,37 @@ function createInformTasks(params, setting) {
             );
             // 最適化(2024-03-25~)
             events4inform = screeningEventSeries4inform.map(({ project, organizer, typeOf, name, location, id, soundFormat, workPerformed, kanaName, eventStatus, endDate, startDate, additionalProperty, subtitleLanguage, dubLanguage, alternativeHeadline, description, duration, headline, subEvent }) => {
-                return Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign({ project, organizer, typeOf, name, location, id, soundFormat, workPerformed, kanaName, eventStatus,
-                    endDate, startDate, videoFormat: (Array.isArray(subEvent === null || subEvent === void 0 ? void 0 : subEvent.videoFormat))
+                return {
+                    project, organizer, typeOf, name, location, id, soundFormat, workPerformed, kanaName, eventStatus,
+                    endDate, startDate,
+                    videoFormat: (Array.isArray(subEvent?.videoFormat))
                         ? subEvent.videoFormat.map((codeValue) => ({ typeOf: codeValue, name: codeValue }))
-                        : [] }, (Array.isArray(additionalProperty)) ? { additionalProperty } : undefined), (subtitleLanguage !== undefined) ? {} : undefined), (dubLanguage !== undefined) ? { dubLanguage } : undefined), (alternativeHeadline !== undefined) ? { alternativeHeadline } : undefined), (description !== undefined) ? { description } : undefined), (typeof duration === 'string') ? { duration } : undefined), (headline !== undefined) ? { headline } : undefined);
+                        : [],
+                    // ...(endDate !== undefined) ? { endDate } : undefined,
+                    // ...(startDate !== undefined) ? { startDate } : undefined,
+                    ...(Array.isArray(additionalProperty)) ? { additionalProperty } : undefined,
+                    ...(subtitleLanguage !== undefined) ? {} : undefined,
+                    ...(dubLanguage !== undefined) ? { dubLanguage } : undefined,
+                    ...(alternativeHeadline !== undefined) ? { alternativeHeadline } : undefined,
+                    ...(description !== undefined) ? { description } : undefined,
+                    ...(typeof duration === 'string') ? { duration } : undefined,
+                    ...(headline !== undefined) ? { headline } : undefined
+                };
             });
         }
         if (events4inform.length > 0) {
             const taskRunsAt = new Date();
             const informTasks = [];
-            informEvents === null || informEvents === void 0 ? void 0 : informEvents.forEach((informEvent) => {
-                var _a;
-                const informUrl = String((_a = informEvent.recipient) === null || _a === void 0 ? void 0 : _a.url);
+            informEvents?.forEach((informEvent) => {
+                const informUrl = String(informEvent.recipient?.url);
                 events4inform.forEach((event4inform) => {
-                    var _a;
                     // _idは不要であり、存在すると予期せぬ影響を及ぼす可能性がある
                     delete event4inform._id;
                     const informActionAttributes = {
                         object: event4inform,
                         recipient: {
                             id: '',
-                            name: String((_a = informEvent.recipient) === null || _a === void 0 ? void 0 : _a.name),
+                            name: String(informEvent.recipient?.name),
                             typeOf: factory.creativeWorkType.WebApplication
                             // url: informUrl // discontinue(2025-02-13~)
                         },
@@ -218,19 +226,18 @@ function createInformTasks(params, setting) {
                 });
             });
             if (informTasks.length > 0) {
-                yield repos.task.saveMany(informTasks, { emitImmediately: true });
+                await repos.task.saveMany(informTasks, { emitImmediately: true });
             }
         }
-    });
+    };
 }
 function createInform2aggTasks(params, setting) {
-    return (repos
+    return async (repos
     // settings: Settings
-    ) => __awaiter(this, void 0, void 0, function* () {
-        var _a;
+    ) => {
         let event4inform;
         // const informEvent2agg = settings.onEventChanged.informEvent2agg;
-        const informEvent2agg = (_a = setting === null || setting === void 0 ? void 0 : setting.onEventChanged) === null || _a === void 0 ? void 0 : _a.informEvent2agg;
+        const informEvent2agg = setting?.onEventChanged?.informEvent2agg;
         if (params.typeOf === factory.eventType.ScreeningEvent) {
             event4inform = {
                 id: params.ids,
@@ -244,13 +251,12 @@ function createInform2aggTasks(params, setting) {
             if (Array.isArray(informEvent2agg)) {
                 const taskRunsAt = new Date();
                 const informTasks = informEvent2agg.map((informEvent) => {
-                    var _a, _b;
-                    const informUrl = String((_a = informEvent.recipient) === null || _a === void 0 ? void 0 : _a.url);
+                    const informUrl = String(informEvent.recipient?.url);
                     const informActionAttributes = {
                         object: informObject,
                         recipient: {
                             id: '',
-                            name: String((_b = informEvent.recipient) === null || _b === void 0 ? void 0 : _b.name),
+                            name: String(informEvent.recipient?.name),
                             typeOf: factory.creativeWorkType.WebApplication
                             // url: informUrl // discontinue(2025-02-13~)
                         },
@@ -273,39 +279,38 @@ function createInform2aggTasks(params, setting) {
                     };
                 });
                 if (informTasks.length > 0) {
-                    yield repos.task.saveMany(informTasks, { emitImmediately: true });
+                    await repos.task.saveMany(informTasks, { emitImmediately: true });
                 }
             }
         }
-    });
+    };
 }
 function syncEventEndDate2pendingReservations(params) {
-    return (repos) => __awaiter(this, void 0, void 0, function* () {
-        var _a, _b;
-        const setting = yield repos.setting.findOne({ project: { id: { $eq: '*' } } }, ['storage']);
-        const stockHoldAfterEventEndInDays = (_a = setting === null || setting === void 0 ? void 0 : setting.storage) === null || _a === void 0 ? void 0 : _a.stockHoldAfterEventEndInDays;
+    return async (repos) => {
+        const setting = await repos.setting.findOne({ project: { id: { $eq: '*' } } }, ['storage']);
+        const stockHoldAfterEventEndInDays = setting?.storage?.stockHoldAfterEventEndInDays;
         if (typeof stockHoldAfterEventEndInDays !== 'number') {
             throw new factory.errors.NotFound('setting.storage.stockHoldAfterEventEndInDays');
         }
         for (const eventId of params.ids) {
-            const events = yield repos.event.projectEventFields({
+            const events = await repos.event.projectEventFields({
                 limit: 1,
                 page: 1,
                 id: { $eq: eventId },
                 typeOf: params.typeOf
             }, ['endDate']);
-            const endDate = (_b = events.shift()) === null || _b === void 0 ? void 0 : _b.endDate;
+            const endDate = events.shift()?.endDate;
             if (endDate instanceof Date) {
                 const expires = moment(endDate)
                     .add(stockHoldAfterEventEndInDays, 'days')
                     .toDate();
                 debug('syncEvent2expires processing...', eventId, endDate, expires);
-                const syncResult = yield repos.pendingReservation.syncEvent2expires({
+                const syncResult = await repos.pendingReservation.syncEvent2expires({
                     expires,
                     reservationFor: { id: eventId }
                 });
                 debug('syncEvent2expires processed.', syncResult);
             }
         }
-    });
+    };
 }

package/lib/chevre/service/offer/product/factory.js

@@ -8,7 +8,6 @@ exports.createResult = createResult;
 const moment = require("moment");
 const factory = require("../../../factory");
 function createRegisterServiceStartParams(params) {
-    var _a;
     return {
         project: { typeOf: params.project.typeOf, id: params.project.id },
         typeOf: factory.assetTransactionType.RegisterService,
@@ -18,7 +17,7 @@ function createRegisterServiceStartParams(params) {
             id: params.transaction.seller.id,
             name: (typeof params.transaction.seller.name === 'string')
                 ? params.transaction.seller.name
-                : String((_a = params.transaction.seller.name) === null || _a === void 0 ? void 0 : _a.ja)
+                : String(params.transaction.seller.name?.ja)
             // identifierを廃止(2024-03-05~)
             // identifier: [
             //     { name: 'transaction', value: params.transaction.id },
@@ -38,7 +37,13 @@ function createRegisterServiceStartParams(params) {
             return {
                 typeOf: o.typeOf,
                 id: String(o.id),
-                itemOffered: Object.assign(Object.assign({}, o.itemOffered), { serviceOutput: Object.assign(Object.assign({}, o.itemOffered.serviceOutput), { identifier: permitIdentifier }) })
+                itemOffered: {
+                    ...o.itemOffered,
+                    serviceOutput: {
+                        ...o.itemOffered.serviceOutput,
+                        identifier: permitIdentifier
+                    }
+                }
             };
         }),
         expires: moment(params.transaction.expires)
@@ -47,7 +52,6 @@ function createRegisterServiceStartParams(params) {
     };
 }
 function createActionAttributes(params) {
-    var _a;
     const transaction = params.transaction;
     return {
         project: transaction.project,
@@ -62,7 +66,7 @@ function createActionAttributes(params) {
             typeOf: transaction.seller.typeOf,
             name: (typeof transaction.seller.name === 'string')
                 ? transaction.seller.name
-                : String((_a = transaction.seller.name) === null || _a === void 0 ? void 0 : _a.ja)
+                : String(transaction.seller.name?.ja)
         },
         recipient: {
             id: transaction.agent.id,
@@ -90,50 +94,71 @@ function responseBody2resultAcceptedOffer(params) {
     let acceptedOffers = [];
     if (Array.isArray(params.responseBody.object)) {
         acceptedOffers = params.responseBody.object.map((responseBodyObject) => {
-            var _a, _b, _c, _d;
-            const serviceOutputIdentifier = (_b = (_a = responseBodyObject.itemOffered) === null || _a === void 0 ? void 0 : _a.serviceOutput) === null || _b === void 0 ? void 0 : _b.identifier;
+            const serviceOutputIdentifier = responseBodyObject.itemOffered?.serviceOutput?.identifier;
             if (serviceOutputIdentifier !== undefined && typeof serviceOutputIdentifier !== 'string') {
                 // 基本的にありえないフロー↓
                 throw new factory.errors.Internal(`invalid type of serviceOutput.identifier: ${typeof serviceOutputIdentifier}`);
             }
             // itemOfferedを最小限に最適化
             const permitByResponse = responseBodyObject.itemOffered.serviceOutput;
-            const itemOffered = Object.assign(Object.assign({ 
+            const itemOffered = {
                 // 不要なので廃止(2023-07-01~)
                 // project: permitByResponse.project,
-                typeOf: permitByResponse.typeOf, identifier: permitByResponse.identifier, issuedThrough: permitByResponse.issuedThrough, name: permitByResponse.name }, (typeof permitByResponse.validFor === 'string') ? { validFor: permitByResponse.validFor } : undefined), (typeof ((_c = permitByResponse.amount) === null || _c === void 0 ? void 0 : _c.typeOf) === 'string') ? { amount: permitByResponse.amount } : undefined);
+                typeOf: permitByResponse.typeOf,
+                identifier: permitByResponse.identifier,
+                issuedThrough: permitByResponse.issuedThrough,
+                name: permitByResponse.name,
+                // masked accessCode
+                // ...(typeof permitByResponse.accessCode === 'string') ? { accessCode: 'xxx' } : undefined,
+                ...(typeof permitByResponse.validFor === 'string') ? { validFor: permitByResponse.validFor } : undefined,
+                ...(typeof permitByResponse.amount?.typeOf === 'string') ? { amount: permitByResponse.amount } : undefined
+            };
             const offer = params.acceptedOffer.find((o) => o.id === responseBodyObject.id);
             if (offer === undefined) {
                 throw new factory.errors.Internal(`Offer ${responseBodyObject.id} from registerService not found`);
             }
-            if (typeof ((_d = offer.priceSpecification) === null || _d === void 0 ? void 0 : _d.typeOf) !== 'string') {
+            if (typeof offer.priceSpecification?.typeOf !== 'string') {
                 throw new factory.errors.NotFound('acceptedOffer.priceSpecification');
             }
             const priceComponent = [];
             offer.priceSpecification.priceComponent.forEach((component) => {
-                var _a, _b;
                 if (typeof component.price === 'number') {
                     if (component.typeOf === factory.priceSpecificationType.UnitPriceSpecification) {
                         // tslint:disable-next-line:no-unnecessary-local-variable
-                        const unitPriceComponent = Object.assign(Object.assign(Object.assign({ accounting: component.accounting, name: component.name, price: component.price, priceCurrency: component.priceCurrency, referenceQuantity: component.referenceQuantity, typeOf: component.typeOf, valueAddedTaxIncluded: component.valueAddedTaxIncluded }, (Array.isArray(component.appliesToAddOn))
-                            ? { appliesToAddOn: component.appliesToAddOn }
-                            : undefined), (Array.isArray(component.appliesToMovieTicket))
-                            ? { appliesToMovieTicket: component.appliesToMovieTicket }
-                            : undefined), (typeof ((_a = component.accounting) === null || _a === void 0 ? void 0 : _a.typeOf) === 'string')
-                            ? {
-                                accounting: Object.assign(Object.assign({ typeOf: component.accounting.typeOf }, (typeof component.accounting.accountsReceivable === 'number')
-                                    ? { accountsReceivable: component.accounting.accountsReceivable }
-                                    : undefined), (typeof ((_b = component.accounting.operatingRevenue) === null || _b === void 0 ? void 0 : _b.typeOf) === 'string')
-                                    ? {
-                                        operatingRevenue: {
-                                            // project: component.accounting.operatingRevenue.project, // 削除(2023-12-13~)
-                                            typeOf: component.accounting.operatingRevenue.typeOf,
-                                            codeValue: component.accounting.operatingRevenue.codeValue
-                                        }
+                        const unitPriceComponent = {
+                            accounting: component.accounting,
+                            name: component.name,
+                            price: component.price,
+                            priceCurrency: component.priceCurrency,
+                            referenceQuantity: component.referenceQuantity,
+                            typeOf: component.typeOf,
+                            valueAddedTaxIncluded: component.valueAddedTaxIncluded,
+                            ...(Array.isArray(component.appliesToAddOn))
+                                ? { appliesToAddOn: component.appliesToAddOn }
+                                : undefined,
+                            ...(Array.isArray(component.appliesToMovieTicket))
+                                ? { appliesToMovieTicket: component.appliesToMovieTicket }
+                                : undefined,
+                            ...(typeof component.accounting?.typeOf === 'string')
+                                ? {
+                                    accounting: {
+                                        typeOf: component.accounting.typeOf,
+                                        ...(typeof component.accounting.accountsReceivable === 'number')
+                                            ? { accountsReceivable: component.accounting.accountsReceivable }
+                                            : undefined,
+                                        ...(typeof component.accounting.operatingRevenue?.typeOf === 'string')
+                                            ? {
+                                                operatingRevenue: {
+                                                    // project: component.accounting.operatingRevenue.project, // 削除(2023-12-13~)
+                                                    typeOf: component.accounting.operatingRevenue.typeOf,
+                                                    codeValue: component.accounting.operatingRevenue.codeValue
+                                                }
+                                            }
+                                            : undefined
                                     }
-                                    : undefined)
-                            }
-                            : undefined);
+                                }
+                                : undefined
+                        };
                         priceComponent.push(unitPriceComponent);
                     }
                     else {

package/lib/chevre/service/offer/product/searchProductOffers.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.searchProductOffers = searchProductOffers;
 const factory = require("../../../factory");
@@ -16,10 +7,9 @@ const factory = require("../../../factory");
  */
 function searchProductOffers(params) {
     // tslint:disable-next-line:max-func-body-length
-    return (repos) => __awaiter(this, void 0, void 0, function* () {
-        var _a, _b, _c;
+    return async (repos) => {
         // プロダクト検索
-        const productWithOffers = (yield repos.product.projectFields({
+        const productWithOffers = (await repos.product.projectFields({
             limit: 1,
             page: 1,
             id: { $eq: params.itemOffered.id }
@@ -30,14 +20,14 @@ function searchProductOffers(params) {
             throw new factory.errors.NotFound('Product');
         }
         // const offerCatalogId = productWithOffers.hasOfferCatalog?.id; // migrate to itemListElement(2024-09-30~)
-        const offerCatalogId = (_b = (_a = productWithOffers.hasOfferCatalog) === null || _a === void 0 ? void 0 : _a.itemListElement.at(0)) === null || _b === void 0 ? void 0 : _b.id;
+        const offerCatalogId = productWithOffers.hasOfferCatalog?.itemListElement.at(0)?.id;
         if (typeof offerCatalogId !== 'string') {
             return [];
         }
         // サブカタログIDを決定
         let subOfferCatalogId = offerCatalogId;
         let isOfferCatalogItem = false;
-        const offerCatalogFirstElement = yield repos.offerCatalog.findFirstItemListElementById({ id: offerCatalogId });
+        const offerCatalogFirstElement = await repos.offerCatalog.findFirstItemListElementById({ id: offerCatalogId });
         if (offerCatalogFirstElement.typeOf === 'OfferCatalog') {
             subOfferCatalogId = offerCatalogFirstElement.id;
             isOfferCatalogItem = true;
@@ -50,10 +40,10 @@ function searchProductOffers(params) {
                 throw new factory.errors.NotImplemented('id specification on addSortIndex not implemented');
             }
             // 明示的にカタログ指定可能にする
-            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: [offerCatalogId] },
@@ -70,7 +60,7 @@ function searchProductOffers(params) {
                 }
                 subOfferCatalogId = params.includedInDataCatalog.id;
             }
-            const searchByOfferCatalogIdResult = yield repos.offer.searchByOfferCatalogIdWithSortIndex({
+            const searchByOfferCatalogIdResult = await repos.offer.searchByOfferCatalogIdWithSortIndex({
                 offerCatalog: { id: subOfferCatalogId, isOfferCatalogItem },
                 excludeAppliesToMovieTicket: false,
                 priceSpecification: {}, // 絞る必要なし
@@ -91,13 +81,13 @@ function searchProductOffers(params) {
             let includedInDataCatalogIds = [subOfferCatalogId];
             if (isOfferCatalogItem) {
                 // 複数カタログ対応(2023-09-27~)
-                const offerCatalogItems = yield repos.offerCatalog.findItemListElementById({
+                const offerCatalogItems = await repos.offerCatalog.findItemListElementById({
                     id: offerCatalogId,
                     project: { id: productWithOffers.project.id }
                 });
                 includedInDataCatalogIds = offerCatalogItems.itemListElement.map((element) => element.id);
             }
-            const searchByOfferCatalogIdResult = yield repos.offer.searchAllByIdsAndOfferCatalogId({
+            const searchByOfferCatalogIdResult = await repos.offer.searchAllByIdsAndOfferCatalogId({
                 ids: params.ids,
                 includedInDataCatalog: { id: includedInDataCatalogIds, isOfferCatalogItem },
                 excludeAppliesToMovieTicket: false,
@@ -107,10 +97,9 @@ function searchProductOffers(params) {
             offers = searchByOfferCatalogIdResult;
         }
         return offers.map((o) => {
-            var _a;
             let sortIndex;
             if (params.addSortIndex) {
-                sortIndex = sortedOfferIds === null || sortedOfferIds === void 0 ? void 0 : sortedOfferIds.indexOf(String(o.id));
+                sortIndex = sortedOfferIds?.indexOf(String(o.id));
             }
             const unitSpec = o.priceSpecification;
             const compoundPriceSpecification = {
@@ -121,7 +110,25 @@ function searchProductOffers(params) {
                     ...(unitSpec !== undefined) ? [unitSpec] : []
                 ]
             };
-            return Object.assign(Object.assign(Object.assign(Object.assign(Object.assign({ additionalProperty: (Array.isArray(o.additionalProperty)) ? o.additionalProperty : [], alternateName: o.alternateName, availability: o.availability, color: o.color, description: o.description, id: o.id, identifier: o.identifier, itemOffered: o.itemOffered, name: o.name, priceCurrency: o.priceCurrency, typeOf: o.typeOf, priceSpecification: compoundPriceSpecification }, (o.validFrom instanceof Date) ? { validFrom: o.validFrom } : undefined), (o.validThrough instanceof Date) ? { validThrough: o.validThrough } : undefined), (typeof sortIndex === 'number') ? { sortIndex } : undefined), (typeof o.offerIndex === 'number') ? { offerIndex: o.offerIndex } : undefined), (typeof ((_a = o.parentOffer) === null || _a === void 0 ? void 0 : _a.id) === 'string') ? { parentOffer: { id: o.parentOffer.id } } : undefined);
+            return {
+                additionalProperty: (Array.isArray(o.additionalProperty)) ? o.additionalProperty : [],
+                alternateName: o.alternateName,
+                availability: o.availability,
+                color: o.color,
+                description: o.description,
+                id: o.id,
+                identifier: o.identifier,
+                itemOffered: o.itemOffered,
+                name: o.name,
+                priceCurrency: o.priceCurrency,
+                typeOf: o.typeOf,
+                priceSpecification: compoundPriceSpecification,
+                ...(o.validFrom instanceof Date) ? { validFrom: o.validFrom } : undefined,
+                ...(o.validThrough instanceof Date) ? { validThrough: o.validThrough } : undefined,
+                ...(typeof sortIndex === 'number') ? { sortIndex } : undefined,
+                ...(typeof o.offerIndex === 'number') ? { offerIndex: o.offerIndex } : undefined,
+                ...(typeof o.parentOffer?.id === 'string') ? { parentOffer: { id: o.parentOffer.id } } : undefined
+            };
         });
-    });
+    };
 }