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

package/lib/chevre/service/assetTransaction/reserve/confirm.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.confirm = confirm;
 const factory = require("../../../factory");
@@ -17,20 +8,20 @@ const factory_1 = require("./confirm/factory");
  * 取引確定
  */
 function confirm(params) {
-    return (repos
+    return async (repos
     // settings: Settings
-    ) => __awaiter(this, void 0, void 0, function* () {
+    ) => {
         let transaction;
         // 取引存在確認
         if (typeof params.id === 'string') {
-            transaction = yield repos.assetTransaction.findById({
+            transaction = await repos.assetTransaction.findById({
                 typeOf: factory.assetTransactionType.Reserve,
                 id: params.id
             }, ['project', 'transactionNumber'] // projection(2024-07-01~)
             );
         }
         else if (typeof params.transactionNumber === 'string') {
-            transaction = yield repos.assetTransaction.findByTransactionNumber({
+            transaction = await repos.assetTransaction.findByTransactionNumber({
                 typeOf: factory.assetTransactionType.Reserve,
                 transactionNumber: params.transactionNumber
             }, ['project', 'transactionNumber'] // projection(2024-07-01~)
@@ -39,7 +30,7 @@ function confirm(params) {
         else {
             throw new factory.errors.ArgumentNull('Transaction ID or Transaction Number');
         }
-        const order = yield fixOrderAsPurpose(params, transaction)(repos);
+        const order = await fixOrderAsPurpose(params, transaction)(repos);
         const { potentialActions, underName } = (0, factory_1.createPotentialActions)({
             // ...params,
             // transaction,
@@ -47,34 +38,38 @@ function confirm(params) {
         });
         // 取引確定
         const result = {};
-        yield repos.assetTransaction.confirm(Object.assign({ typeOf: factory.assetTransactionType.Reserve, id: transaction.id, result: result, 
+        await repos.assetTransaction.confirm({
+            typeOf: factory.assetTransactionType.Reserve,
+            id: transaction.id,
+            result: result,
             // potentialActions: (USE_ASSET_TRANSACTION_SYNC_PROCESSING)
             //     ? { reserve: [] }
             //     : potentialActions, // discontinue(2024-07-01~)
-            potentialActions }, (typeof (underName === null || underName === void 0 ? void 0 : underName.typeOf) === 'string')
-            ? { object: { underName } }
-            : undefined));
+            potentialActions,
+            ...(typeof underName?.typeOf === 'string')
+                ? { object: { underName } }
+                : undefined
+        });
         // sync対応(2023-01-13~)
-        yield (0, confirmReservation_1.confirmReservation)({
+        await (0, confirmReservation_1.confirmReservation)({
             // optimize(2024-07-01~)
             // actionAttributesList: potentialActions.reserve,
             potentialReserveAction: { object: { reservationNumber: transaction.transactionNumber } },
             useOnReservationConfirmed: true,
             byTask: true
         })(repos);
-    });
+    };
 }
 function fixOrderAsPurpose(params, transaction) {
-    return (repos) => __awaiter(this, void 0, void 0, function* () {
-        var _a, _b, _c, _d, _e, _f;
+    return async (repos) => {
         let order;
-        const payPurposeConfirmationNumber = (_c = (_b = (_a = params.potentialActions) === null || _a === void 0 ? void 0 : _a.reserve) === null || _b === void 0 ? void 0 : _b.purpose) === null || _c === void 0 ? void 0 : _c.confirmationNumber;
-        const payPurposeOrderNumber = (_f = (_e = (_d = params.potentialActions) === null || _d === void 0 ? void 0 : _d.reserve) === null || _e === void 0 ? void 0 : _e.purpose) === null || _f === void 0 ? void 0 : _f.orderNumber;
+        const payPurposeConfirmationNumber = params.potentialActions?.reserve?.purpose?.confirmationNumber;
+        const payPurposeOrderNumber = params.potentialActions?.reserve?.purpose?.orderNumber;
         if (typeof payPurposeConfirmationNumber === 'string'
             && payPurposeConfirmationNumber.length > 0
             && typeof payPurposeOrderNumber === 'string'
             && payPurposeOrderNumber.length > 0) {
-            const orders = yield repos.order.projectFields({
+            const orders = await repos.order.projectFields({
                 limit: 1,
                 page: 1,
                 project: { id: { $eq: transaction.project.id } },
@@ -87,5 +82,5 @@ function fixOrderAsPurpose(params, transaction) {
             }
         }
         return order;
-    });
+    };
 }

package/lib/chevre/service/assetTransaction/reserve/exportTasksById.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.exportTasksById = exportTasksById;
 const factory = require("../../../factory");
@@ -15,10 +6,9 @@ const factory = require("../../../factory");
  * 取引タスク出力
  */
 function exportTasksById(params) {
-    // tslint:disable-next-line:max-func-body-length
-    return (repos) => __awaiter(this, void 0, void 0, function* () {
+    return async (repos) => {
         // const { useAssetTransactionSyncProcessing } = settings;
-        const transaction = yield repos.assetTransaction.findById({
+        const transaction = await repos.assetTransaction.findById({
             typeOf: factory.assetTransactionType.Reserve,
             id: params.id
         }, ['status', 'transactionNumber', 'project', 'typeOf'] // projection(2024-07-01~)
@@ -84,5 +74,5 @@ function exportTasksById(params) {
                 throw new factory.errors.NotImplemented(`Transaction status "${transaction.status}" not implemented.`);
         }
         return repos.task.saveMany(taskAttributes, { emitImmediately: true });
-    });
+    };
 }

package/lib/chevre/service/assetTransaction/reserve/start/createSubReservations.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.createSubReservations = createSubReservations;
 const createDebug = require("debug");
@@ -18,9 +9,7 @@ const OfferService = require("../../../offer");
 const createReservation_1 = require("./factory/createReservation");
 const debug = createDebug('chevre-domain:service:assetTransaction:reserve');
 function createSubReservations(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, _g, _h, _j, _k;
+    return async (repos) => {
         // 予約番号
         // const reservationNumber = params.transaction.object.reservationNumber;
         const reservationNumber = params.reservationNumber;
@@ -29,14 +18,14 @@ function createSubReservations(params) {
         }
         // 指定席のみかどうか
         const eventOffers = params.event.offers;
-        const reservedSeatsOnly = ((_b = (_a = eventOffers === null || eventOffers === void 0 ? void 0 : eventOffers.itemOffered.serviceOutput) === null || _a === void 0 ? void 0 : _a.reservedTicket) === null || _b === void 0 ? void 0 : _b.ticketedSeat) !== undefined;
+        const reservedSeatsOnly = eventOffers?.itemOffered.serviceOutput?.reservedTicket?.ticketedSeat !== undefined;
         // オファーIDごとにオファー適用条件を確認(興行オファー承認アクションから処理を移行)(2024-07-03~)
         validateQuantityRequirement({ acceptedOffers: params.acceptedOffers, ticketOffers: params.ticketOffers, reservationNumber });
         // 事前予約要件参照
         let advanceBookingRequirements = [];
-        const advanceBookingRequirementIds = [...new Set(params.availableOffers.reduce((a, b) => { var _a; return (typeof ((_a = b.advanceBookingRequirement) === null || _a === void 0 ? void 0 : _a.id) === 'string') ? [...a, b.advanceBookingRequirement.id] : a; }, []))];
+        const advanceBookingRequirementIds = [...new Set(params.availableOffers.reduce((a, b) => (typeof b.advanceBookingRequirement?.id === 'string') ? [...a, b.advanceBookingRequirement.id] : a, []))];
         if (advanceBookingRequirementIds.length > 0) {
-            advanceBookingRequirements = yield repos.advanceBookingRequirement.projectFields({ id: { $in: advanceBookingRequirementIds } }, ['identifier', 'maxValue', 'minValue', 'unitCode', 'valueReference']);
+            advanceBookingRequirements = await repos.advanceBookingRequirement.projectFields({ id: { $in: advanceBookingRequirementIds } }, ['identifier', 'maxValue', 'minValue', 'unitCode', 'valueReference']);
             debug('createSubReservations:', advanceBookingRequirements.length, 'advanceBookingRequirements found', JSON.stringify(advanceBookingRequirements));
         }
         const reservations = [];
@@ -59,7 +48,7 @@ function createSubReservations(params) {
                 now: params.now,
                 reservationFor: params.event
             });
-            const programMembershipUsed = yield validateProgramMembershipUsed({
+            const programMembershipUsed = await validateProgramMembershipUsed({
                 acceptedOffer,
                 availableOffer: ticketType,
                 project: { id: params.event.project.id }
@@ -80,18 +69,17 @@ function createSubReservations(params) {
             // 座席指定であれば、座席タイプチャージを検索する
             const seatPriceComponent = [];
             // 区分加算料金を適用しないオプションを追加(2023-01-26~)
-            const ignoreCategoryCodeChargeSpec = ((_c = ticketType.settings) === null || _c === void 0 ? void 0 : _c.ignoreCategoryCodeChargeSpec) === true;
+            const ignoreCategoryCodeChargeSpec = ticketType.settings?.ignoreCategoryCodeChargeSpec === true;
             if (!ignoreCategoryCodeChargeSpec) {
-                const seatSection = (_d = reservedTicket.ticketedSeat) === null || _d === void 0 ? void 0 : _d.seatSection;
-                const seatNumber = (_e = reservedTicket.ticketedSeat) === null || _e === void 0 ? void 0 : _e.seatNumber;
+                const seatSection = reservedTicket.ticketedSeat?.seatSection;
+                const seatNumber = reservedTicket.ticketedSeat?.seatNumber;
                 if (typeof seatSection === 'string' && typeof seatNumber === 'string') {
-                    const offersOnSeat = (_f = params.availableSeatOffers.find((o) => {
-                        var _a;
-                        return o.branchCode === seatNumber && ((_a = o.containedInPlace) === null || _a === void 0 ? void 0 : _a.branchCode) === seatSection;
-                    })) === null || _f === void 0 ? void 0 : _f.offers;
+                    const offersOnSeat = params.availableSeatOffers.find((o) => {
+                        return o.branchCode === seatNumber && o.containedInPlace?.branchCode === seatSection;
+                    })?.offers;
                     if (Array.isArray(offersOnSeat)) {
                         const availableSeatOffer = offersOnSeat[0];
-                        const seatPriceSpecs = (_g = availableSeatOffer === null || availableSeatOffer === void 0 ? void 0 : availableSeatOffer.priceSpecification) === null || _g === void 0 ? void 0 : _g.priceComponent;
+                        const seatPriceSpecs = availableSeatOffer?.priceSpecification?.priceComponent;
                         if (Array.isArray(seatPriceSpecs)) {
                             seatPriceComponent.push(...seatPriceSpecs);
                         }
@@ -104,7 +92,7 @@ function createSubReservations(params) {
             const acceptedAddOnsParams = acceptedOffer.addOn;
             if (Array.isArray(acceptedAddOnsParams) && acceptedAddOnsParams.length > 0) {
                 // アドオンオファー検索(2023-03-02~)
-                availableAddOns = yield searchAvailableAddOns({
+                availableAddOns = await searchAvailableAddOns({
                     ids: acceptedAddOnsParams.map((acceptedAddOn) => String(acceptedAddOn.id)),
                     project: { id: params.event.project.id },
                     ticketOffer,
@@ -113,8 +101,7 @@ function createSubReservations(params) {
             }
             if (Array.isArray(availableAddOns) && Array.isArray(acceptedAddOnsParams)) {
                 acceptedAddOnsParams.forEach((acceptedAddOnParams) => {
-                    var _a, _b, _c;
-                    const availableAddOn = availableAddOns === null || availableAddOns === void 0 ? void 0 : availableAddOns.find((addOn) => addOn.id === acceptedAddOnParams.id);
+                    const availableAddOn = availableAddOns?.find((addOn) => addOn.id === acceptedAddOnParams.id);
                     if (availableAddOn !== undefined) {
                         // acceptedAddOnsの重複を避ける(単価オファーIDに対して)
                         if (!acceptedAddOns.some((addOn) => addOn.id === availableAddOn.id)) {
@@ -125,7 +112,7 @@ function createSubReservations(params) {
                             // 受入数量はデフォルトで単価オファーの基準数量
                             let referenceQuantityValueAccepted = availableAddOnReferenceQuantityValue;
                             // 数量指定を検証(2023-08-31~)
-                            const specifiedReferencedQuantityValue = (_b = (_a = acceptedAddOnParams.priceSpecification) === null || _a === void 0 ? void 0 : _a.referenceQuantity) === null || _b === void 0 ? void 0 : _b.value;
+                            const specifiedReferencedQuantityValue = acceptedAddOnParams.priceSpecification?.referenceQuantity?.value;
                             if (typeof specifiedReferencedQuantityValue === 'number') {
                                 if (specifiedReferencedQuantityValue < 1) {
                                     throw new factory.errors.Argument('addOn.priceSpecification.referenceQuantity.value must be > 0');
@@ -139,15 +126,30 @@ function createSubReservations(params) {
                             }
                             const priceAccepted = availableAddOn.priceSpecification.price *
                                 (referenceQuantityValueAccepted / availableAddOnReferenceQuantityValue);
-                            const accountsReceivableAccepted = (typeof ((_c = availableAddOn.priceSpecification.accounting) === null || _c === void 0 ? void 0 : _c.accountsReceivable) === 'number')
+                            const accountsReceivableAccepted = (typeof availableAddOn.priceSpecification.accounting?.accountsReceivable === 'number')
                                 ? availableAddOn.priceSpecification.accounting.accountsReceivable *
                                     (referenceQuantityValueAccepted / availableAddOnReferenceQuantityValue)
                                 : undefined;
-                            const acceptedAddOn = Object.assign(Object.assign({}, availableAddOn), { priceSpecification: Object.assign(Object.assign(Object.assign({}, availableAddOn.priceSpecification), (typeof accountsReceivableAccepted === 'number')
-                                    ? {
-                                        accounting: Object.assign(Object.assign({}, availableAddOn.priceSpecification.accounting), { accountsReceivable: accountsReceivableAccepted, typeOf: 'Accounting' })
+                            const acceptedAddOn = {
+                                ...availableAddOn,
+                                priceSpecification: {
+                                    ...availableAddOn.priceSpecification,
+                                    ...(typeof accountsReceivableAccepted === 'number')
+                                        ? {
+                                            accounting: {
+                                                ...availableAddOn.priceSpecification.accounting,
+                                                accountsReceivable: accountsReceivableAccepted,
+                                                typeOf: 'Accounting'
+                                            }
+                                        }
+                                        : undefined,
+                                    price: priceAccepted,
+                                    referenceQuantity: {
+                                        ...availableAddOn.priceSpecification.referenceQuantity,
+                                        value: referenceQuantityValueAccepted
                                     }
-                                    : undefined), { price: priceAccepted, referenceQuantity: Object.assign(Object.assign({}, availableAddOn.priceSpecification.referenceQuantity), { value: referenceQuantityValueAccepted }) }) });
+                                }
+                            };
                             acceptedAddOns.push(acceptedAddOn);
                         }
                     }
@@ -156,7 +158,7 @@ function createSubReservations(params) {
                 //     (availableAddOn) => acceptedAddOnsParams.some((acceptedAddOn) => availableAddOn.id === acceptedAddOn.id)
                 // );
             }
-            const subReservation = (_j = (_h = acceptedOffer.itemOffered) === null || _h === void 0 ? void 0 : _h.serviceOutput) === null || _j === void 0 ? void 0 : _j.subReservation;
+            const subReservation = acceptedOffer.itemOffered?.serviceOutput?.subReservation;
             reservations.push((0, createReservation_1.createReservation)({
                 project: { id: params.event.project.id, typeOf: factory.organizationType.Project },
                 id: reservationId,
@@ -170,23 +172,31 @@ function createSubReservations(params) {
                 subReservation: subReservation,
                 programMembershipUsed,
                 availableOffer: ticketType,
-                appliesToMovieTicket: (_k = acceptedOffer.priceSpecification) === null || _k === void 0 ? void 0 : _k.appliesToMovieTicket,
+                appliesToMovieTicket: acceptedOffer.priceSpecification?.appliesToMovieTicket,
                 validateAppliesToMovieTicket: params.validateAppliesToMovieTicket
             }));
         }
         return reservations;
-    });
+    };
 }
 function searchAvailableAddOns(params) {
-    return (repos) => __awaiter(this, void 0, void 0, function* () {
-        var _a;
+    return async (repos) => {
         const availableAddOns = [];
         if (Array.isArray(params.ticketOffer.addOn)) {
             const addOnProductIds = [...new Set(params.ticketOffer.addOn.map((o) => String(o.itemOffered.id)))];
             for (const addOnProductId of addOnProductIds) {
-                const { offers, product } = yield OfferService.product.search(Object.assign({ ids: params.ids, project: { id: params.project.id }, itemOffered: { id: addOnProductId }, onlyValid: true, addSortIndex: false, includedInDataCatalog: { id: '' }, useIncludeInDataCatalog: false }, (typeof ((_a = params.availableAtOrFrom) === null || _a === void 0 ? void 0 : _a.id) === 'string')
-                    ? { availableAt: { id: params.availableAtOrFrom.id } }
-                    : undefined))(repos);
+                const { offers, product } = await OfferService.product.search({
+                    ids: params.ids,
+                    project: { id: params.project.id },
+                    itemOffered: { id: addOnProductId },
+                    onlyValid: true,
+                    addSortIndex: false,
+                    includedInDataCatalog: { id: '' }, // 承認時はカタログ指定の必要なし
+                    useIncludeInDataCatalog: false,
+                    ...(typeof params.availableAtOrFrom?.id === 'string')
+                        ? { availableAt: { id: params.availableAtOrFrom.id } }
+                        : undefined
+                })(repos);
                 const productType = product.typeOf;
                 if (productType === factory.product.ProductType.Product) {
                     availableAddOns.push(...offers.map((o) => {
@@ -200,16 +210,29 @@ function searchAvailableAddOns(params) {
                         const unitPriceSpec = o.priceSpecification.priceComponent.find((component) => {
                             return component.typeOf === factory.priceSpecificationType.UnitPriceSpecification;
                         });
-                        if ((unitPriceSpec === null || unitPriceSpec === void 0 ? void 0 : unitPriceSpec.typeOf) !== factory.priceSpecificationType.UnitPriceSpecification) {
+                        if (unitPriceSpec?.typeOf !== factory.priceSpecificationType.UnitPriceSpecification) {
                             throw new factory.errors.NotFound('UnitPriceSpecification of an addOn');
                         }
-                        return Object.assign(Object.assign({ alternateName: o.alternateName, availability: o.availability, description: o.description, id: String(o.id), identifier: o.identifier, itemOffered: itemOffered4addOn, name: o.name, priceCurrency: o.priceCurrency, priceSpecification: unitPriceSpec, typeOf: o.typeOf }, (o.validFrom instanceof Date) ? { validFrom: o.validFrom } : undefined), (o.validThrough instanceof Date) ? { validThrough: o.validThrough } : undefined);
+                        return {
+                            alternateName: o.alternateName,
+                            availability: o.availability,
+                            description: o.description,
+                            id: String(o.id),
+                            identifier: o.identifier,
+                            itemOffered: itemOffered4addOn,
+                            name: o.name,
+                            priceCurrency: o.priceCurrency,
+                            priceSpecification: unitPriceSpec,
+                            typeOf: o.typeOf,
+                            ...(o.validFrom instanceof Date) ? { validFrom: o.validFrom } : undefined,
+                            ...(o.validThrough instanceof Date) ? { validThrough: o.validThrough } : undefined
+                        };
                     }));
                 }
             }
         }
         return availableAddOns;
-    });
+    };
 }
 function validateQuantityRequirement(params) {
     const { acceptedOffers, ticketOffers, reservationNumber } = params;
@@ -219,7 +242,6 @@ function validateQuantityRequirement(params) {
     debug('validating quantity requirement... reservationNumber:', reservationNumber, offerIds);
     // オファーIDごとにオファー適用条件を確認
     offerIds.forEach((offerId) => {
-        var _a, _b, _c;
         const numAcceptedOffersByOfferId = params.acceptedOffers.filter(({ id }) => id === offerId).length;
         const ticketOffer = ticketOffers.find(({ id }) => id === offerId);
         if (ticketOffer === undefined) {
@@ -229,10 +251,10 @@ function validateQuantityRequirement(params) {
         // 単価仕様を取り出す
         const unitPriceSpec = ticketOffer.priceSpecification.priceComponent.find((spec) => spec.typeOf === factory.priceSpecificationType.UnitPriceSpecification && (!Array.isArray(spec.appliesToAddOn)));
         // 単価仕様は必ず存在するはず
-        if ((unitPriceSpec === null || unitPriceSpec === void 0 ? void 0 : unitPriceSpec.typeOf) !== factory.priceSpecificationType.UnitPriceSpecification) {
+        if (unitPriceSpec?.typeOf !== factory.priceSpecificationType.UnitPriceSpecification) {
             throw new factory.errors.Internal(`unitPriceSpec of the offer '${offerId}' not found`);
         }
-        const unitPriceSpecReferenceQuantityValue = (_a = unitPriceSpec.referenceQuantity) === null || _a === void 0 ? void 0 : _a.value;
+        const unitPriceSpecReferenceQuantityValue = unitPriceSpec.referenceQuantity?.value;
         if (typeof unitPriceSpecReferenceQuantityValue === 'number') {
             referenceQuantityValue = unitPriceSpecReferenceQuantityValue;
         }
@@ -242,14 +264,14 @@ function validateQuantityRequirement(params) {
             throw new factory.errors.Argument('acceptedOffers', `Offer ${offerId} requires reference quantity value ${referenceQuantityValue}`);
         }
         // 適用数量要件を満たしていなければエラー
-        const maxValue = (_b = unitPriceSpec.eligibleQuantity) === null || _b === void 0 ? void 0 : _b.maxValue;
+        const maxValue = unitPriceSpec.eligibleQuantity?.maxValue;
         if (typeof maxValue === 'number') {
             debug('validating eligibleQuantity.maxValue... reservationNumber:', reservationNumber, offerId, 'numAcceptedOffersByOfferId:', numAcceptedOffersByOfferId, 'maxValue:', maxValue);
             if (numAcceptedOffersByOfferId > maxValue) {
                 throw new factory.errors.Argument('acceptedOffers', `Number of offer:${offerId} must be less than or equal to ${maxValue}`);
             }
         }
-        const minValue = (_c = unitPriceSpec.eligibleQuantity) === null || _c === void 0 ? void 0 : _c.minValue;
+        const minValue = unitPriceSpec.eligibleQuantity?.minValue;
         if (typeof minValue === 'number') {
             debug('validating eligibleQuantity.minValue... reservationNumber:', reservationNumber, offerId, 'numAcceptedOffersByOfferId:', numAcceptedOffersByOfferId, 'minValue:', minValue);
             if (numAcceptedOffersByOfferId < minValue) {
@@ -262,10 +284,9 @@ function validateQuantityRequirement(params) {
  * 事前予約要件を検証する
  */
 function validateAdvanceBookingRequirement(params) {
-    var _a, _b;
     let requirementSatisfied = true;
     // reimplement using advanceBookingRequirementRepo(2025-04-08~)
-    const advanceBookingRequirementId = (_a = params.unitPriceOffer.advanceBookingRequirement) === null || _a === void 0 ? void 0 : _a.id;
+    const advanceBookingRequirementId = params.unitPriceOffer.advanceBookingRequirement?.id;
     if (typeof advanceBookingRequirementId === 'string') {
         const advanceBookingRequirement = params.advanceBookingRequirements.find(({ id }) => id === advanceBookingRequirementId);
         if (advanceBookingRequirement === undefined) {
@@ -274,13 +295,11 @@ function validateAdvanceBookingRequirement(params) {
         const advanceBookingRequirementMaxValue = advanceBookingRequirement.maxValue;
         const advanceBookingRequirementMinValue = advanceBookingRequirement.minValue;
         const advanceBookingRequirementUnitCode = advanceBookingRequirement.unitCode;
-        const valueReferenceOpens = (_b = advanceBookingRequirement.valueReference) === null || _b === void 0 ? void 0 : _b.opens;
+        const valueReferenceOpens = advanceBookingRequirement.valueReference?.opens;
         let usageDate = moment(params.reservationFor.startDate, true);
         if (typeof valueReferenceOpens === 'string') {
             // support valueReference(2025-04-10~)
-            // tslint:disable-next-line:no-magic-numbers
             const opensOffset = valueReferenceOpens.slice(8); // format: HH:mm:ssZ
-            // tslint:disable-next-line:no-console
             debug('opensOffset:', opensOffset);
             usageDate = usageDate.utcOffset(opensOffset);
             usageDate = moment(`${usageDate.format('YYYY-MM-DD')}T${valueReferenceOpens}`, true);
@@ -318,29 +337,27 @@ function validateAdvanceBookingRequirement(params) {
     }
 }
 function validateProgramMembershipUsed(params) {
-    // tslint:disable-next-line:cyclomatic-complexity max-func-body-length
-    return (repos) => __awaiter(this, void 0, void 0, function* () {
-        var _a, _b, _c, _d, _e, _f, _g, _h;
+    return async (repos) => {
         const now = new Date();
         let programMembershipUsed;
-        const requestedProgramMembershipUsed = (_b = (_a = params.acceptedOffer.itemOffered) === null || _a === void 0 ? void 0 : _a.serviceOutput) === null || _b === void 0 ? void 0 : _b.programMembershipUsed;
+        const requestedProgramMembershipUsed = params.acceptedOffer.itemOffered?.serviceOutput?.programMembershipUsed;
         if (typeof requestedProgramMembershipUsed === 'string') {
             throw new factory.errors.Argument('acceptedOffer.itemOffered.serviceOutput.programMembershipUsed', 'must be permit');
         }
-        if ((requestedProgramMembershipUsed === null || requestedProgramMembershipUsed === void 0 ? void 0 : requestedProgramMembershipUsed.typeOf) === 'Ticket') {
+        if (requestedProgramMembershipUsed?.typeOf === 'Ticket') {
             throw new factory.errors.Argument('acceptedOffer.itemOffered.serviceOutput.programMembershipUsed', 'must be permit');
         }
-        const programMembershipUsedIdentifier = requestedProgramMembershipUsed === null || requestedProgramMembershipUsed === void 0 ? void 0 : requestedProgramMembershipUsed.identifier;
-        const issuedThroughTypeOf = (_c = requestedProgramMembershipUsed === null || requestedProgramMembershipUsed === void 0 ? void 0 : requestedProgramMembershipUsed.issuedThrough) === null || _c === void 0 ? void 0 : _c.typeOf;
+        const programMembershipUsedIdentifier = requestedProgramMembershipUsed?.identifier;
+        const issuedThroughTypeOf = requestedProgramMembershipUsed?.issuedThrough?.typeOf;
         if (typeof programMembershipUsedIdentifier === 'string') {
             let permitIssuedThrough;
             // まずメンバーシップを検索して、存在しなければCreditCardを検索(どちらが発行元サービスか不明なので)
             if (issuedThroughTypeOf === factory.product.ProductType.MembershipService) {
-                const issuedThroughId = (_d = requestedProgramMembershipUsed === null || requestedProgramMembershipUsed === void 0 ? void 0 : requestedProgramMembershipUsed.issuedThrough) === null || _d === void 0 ? void 0 : _d.id;
+                const issuedThroughId = requestedProgramMembershipUsed?.issuedThrough?.id;
                 if (typeof issuedThroughId !== 'string' || issuedThroughId === '') {
                     throw new factory.errors.ArgumentNull('acceptedOffer.itemOffered.serviceOutput.programMembershipUsed.issuedThrough.id');
                 }
-                permitIssuedThrough = (yield repos.product.projectFields({
+                permitIssuedThrough = (await repos.product.projectFields({
                     limit: 1,
                     page: 1,
                     id: { $eq: issuedThroughId },
@@ -353,11 +370,11 @@ function validateProgramMembershipUsed(params) {
                 }
             }
             else if (issuedThroughTypeOf === factory.service.paymentService.PaymentServiceType.CreditCard) {
-                const issuedThroughId = (_e = requestedProgramMembershipUsed === null || requestedProgramMembershipUsed === void 0 ? void 0 : requestedProgramMembershipUsed.issuedThrough) === null || _e === void 0 ? void 0 : _e.id;
+                const issuedThroughId = requestedProgramMembershipUsed?.issuedThrough?.id;
                 if (typeof issuedThroughId !== 'string' || issuedThroughId === '') {
                     throw new factory.errors.ArgumentNull('acceptedOffer.itemOffered.serviceOutput.programMembershipUsed.issuedThrough.id');
                 }
-                permitIssuedThrough = (yield repos.paymentService.projectFields({
+                permitIssuedThrough = (await repos.paymentService.projectFields({
                     limit: 1,
                     page: 1,
                     id: { $eq: issuedThroughId },
@@ -379,7 +396,7 @@ function validateProgramMembershipUsed(params) {
             switch (permitIssuedThrough.typeOf) {
                 case factory.service.paymentService.PaymentServiceType.FaceToFace:
                     // 適用メンバーシップ条件有のオファーであれば、問答無用に受け入れる
-                    const eligibleMembershipType = (_g = (_f = params.availableOffer.eligibleMembershipType) === null || _f === void 0 ? void 0 : _f[0]) === null || _g === void 0 ? void 0 : _g.codeValue;
+                    const eligibleMembershipType = params.availableOffer.eligibleMembershipType?.[0]?.codeValue;
                     if (typeof eligibleMembershipType === 'string') {
                         programMembershipUsed = {
                             typeOf: factory.programMembership.ProgramMembershipType.ProgramMembership,
@@ -396,12 +413,12 @@ function validateProgramMembershipUsed(params) {
                     // 決済サービスのserviceOutputにPermitが存在すれば、設定されたメンバーシップ区分のPermitをprogramMembershipUsedとして適用する
                     let issuedThroughServiceType;
                     if (Array.isArray(permitIssuedThrough.serviceOutput)) {
-                        const serviceOutputAsPermit = permitIssuedThrough.serviceOutput.find((output) => (output === null || output === void 0 ? void 0 : output.typeOf) === factory.permit.PermitType.Permit);
-                        if ((serviceOutputAsPermit === null || serviceOutputAsPermit === void 0 ? void 0 : serviceOutputAsPermit.typeOf) === factory.permit.PermitType.Permit) {
+                        const serviceOutputAsPermit = permitIssuedThrough.serviceOutput.find((output) => output?.typeOf === factory.permit.PermitType.Permit);
+                        if (serviceOutputAsPermit?.typeOf === factory.permit.PermitType.Permit) {
                             issuedThroughServiceType = serviceOutputAsPermit.issuedThrough.serviceType;
                         }
                     }
-                    if (typeof (issuedThroughServiceType === null || issuedThroughServiceType === void 0 ? void 0 : issuedThroughServiceType.codeValue) === 'string') {
+                    if (typeof issuedThroughServiceType?.codeValue === 'string') {
                         programMembershipUsed = {
                             typeOf: factory.programMembership.ProgramMembershipType.ProgramMembership,
                             identifier: programMembershipUsedIdentifier,
@@ -418,9 +435,9 @@ function validateProgramMembershipUsed(params) {
                     break;
                 case factory.product.ProductType.MembershipService:
                     // requestedProgramMembershipUsedの発行サービスIDから外部連携設定を取得する
-                    const permitService = yield createPermitService({ issuedThrough: { id: permitIssuedThrough.id } })(repos);
+                    const permitService = await createPermitService({ issuedThrough: { id: permitIssuedThrough.id } })(repos);
                     // メンバーシップの存在確認
-                    const serviceOutput = yield permitService.findByIdentifier({
+                    const serviceOutput = await permitService.findByIdentifier({
                         project: { id: params.project.id },
                         identifier: programMembershipUsedIdentifier,
                         issuedThrough: { typeOf: factory.product.ProductType.MembershipService }
@@ -436,7 +453,7 @@ function validateProgramMembershipUsed(params) {
                             .isBefore(moment(now))) {
                         throw new factory.errors.Argument('acceptedOffer.itemOffered.serviceOutput.programMembershipUsed', 'unavailable programMembership');
                     }
-                    if (((_h = permitIssuedThrough.serviceType) === null || _h === void 0 ? void 0 : _h.typeOf) === 'CategoryCode') {
+                    if (permitIssuedThrough.serviceType?.typeOf === 'CategoryCode') {
                         programMembershipUsed = {
                             typeOf: factory.programMembership.ProgramMembershipType.ProgramMembership,
                             identifier: programMembershipUsedIdentifier,
@@ -453,12 +470,11 @@ function validateProgramMembershipUsed(params) {
             }
         }
         return programMembershipUsed;
-    });
+    };
 }
 function createPermitService(params) {
-    return (repos) => __awaiter(this, void 0, void 0, function* () {
-        var _a, _b, _c, _d, _e, _f, _g;
-        const product = (yield repos.product.projectFields({
+    return async (repos) => {
+        const product = (await repos.product.projectFields({
             limit: 1,
             page: 1,
             id: { $eq: params.issuedThrough.id }
@@ -468,19 +484,19 @@ function createPermitService(params) {
         if (product === undefined) {
             throw new factory.errors.NotFound('Product');
         }
-        const permitServiceEndpoint = (_a = product.availableChannel) === null || _a === void 0 ? void 0 : _a.serviceUrl;
-        const permitServiceAuthorizeServerDomain = (_c = (_b = product.availableChannel) === null || _b === void 0 ? void 0 : _b.credentials) === null || _c === void 0 ? void 0 : _c.authorizeServerDomain;
-        const permitServiceClientId = (_e = (_d = product.availableChannel) === null || _d === void 0 ? void 0 : _d.credentials) === null || _e === void 0 ? void 0 : _e.clientId;
-        const permitServiceClientSecret = (_g = (_f = product.availableChannel) === null || _f === void 0 ? void 0 : _f.credentials) === null || _g === void 0 ? void 0 : _g.clientSecret;
+        const permitServiceEndpoint = product.availableChannel?.serviceUrl;
+        const permitServiceAuthorizeServerDomain = product.availableChannel?.credentials?.authorizeServerDomain;
+        const permitServiceClientId = product.availableChannel?.credentials?.clientId;
+        const permitServiceClientSecret = product.availableChannel?.credentials?.clientSecret;
         if (typeof permitServiceEndpoint !== 'string' || permitServiceEndpoint.length === 0
             || typeof permitServiceAuthorizeServerDomain !== 'string' || permitServiceAuthorizeServerDomain.length === 0
             || typeof permitServiceClientId !== 'string' || permitServiceClientId.length === 0
             || typeof permitServiceClientSecret !== 'string' || permitServiceClientSecret.length === 0) {
             throw new factory.errors.Internal('product availableChannel invalid');
         }
-        return new (yield pecorinoapi.loadPecorino()).service.Permit({
+        return new (await pecorinoapi.loadPecorino()).service.Permit({
             endpoint: permitServiceEndpoint,
-            auth: yield pecorinoapi.auth.ClientCredentials.createInstance({
+            auth: await pecorinoapi.auth.ClientCredentials.createInstance({
                 domain: permitServiceAuthorizeServerDomain,
                 clientId: permitServiceClientId,
                 clientSecret: permitServiceClientSecret,
@@ -488,5 +504,5 @@ function createPermitService(params) {
                 state: ''
             })
         });
-    });
+    };
 }

package/lib/chevre/service/assetTransaction/reserve/start/factory/createPointAward.js

@@ -7,17 +7,16 @@ const accountTransactionIdentifier_1 = require("../../../../../factory/accountTr
  * ポイント特典を作成する
  */
 function createPointAward(params) {
-    var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m;
     let pointAward;
-    const pointAwardAmount = (_b = (_a = params.offer.itemOffered) === null || _a === void 0 ? void 0 : _a.pointAward) === null || _b === void 0 ? void 0 : _b.amount;
-    const pointAwardDescription = (_d = (_c = params.offer.itemOffered) === null || _c === void 0 ? void 0 : _c.pointAward) === null || _d === void 0 ? void 0 : _d.description;
-    const pointAwardToLocationIdentifier = (_g = (_f = (_e = params.acceptedOffer.itemOffered) === null || _e === void 0 ? void 0 : _e.pointAward) === null || _f === void 0 ? void 0 : _f.toLocation) === null || _g === void 0 ? void 0 : _g.identifier;
-    const pointAwardToLocationIssuedThroughId = (_k = (_j = (_h = params.acceptedOffer.itemOffered) === null || _h === void 0 ? void 0 : _h.pointAward) === null || _j === void 0 ? void 0 : _j.toLocation) === null || _k === void 0 ? void 0 : _k.issuedThrough.id;
-    const pointAwardRecipient = (_m = (_l = params.acceptedOffer.itemOffered) === null || _l === void 0 ? void 0 : _l.pointAward) === null || _m === void 0 ? void 0 : _m.recipient;
+    const pointAwardAmount = params.offer.itemOffered?.pointAward?.amount;
+    const pointAwardDescription = params.offer.itemOffered?.pointAward?.description;
+    const pointAwardToLocationIdentifier = params.acceptedOffer.itemOffered?.pointAward?.toLocation?.identifier;
+    const pointAwardToLocationIssuedThroughId = params.acceptedOffer.itemOffered?.pointAward?.toLocation?.issuedThrough.id;
+    const pointAwardRecipient = params.acceptedOffer.itemOffered?.pointAward?.recipient;
     // const pointAwardPurposeIdentifier = params.acceptedOffer.itemOffered?.pointAward?.purpose?.identifier;
     // オファーのpointAward設定が適切にされていれば、指定されたtoLocationを反映する
-    if (typeof (pointAwardAmount === null || pointAwardAmount === void 0 ? void 0 : pointAwardAmount.value) === 'number'
-        && typeof (pointAwardAmount === null || pointAwardAmount === void 0 ? void 0 : pointAwardAmount.currency) === 'string'
+    if (typeof pointAwardAmount?.value === 'number'
+        && typeof pointAwardAmount?.currency === 'string'
         && typeof pointAwardToLocationIdentifier === 'string'
         && typeof pointAwardToLocationIssuedThroughId === 'string') {
         // ここで識別子を作成する(入金のユニークネスが保証される)
@@ -27,13 +26,19 @@ function createPointAward(params) {
             reservation: { id: params.reservation.id },
             toLocation: { identifier: pointAwardToLocationIdentifier }
         });
-        pointAward = Object.assign(Object.assign({ amount: pointAwardAmount, purpose: { identifier: purposeIdentifier }, toLocation: {
+        pointAward = {
+            amount: pointAwardAmount,
+            purpose: { identifier: purposeIdentifier },
+            toLocation: {
                 typeOf: factory.permit.PermitType.Permit,
                 identifier: pointAwardToLocationIdentifier,
                 issuedThrough: { id: pointAwardToLocationIssuedThroughId }
-            }, typeOf: factory.actionType.MoneyTransfer }, (typeof pointAwardDescription === 'string') ? { description: pointAwardDescription } : undefined), (pointAwardRecipient !== undefined) ? { recipient: pointAwardRecipient } : undefined
-        // ...(typeof pointAwardPurposeIdentifier === 'string') ? { purpose: { identifier: pointAwardPurposeIdentifier } } : undefined
-        );
+            },
+            typeOf: factory.actionType.MoneyTransfer,
+            ...(typeof pointAwardDescription === 'string') ? { description: pointAwardDescription } : undefined,
+            ...(pointAwardRecipient !== undefined) ? { recipient: pointAwardRecipient } : undefined
+            // ...(typeof pointAwardPurposeIdentifier === 'string') ? { purpose: { identifier: pointAwardPurposeIdentifier } } : undefined
+        };
     }
     return pointAward;
 }