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

package/lib/chevre/service/assetTransaction/reserve/validateStartRequest/validateIssuedOfferIfExists.js

@@ -1,59 +1,47 @@
 "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.validateIssuedOfferIfExists = validateIssuedOfferIfExists;
 const jwt = require("jsonwebtoken");
 const moment = require("moment");
 const factory = require("../../../../factory");
 const NUM_ACCEPTED_OFFERS_MAX_VALUE = 50;
-function verifyOfferToken(params) {
-    return __awaiter(this, void 0, void 0, function* () {
-        let result;
-        const { issuer, secret, token } = params;
-        try {
-            result = yield new Promise((resolve, reject) => {
-                jwt.verify(token, secret, {
-                    algorithms: ['HS256'],
-                    issuer
-                    // ...(Array.isArray(params.audience)) ? { audience: params.audience } : undefined
-                }, (err, decoded) => {
-                    if (err instanceof Error) {
-                        reject(err);
-                    }
-                    else {
-                        resolve(decoded);
-                    }
-                });
+async function verifyOfferToken(params) {
+    let result;
+    const { issuer, secret, token } = params;
+    try {
+        result = await new Promise((resolve, reject) => {
+            jwt.verify(token, secret, {
+                algorithms: ['HS256'],
+                issuer
+                // ...(Array.isArray(params.audience)) ? { audience: params.audience } : undefined
+            }, (err, decoded) => {
+                if (err instanceof Error) {
+                    reject(err);
+                }
+                else {
+                    resolve(decoded);
+                }
             });
-        }
-        catch (error) {
-            // JWTエラーをハンドリング
-            if (error instanceof jwt.TokenExpiredError) {
-                throw new factory.errors.Argument('ticketedOffer.token', `invalid token. [${error.message} expiredAt:${error.expiredAt}]`);
-            }
-            else if (error instanceof jwt.JsonWebTokenError) {
-                throw new factory.errors.Argument('ticketedOffer.token', `invalid token. [${error.message}]`);
-            }
-            throw error;
-        }
-        return result;
-    });
+        });
+    }
+    catch (error) {
+        // JWTエラーをハンドリング
+        if (error instanceof jwt.TokenExpiredError) {
+            throw new factory.errors.Argument('ticketedOffer.token', `invalid token. [${error.message} expiredAt:${error.expiredAt}]`);
+        }
+        else if (error instanceof jwt.JsonWebTokenError) {
+            throw new factory.errors.Argument('ticketedOffer.token', `invalid token. [${error.message}]`);
+        }
+        throw error;
+    }
+    return result;
 }
 const OFFER_TOKEN_DATE_FORMAT = 'YYYY-MM-DDTHH:mm:ssZ';
 function validateOfferToken(params) {
-    return () => __awaiter(this, void 0, void 0, function* () {
-        var _a, _b;
+    return async () => {
         const { event, acceptedDate, verifiedOffer, eventOffer, numAcceptedOffers } = params;
         // イベントID一致検証
-        const itemOfferedId = (_a = verifiedOffer.itemOffered) === null || _a === void 0 ? void 0 : _a.id;
+        const itemOfferedId = verifiedOffer.itemOffered?.id;
         if (typeof itemOfferedId !== 'string' || itemOfferedId === '') {
             throw new factory.errors.Argument('ticketedOffer.token', 'itemOffered.id must be string');
         }
@@ -94,7 +82,7 @@ function validateOfferToken(params) {
             throw new factory.errors.Argument('ticketedOffer.token', `the offer id valid through ${validThroughMoment}`);
         }
         // maxValueを検証
-        const maxValue = (_b = verifiedOffer === null || verifiedOffer === void 0 ? void 0 : verifiedOffer.eligibleQuantity) === null || _b === void 0 ? void 0 : _b.maxValue;
+        const maxValue = verifiedOffer?.eligibleQuantity?.maxValue;
         if (typeof maxValue !== 'number') {
             throw new factory.errors.Argument('ticketedOffer.token', 'eligibleQuantity.maxValue must be number');
         }
@@ -107,21 +95,20 @@ function validateOfferToken(params) {
                 throw new factory.errors.Argument('reservationFor.id', `Maximum number of offers exceeded`);
             }
         }
-    });
+    };
 }
 /**
  * オファートークン検証(2025-10-21~)
  */
 function validateIssuedOfferIfExists(params) {
-    return (repos) => __awaiter(this, void 0, void 0, function* () {
-        var _a, _b, _c;
+    return async (repos) => {
         const { event, eventOffer, numAcceptedOffers } = params;
         const acceptedDate = moment(params.now);
-        const offerTokenIssuer = (_a = eventOffer.offeredBy) === null || _a === void 0 ? void 0 : _a.identifier;
+        const offerTokenIssuer = eventOffer.offeredBy?.identifier;
         const offerTokenRequired = typeof offerTokenIssuer === 'string';
         if (offerTokenRequired) {
-            const offerIdMustBe = (_b = params.acceptedEventOffer) === null || _b === void 0 ? void 0 : _b.id;
-            const offerToken = (_c = params.acceptedEventOffer) === null || _c === void 0 ? void 0 : _c.token;
+            const offerIdMustBe = params.acceptedEventOffer?.id;
+            const offerToken = params.acceptedEventOffer?.token;
             if (typeof offerIdMustBe !== 'string' || offerIdMustBe === '') {
                 throw new factory.errors.NotFound('ticketedOffer.id');
             }
@@ -135,19 +122,19 @@ function validateIssuedOfferIfExists(params) {
             if (eventOffer.id !== offerIdMustBe) {
                 throw new factory.errors.Argument('object.reservationFor.offers.identifier', 'eventOffer.identifier not matched');
             }
-            const issuer = yield repos.issuer.findByIdentifier({
+            const issuer = await repos.issuer.findByIdentifier({
                 project: { id: event.project.id },
                 identifier: offerTokenIssuer
             });
             if (typeof issuer.tokenSecret !== 'string' || issuer.tokenSecret === '') {
                 throw new factory.errors.NotFound('issuer.tokenSecret');
             }
-            const verifiedOffer = yield verifyOfferToken({
+            const verifiedOffer = await verifyOfferToken({
                 secret: issuer.tokenSecret,
                 issuer: issuer.url,
                 token: offerToken
             });
-            yield validateOfferToken({
+            await validateOfferToken({
                 event,
                 acceptedDate,
                 verifiedOffer,
@@ -155,5 +142,5 @@ function validateIssuedOfferIfExists(params) {
                 numAcceptedOffers
             })();
         }
-    });
+    };
 }

package/lib/chevre/service/assetTransaction/reserve/validateStartRequest/validateMemberTierIfExists.js

@@ -1,24 +1,14 @@
 "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.validateMemberTierIfExists = validateMemberTierIfExists;
 const jwt = require("jsonwebtoken");
 const moment = require("moment");
 const factory = require("../../../../factory");
 function validateMemberTier(params) {
-    return (repos) => __awaiter(this, void 0, void 0, function* () {
-        var _a, _b, _c, _d, _e;
+    return async (repos) => {
         const { acceptedDate, event, verifiedValidForMemberTier, memberProgramIdentifierMustBe, aggregateOfferIdentifier } = params;
-        const tierIdentifier = (_b = (_a = verifiedValidForMemberTier.member) === null || _a === void 0 ? void 0 : _a.memberOf) === null || _b === void 0 ? void 0 : _b.identifier;
-        const memberProgramIdentifier = (_e = (_d = (_c = verifiedValidForMemberTier.member) === null || _c === void 0 ? void 0 : _c.memberOf) === null || _d === void 0 ? void 0 : _d.isTierOf) === null || _e === void 0 ? void 0 : _e.identifier;
+        const tierIdentifier = verifiedValidForMemberTier.member?.memberOf?.identifier;
+        const memberProgramIdentifier = verifiedValidForMemberTier.member?.memberOf?.isTierOf?.identifier;
         if (typeof tierIdentifier !== 'string') {
             throw new factory.errors.Argument('ticketedOffer.validForMemberTier', 'tier identifier must be string');
         }
@@ -33,7 +23,7 @@ function validateMemberTier(params) {
             throw new factory.errors.NotFound('event.offers.seller.id');
         }
         // 有効なプロダクトオファーを検証
-        const productOfferForMemberTier = (yield repos.productOffer.findProductOffers({
+        const productOfferForMemberTier = (await repos.productOffer.findProductOffers({
             limit: 1,
             page: 1,
             project: { id: { $eq: event.project.id } },
@@ -47,55 +37,51 @@ function validateMemberTier(params) {
         if (productOfferForMemberTier === undefined) {
             throw new factory.errors.NotFound(factory.offerType.Offer, 'valid product offers for member tier not found');
         }
-    });
+    };
 }
-function verifyMemberTierToken(params) {
-    return __awaiter(this, void 0, void 0, function* () {
-        let result;
-        const { issuer, secret, token } = params;
-        try {
-            result = yield new Promise((resolve, reject) => {
-                jwt.verify(token, secret, {
-                    algorithms: ['HS256'],
-                    issuer
-                    // ...(Array.isArray(params.audience)) ? { audience: params.audience } : undefined
-                }, (err, decoded) => {
-                    if (err instanceof Error) {
-                        reject(err);
-                    }
-                    else {
-                        resolve(decoded);
-                    }
-                });
+async function verifyMemberTierToken(params) {
+    let result;
+    const { issuer, secret, token } = params;
+    try {
+        result = await new Promise((resolve, reject) => {
+            jwt.verify(token, secret, {
+                algorithms: ['HS256'],
+                issuer
+                // ...(Array.isArray(params.audience)) ? { audience: params.audience } : undefined
+            }, (err, decoded) => {
+                if (err instanceof Error) {
+                    reject(err);
+                }
+                else {
+                    resolve(decoded);
+                }
             });
+        });
+    }
+    catch (error) {
+        // JWTエラーをハンドリング
+        if (error instanceof jwt.TokenExpiredError) {
+            throw new factory.errors.Argument('ticketedOffer.validForMemberTier', `invalid token. [${error.message} expiredAt:${error.expiredAt}]`);
         }
-        catch (error) {
-            // JWTエラーをハンドリング
-            if (error instanceof jwt.TokenExpiredError) {
-                throw new factory.errors.Argument('ticketedOffer.validForMemberTier', `invalid token. [${error.message} expiredAt:${error.expiredAt}]`);
-            }
-            else if (error instanceof jwt.JsonWebTokenError) {
-                throw new factory.errors.Argument('ticketedOffer.validForMemberTier', `invalid token. [${error.message}]`);
-            }
-            throw error;
+        else if (error instanceof jwt.JsonWebTokenError) {
+            throw new factory.errors.Argument('ticketedOffer.validForMemberTier', `invalid token. [${error.message}]`);
         }
-        return result;
-    });
+        throw error;
+    }
+    return result;
 }
 function validateMemberTierIfExists(params) {
-    // tslint:disable-next-line:cyclomatic-complexity max-func-body-length
-    return (repos) => __awaiter(this, void 0, void 0, function* () {
-        var _a, _b, _c;
+    return async (repos) => {
         const { event, makesOfferOnApplication } = params;
         const acceptedDate = moment(params.now);
         const eventOffers = event.offers;
         // 有効メンバープログラムティアが存在する場合
         // support validForMemberTier(2025-05-14~)
-        const validForMemberTierExists = ((_a = makesOfferOnApplication.validForMemberTier) === null || _a === void 0 ? void 0 : _a.typeOf) === 'MemberProgramTier';
+        const validForMemberTierExists = makesOfferOnApplication.validForMemberTier?.typeOf === 'MemberProgramTier';
         if (validForMemberTierExists) {
-            const tokenizedMemberProgramTier = (_b = params.acceptedEventOffer) === null || _b === void 0 ? void 0 : _b.validForMemberTier;
-            const validForMemberTierToken = tokenizedMemberProgramTier === null || tokenizedMemberProgramTier === void 0 ? void 0 : tokenizedMemberProgramTier.token;
-            const memberProgramIdentifierMustBe = (_c = tokenizedMemberProgramTier === null || tokenizedMemberProgramTier === void 0 ? void 0 : tokenizedMemberProgramTier.isTierOf) === null || _c === void 0 ? void 0 : _c.identifier;
+            const tokenizedMemberProgramTier = params.acceptedEventOffer?.validForMemberTier;
+            const validForMemberTierToken = tokenizedMemberProgramTier?.token;
+            const memberProgramIdentifierMustBe = tokenizedMemberProgramTier?.isTierOf?.identifier;
             // ティアトークンが必須
             if (typeof validForMemberTierToken !== 'string' || validForMemberTierToken === '') {
                 throw new factory.errors.ArgumentNull('ticketedOffer.validForMemberTier.token');
@@ -110,7 +96,7 @@ function validateMemberTierIfExists(params) {
                 throw new factory.errors.NotFound('makesOfferOnApplication.identifier');
             }
             // トークン検証
-            const memberProgram = (yield repos.memberProgram.projectMemberPrograms({
+            const memberProgram = (await repos.memberProgram.projectMemberPrograms({
                 limit: 1,
                 page: 1,
                 project: { id: { $eq: params.event.project.id } },
@@ -119,22 +105,22 @@ function validateMemberTierIfExists(params) {
             if (memberProgram === undefined) {
                 throw new factory.errors.NotFound('MemberProgram', `MemberProgram '${memberProgramIdentifierMustBe}' not found`);
             }
-            const issuer = yield repos.issuer.findByIdentifier({
+            const issuer = await repos.issuer.findByIdentifier({
                 project: { id: params.event.project.id },
                 identifier: memberProgram.hostingOrganization.identifier
             });
             if (typeof issuer.tokenSecret !== 'string' || issuer.tokenSecret === '') {
                 throw new factory.errors.NotFound('issuer.tokenSecret');
             }
-            const verifiedValidForMemberTier = yield verifyMemberTierToken({
+            const verifiedValidForMemberTier = await verifyMemberTierToken({
                 secret: issuer.tokenSecret,
                 issuer: issuer.url,
                 token: validForMemberTierToken
             });
-            yield validateMemberTier({
+            await validateMemberTier({
                 event, acceptedDate, verifiedValidForMemberTier,
                 memberProgramIdentifierMustBe, aggregateOfferIdentifier
             })(repos);
         }
-    });
+    };
 }

package/lib/chevre/service/assetTransaction/reserve/validateStartRequest/verifyTicketTokenAsNeeded.js

@@ -1,31 +1,19 @@
 "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.verifyTicketTokenAsNeeded = verifyTicketTokenAsNeeded;
 const factory = require("../../../../factory");
-// tslint:disable-next-line:max-func-body-length
 function verifyTicketTokenAsNeeded(params) {
-    // tslint:disable-next-line:cyclomatic-complexity
-    return (repos) => __awaiter(this, void 0, void 0, function* () {
-        var _a, _b, _c;
+    return async (repos) => {
         const { instrument, event } = params;
         let acceptedEventOffer;
         // 興行オファーチケットが指定された場合、オファーへ変換する
-        const ticketToken = (_a = instrument.find((eachInstrument) => eachInstrument.typeOf === 'Ticket')) === null || _a === void 0 ? void 0 : _a.ticketToken;
+        const ticketToken = instrument.find((eachInstrument) => eachInstrument.typeOf === 'Ticket')?.ticketToken;
         if (typeof ticketToken === 'string' && ticketToken !== '') {
-            const placeOrderIdByInstrument = (_b = instrument.find((eachInstrument) => eachInstrument.typeOf === factory.transactionType.PlaceOrder)) === null || _b === void 0 ? void 0 : _b.id;
+            const placeOrderIdByInstrument = instrument.find((eachInstrument) => eachInstrument.typeOf === factory.transactionType.PlaceOrder)?.id;
             if (typeof placeOrderIdByInstrument !== 'string' || placeOrderIdByInstrument === '') {
                 throw new factory.errors.NotFound('instrument as placeOrder');
             }
-            const ticket = (yield repos.ticket.findTickets({
+            const ticket = (await repos.ticket.findTickets({
                 limit: 1,
                 page: 1,
                 project: { id: { $eq: event.project.id } },
@@ -35,13 +23,13 @@ function verifyTicketTokenAsNeeded(params) {
                 throw new factory.errors.NotFound('Ticket');
             }
             // 承認を参照
-            const validAuthorization = yield repos.authorization.findValidOneByCode({
+            const validAuthorization = await repos.authorization.findValidOneByCode({
                 project: { id: event.project.id },
                 code: ticket.ticketToken
             });
             const authorizedObject = validAuthorization.object;
             // audience検証
-            if (((_c = validAuthorization.audience) === null || _c === void 0 ? void 0 : _c.typeOf) !== factory.transactionType.PlaceOrder
+            if (validAuthorization.audience?.typeOf !== factory.transactionType.PlaceOrder
                 || validAuthorization.audience.id !== placeOrderIdByInstrument) {
                 throw new factory.errors.Argument('ticketToken', 'audience not matched with placeOrder');
             }
@@ -58,5 +46,5 @@ function verifyTicketTokenAsNeeded(params) {
             }
         }
         return { acceptedEventOffer };
-    });
+    };
 }

package/lib/chevre/service/assetTransaction/reserve/validateStartRequest.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.validateStartRequest = validateStartRequest;
 exports.validEventOfferByApplicationExists = validEventOfferByApplicationExists;
@@ -18,23 +9,22 @@ const validateIssuedOfferIfExists_1 = require("./validateStartRequest/validateIs
 const validateMemberTierIfExists_1 = require("./validateStartRequest/validateMemberTierIfExists");
 const verifyTicketTokenAsNeeded_1 = require("./validateStartRequest/verifyTicketTokenAsNeeded");
 function validateStartRequest(params) {
-    return (repos) => __awaiter(this, void 0, void 0, function* () {
-        var _a;
+    return async (repos) => {
         const now = params.now;
         const event = params.event;
         if (params.validateEventOfferPeriod === true) {
-            if (typeof ((_a = params.store) === null || _a === void 0 ? void 0 : _a.id) !== 'string') {
+            if (typeof params.store?.id !== 'string') {
                 throw new factory.errors.NotFound('store.id');
             }
             // ticketTokenから、acceptedEventOfferを生成(2025-11-18~)
-            const { acceptedEventOffer } = yield (0, verifyTicketTokenAsNeeded_1.verifyTicketTokenAsNeeded)({
+            const { acceptedEventOffer } = await (0, verifyTicketTokenAsNeeded_1.verifyTicketTokenAsNeeded)({
                 event,
                 now,
                 availableAt: { id: params.store.id },
                 object: params.object,
                 instrument: params.instrument
             })(repos);
-            yield validEventOfferByApplicationExists({
+            await validEventOfferByApplicationExists({
                 event,
                 now,
                 availableAt: { id: params.store.id },
@@ -45,22 +35,21 @@ function validateStartRequest(params) {
         if (params.validateEvent === true) {
             validateEvent({ event, object: params.object });
         }
-    });
+    };
 }
 /**
  * アプリケーションに対して有効なイベントオファーが存在するかどうかを検証する
  */
 function validEventOfferByApplicationExists(params) {
-    return (repos) => __awaiter(this, void 0, void 0, function* () {
+    return async (repos) => {
         const { event, availableAt, acceptedEventOffer, numAcceptedOffers } = params;
         const acceptedDate = moment(params.now);
         const eventOffers = event.offers;
         // アプリケーションごとの設定を参照する(2022-11-19~)
-        const makesOfferOnApplication = eventOffers === null || eventOffers === void 0 ? void 0 : eventOffers.seller.makesOffer.find((offer) => {
-            var _a, _b;
+        const makesOfferOnApplication = eventOffers?.seller.makesOffer.find((offer) => {
             // support non-array(2024-10-11~)
-            return (Array.isArray(offer.availableAtOrFrom) && ((_a = offer.availableAtOrFrom.at(0)) === null || _a === void 0 ? void 0 : _a.id) === availableAt.id)
-                || (!Array.isArray(offer.availableAtOrFrom) && ((_b = offer.availableAtOrFrom) === null || _b === void 0 ? void 0 : _b.id) === availableAt.id);
+            return (Array.isArray(offer.availableAtOrFrom) && offer.availableAtOrFrom.at(0)?.id === availableAt.id)
+                || (!Array.isArray(offer.availableAtOrFrom) && offer.availableAtOrFrom?.id === availableAt.id);
         });
         if (makesOfferOnApplication === undefined) {
             throw new factory.errors.Argument('reservationFor.id', `seller makes no available offer at ${availableAt.id}`);
@@ -81,9 +70,9 @@ function validEventOfferByApplicationExists(params) {
         }
         // support extensibleEventOffer(2025-11-11~)
         if (eventOffers.typeOf === factory.offerType.AggregateOffer) {
-            const existingEventOffer = yield (0, fixExtendedEventOffer_1.fixExtendedEventOffer)(params)(repos);
+            const existingEventOffer = await (0, fixExtendedEventOffer_1.fixExtendedEventOffer)(params)(repos);
             // 拡張可能なオファー設定の場合のみ、オファートークンを検証する(2025-11-11~)
-            yield (0, validateIssuedOfferIfExists_1.validateIssuedOfferIfExists)({
+            await (0, validateIssuedOfferIfExists_1.validateIssuedOfferIfExists)({
                 event,
                 now: params.now,
                 eventOffer: existingEventOffer,
@@ -94,20 +83,19 @@ function validEventOfferByApplicationExists(params) {
         else {
             // 拡張可能なオファーに場合に、有効メンバープログラムティア設定は存在しない前提
             // 有効メンバープログラムティアが存在する場合
-            yield (0, validateMemberTierIfExists_1.validateMemberTierIfExists)({
+            await (0, validateMemberTierIfExists_1.validateMemberTierIfExists)({
                 event,
                 now: params.now,
                 makesOfferOnApplication,
                 acceptedEventOffer
             })(repos);
         }
-    });
+    };
 }
 /**
  * イベントの上限座席数を検証する
  */
 function validateEvent(params) {
-    var _a, _b;
     // const acceptedDate = moment(params.now);
     const eventOffers = params.event.offers;
     // const validFrom = eventOffers?.validFrom;
@@ -129,9 +117,9 @@ function validateEvent(params) {
     //     }
     // }
     // イベントのmaxValueを検証
-    const maxValue = (_a = eventOffers === null || eventOffers === void 0 ? void 0 : eventOffers.eligibleQuantity) === null || _a === void 0 ? void 0 : _a.maxValue;
+    const maxValue = eventOffers?.eligibleQuantity?.maxValue;
     if (typeof maxValue === 'number') {
-        const numAcceptedOffers = (_b = params.object.acceptedOffer) === null || _b === void 0 ? void 0 : _b.length;
+        const numAcceptedOffers = params.object.acceptedOffer?.length;
         if (typeof numAcceptedOffers === 'number' && numAcceptedOffers > 0) {
             if (numAcceptedOffers > maxValue) {
                 throw new factory.errors.Argument('reservationFor.id', `Maximum number of offers exceeded`);

package/lib/chevre/service/assetTransaction/reserveCOA/cancel.js

@@ -1,25 +1,16 @@
 "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.cancel = cancel;
 exports.cancelByAcceptAction = cancelByAcceptAction;
 const factory = require("../../../factory");
 const cancelReservation_1 = require("../../reserveCOA/cancelReservation");
 function cancel(params, options) {
-    return (repos) => __awaiter(this, void 0, void 0, function* () {
+    return async (repos) => {
         // object.pendingTransactionに連携内容情報が記録されているので、その情報を元に仮予約を取り消す
         let delTmpReserveParams;
         // objectに進行中取引情報があれば利用する(2023-09-11~)
         const pendingTransaction = params.action.object.pendingTransaction;
-        if (typeof (pendingTransaction === null || pendingTransaction === void 0 ? void 0 : pendingTransaction.typeOf) === 'string') {
+        if (typeof pendingTransaction?.typeOf === 'string') {
             delTmpReserveParams = {
                 theaterCode: pendingTransaction.theaterCode,
                 dateJouei: pendingTransaction.dateJouei,
@@ -31,7 +22,12 @@ function cancel(params, options) {
         }
         if (delTmpReserveParams !== undefined) {
             const { asyncCancelPendingReservation } = options;
-            const object = Object.assign(Object.assign({}, delTmpReserveParams), { reservationStatus: factory.reservationStatusType.ReservationPending, transactionNumber: delTmpReserveParams.tmpReserveNum, typeOf: factory.assetTransactionType.COAReserveTransaction });
+            const object = {
+                ...delTmpReserveParams,
+                reservationStatus: factory.reservationStatusType.ReservationPending,
+                transactionNumber: delTmpReserveParams.tmpReserveNum,
+                typeOf: factory.assetTransactionType.COAReserveTransaction
+            };
             const instrument = [params.action.purpose];
             if (asyncCancelPendingReservation) {
                 // support async(2025-03-03~)
@@ -46,30 +42,29 @@ function cancel(params, options) {
                     executionResults: [],
                     data
                 };
-                yield repos.task.saveMany([cancelPendingReservationTask], { emitImmediately: true });
+                await repos.task.saveMany([cancelPendingReservationTask], { emitImmediately: true });
             }
             else {
-                yield (0, cancelReservation_1.cancelPendingReservation)({
+                await (0, cancelReservation_1.cancelPendingReservation)({
                     project: { id: params.action.project.id },
                     object,
                     instrument
                 })(repos);
             }
         }
-    });
+    };
 }
 function cancelByAcceptAction(params, options) {
-    return (repos) => __awaiter(this, void 0, void 0, function* () {
-        var _a, _b, _c, _d, _e, _f;
-        const recipe = yield repos.action.findRecipeByAction({
+    return async (repos) => {
+        const recipe = await repos.action.findRecipeByAction({
             project: { id: params.action.project.id },
             recipeFor: { id: params.action.id }
         });
         if (recipe !== null) {
             let delTmpReserveParams;
             // recipeから連携情報取得に変更(2024-06-11~)
-            const coaRequestBody = (_c = (_b = (_a = recipe.step[0]) === null || _a === void 0 ? void 0 : _a.itemListElement[0]) === null || _b === void 0 ? void 0 : _b.itemListElement[0]) === null || _c === void 0 ? void 0 : _c.beforeMedia;
-            const coaResponseBody = (_f = (_e = (_d = recipe.step[0]) === null || _d === void 0 ? void 0 : _d.itemListElement[0]) === null || _e === void 0 ? void 0 : _e.itemListElement[0]) === null || _f === void 0 ? void 0 : _f.afterMedia;
+            const coaRequestBody = recipe.step[0]?.itemListElement[0]?.itemListElement[0]?.beforeMedia;
+            const coaResponseBody = recipe.step[0]?.itemListElement[0]?.itemListElement[0]?.afterMedia;
             if (coaRequestBody !== undefined && coaResponseBody !== undefined) {
                 delTmpReserveParams = {
                     theaterCode: coaRequestBody.theaterCode,
@@ -82,7 +77,12 @@ function cancelByAcceptAction(params, options) {
             }
             if (delTmpReserveParams !== undefined) {
                 const { asyncCancelPendingReservation } = options;
-                const object = Object.assign(Object.assign({}, delTmpReserveParams), { reservationStatus: factory.reservationStatusType.ReservationPending, transactionNumber: delTmpReserveParams.tmpReserveNum, typeOf: factory.assetTransactionType.COAReserveTransaction });
+                const object = {
+                    ...delTmpReserveParams,
+                    reservationStatus: factory.reservationStatusType.ReservationPending,
+                    transactionNumber: delTmpReserveParams.tmpReserveNum,
+                    typeOf: factory.assetTransactionType.COAReserveTransaction
+                };
                 const instrument = [params.action.purpose];
                 if (asyncCancelPendingReservation) {
                     // support async(2025-03-03~)
@@ -97,10 +97,10 @@ function cancelByAcceptAction(params, options) {
                         executionResults: [],
                         data
                     };
-                    yield repos.task.saveMany([cancelPendingReservationTask], { emitImmediately: true });
+                    await repos.task.saveMany([cancelPendingReservationTask], { emitImmediately: true });
                 }
                 else {
-                    yield (0, cancelReservation_1.cancelPendingReservation)({
+                    await (0, cancelReservation_1.cancelPendingReservation)({
                         project: { id: params.action.project.id },
                         object,
                         instrument
@@ -108,5 +108,5 @@ function cancelByAcceptAction(params, options) {
                 }
             }
         }
-    });
+    };
 }

package/lib/chevre/service/assetTransaction/reserveCOA/factory.js

@@ -15,14 +15,22 @@ function processConfirmCOAReserveResult2recipe(params) {
                     {
                         typeOf: 'HowToStep',
                         identifier: factory.recipe.StepIdentifier.stateReserve,
-                        itemListElement: [Object.assign(Object.assign({ typeOf: 'HowToDirection' }, (stateReserveArgs !== undefined) ? { beforeMedia: stateReserveArgs } : undefined), (stateReserveResult !== undefined && stateReserveResult !== null)
-                                ? { afterMedia: stateReserveResult }
-                                : undefined)]
+                        itemListElement: [{
+                                typeOf: 'HowToDirection',
+                                ...(stateReserveArgs !== undefined) ? { beforeMedia: stateReserveArgs } : undefined,
+                                ...(stateReserveResult !== undefined && stateReserveResult !== null)
+                                    ? { afterMedia: stateReserveResult }
+                                    : undefined
+                            }]
                     },
                     {
                         typeOf: 'HowToStep',
                         identifier: factory.recipe.StepIdentifier.updReserve,
-                        itemListElement: [Object.assign(Object.assign({ typeOf: 'HowToDirection' }, (updReserveArgs !== undefined) ? { beforeMedia: updReserveArgs } : undefined), (updReserveResult !== undefined) ? { afterMedia: updReserveResult } : undefined)]
+                        itemListElement: [{
+                                typeOf: 'HowToDirection',
+                                ...(updReserveArgs !== undefined) ? { beforeMedia: updReserveArgs } : undefined,
+                                ...(updReserveResult !== undefined) ? { afterMedia: updReserveResult } : undefined
+                            }]
                     }
                 ]
             }]