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

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

@@ -12,23 +12,21 @@ const factory = require("../../../../../factory");
 const price_1 = require("./price");
 const debug = createDebug('chevre-domain:service:assetTransaction');
 function createTicketIdentifier(params) {
-    var _a, _b, _c, _d;
     // チケット識別子の規定値を作成
-    let ticketIdentifier = (typeof ((_a = params.ticketedSeat) === null || _a === void 0 ? void 0 : _a.seatNumber) === 'string')
+    let ticketIdentifier = (typeof params.ticketedSeat?.seatNumber === 'string')
         ? util.format('%s:%s:%s', params.reservationFor.id, params.ticketedSeat.seatSection, params.ticketedSeat.seatNumber)
         : util.format('%s:%s', params.reservationFor.id, params.id);
     // 指定があれば採用
-    const ticketIdentifierByRequest = (_d = (_c = (_b = params.acceptedOffer.itemOffered) === null || _b === void 0 ? void 0 : _b.serviceOutput) === null || _c === void 0 ? void 0 : _c.reservedTicket) === null || _d === void 0 ? void 0 : _d.identifier;
+    const ticketIdentifierByRequest = params.acceptedOffer.itemOffered?.serviceOutput?.reservedTicket?.identifier;
     if (typeof ticketIdentifierByRequest === 'string' && ticketIdentifierByRequest.length > 0) {
         ticketIdentifier = ticketIdentifierByRequest;
     }
     return ticketIdentifier;
 }
 function createReservedTicket(params) {
-    var _a, _b, _c;
     let acceptedTicketedSeat;
-    const acceptedTicketedSeatByItemOffered = (_c = (_b = (_a = params.acceptedOffer.itemOffered) === null || _a === void 0 ? void 0 : _a.serviceOutput) === null || _b === void 0 ? void 0 : _b.reservedTicket) === null || _c === void 0 ? void 0 : _c.ticketedSeat;
-    const acceptedTicketedSeatNumber = acceptedTicketedSeatByItemOffered === null || acceptedTicketedSeatByItemOffered === void 0 ? void 0 : acceptedTicketedSeatByItemOffered.seatNumber;
+    const acceptedTicketedSeatByItemOffered = params.acceptedOffer.itemOffered?.serviceOutput?.reservedTicket?.ticketedSeat;
+    const acceptedTicketedSeatNumber = acceptedTicketedSeatByItemOffered?.seatNumber;
     if (typeof acceptedTicketedSeatNumber === 'string') {
         acceptedTicketedSeat = acceptedTicketedSeatByItemOffered;
     }
@@ -50,7 +48,7 @@ function createReservedTicket(params) {
             seat = screeningRoomSection.containsPlace.find((p) => p.branchCode === seatNumber);
         }
         if (Array.isArray(params.availableSeatOffers)) {
-            seat = params.availableSeatOffers.find((o) => { var _a; return o.branchCode === seatNumber && ((_a = o.containedInPlace) === null || _a === void 0 ? void 0 : _a.branchCode) === seatSection; });
+            seat = params.availableSeatOffers.find((o) => o.branchCode === seatNumber && o.containedInPlace?.branchCode === seatSection);
         }
         if (seat === undefined) {
             throw new factory.errors.NotFound(factory.placeType.Seat, `${factory.placeType.Seat} ${seatNumber} not found`);
@@ -76,7 +74,13 @@ function createReservedTicket(params) {
             seatingType = [seatingType];
         }
         // 最適化する(2021-10-19～)
-        ticketedSeat = Object.assign({ typeOf: factory.placeType.Seat, seatNumber, seatRow: '', seatSection }, (Array.isArray(seatingType)) ? { seatingType } : undefined);
+        ticketedSeat = {
+            typeOf: factory.placeType.Seat,
+            seatNumber,
+            seatRow: '',
+            seatSection,
+            ...(Array.isArray(seatingType)) ? { seatingType } : undefined
+        };
     }
     const ticketType = createTicketType({ availableOffer: params.availableOffer });
     const issuedBy = createIssuedBy({ acceptedOffer: params.acceptedOffer, availableOffer: params.availableOffer });
@@ -86,33 +90,44 @@ function createReservedTicket(params) {
         reservationFor: params.reservationFor,
         ticketedSeat
     });
-    return Object.assign({ 
+    return {
         // dateIssued: params.dateIssued, // discontinue(2024-12-03~)
-        identifier: ticketIdentifier, issuedBy,
-        ticketType, typeOf: 'Ticket' }, (ticketedSeat !== undefined) ? { ticketedSeat } : {});
+        identifier: ticketIdentifier,
+        issuedBy,
+        ticketType,
+        typeOf: 'Ticket',
+        ...(ticketedSeat !== undefined) ? { ticketedSeat } : {}
+    };
 }
 /**
  * 予約に最適化された単価オファーを作成する
  */
 function createTicketType(params) {
-    var _a;
     const availableOffer = params.availableOffer;
-    return Object.assign(Object.assign(Object.assign(Object.assign({ description: availableOffer.description, id: availableOffer.id, identifier: availableOffer.identifier, name: availableOffer.name, 
+    return {
+        description: availableOffer.description,
+        id: availableOffer.id,
+        identifier: availableOffer.identifier,
+        name: availableOffer.name,
         // 不要なので廃止(2022-12-17~)
         // priceCurrency: availableOffer.priceCurrency,
         // priceSpecificationを最適化(accounting不要)
         // accounting: { typeOf: "Accounting", … }
         // 不要なので廃止(2022-12-17~)
         // project: availableOffer.project,
-        typeOf: availableOffer.typeOf }, (Array.isArray(availableOffer.additionalProperty)) ? { additionalProperty: availableOffer.additionalProperty } : undefined), (typeof ((_a = availableOffer.category) === null || _a === void 0 ? void 0 : _a.codeValue) === 'string') ? { category: availableOffer.category } : undefined), (typeof availableOffer.color === 'string') ? { color: availableOffer.color } : undefined), (availableOffer.validRateLimit !== undefined) ? { validRateLimit: availableOffer.validRateLimit } : undefined);
+        typeOf: availableOffer.typeOf,
+        ...(Array.isArray(availableOffer.additionalProperty)) ? { additionalProperty: availableOffer.additionalProperty } : undefined,
+        ...(typeof availableOffer.category?.codeValue === 'string') ? { category: availableOffer.category } : undefined,
+        ...(typeof availableOffer.color === 'string') ? { color: availableOffer.color } : undefined,
+        ...(availableOffer.validRateLimit !== undefined) ? { validRateLimit: availableOffer.validRateLimit } : undefined
+    };
 }
 function createIssuedBy(params) {
-    var _a, _b, _c, _d, _e, _f, _g, _h;
-    let typeOf = (_d = (_c = (_b = (_a = params.acceptedOffer.itemOffered) === null || _a === void 0 ? void 0 : _a.serviceOutput) === null || _b === void 0 ? void 0 : _b.reservedTicket) === null || _c === void 0 ? void 0 : _c.issuedBy) === null || _d === void 0 ? void 0 : _d.typeOf;
+    let typeOf = params.acceptedOffer.itemOffered?.serviceOutput?.reservedTicket?.issuedBy?.typeOf;
     if (typeof typeOf !== 'string') {
         typeOf = params.availableOffer.project.typeOf;
     }
-    let name = (_h = (_g = (_f = (_e = params.acceptedOffer.itemOffered) === null || _e === void 0 ? void 0 : _e.serviceOutput) === null || _f === void 0 ? void 0 : _f.reservedTicket) === null || _g === void 0 ? void 0 : _g.issuedBy) === null || _h === void 0 ? void 0 : _h.name;
+    let name = params.acceptedOffer.itemOffered?.serviceOutput?.reservedTicket?.issuedBy?.name;
     if (typeof name !== 'string') {
         name = params.availableOffer.project.id;
     }
@@ -149,11 +164,10 @@ function validateEligibleSeatingType(params) {
     }
 }
 function validateEligibleSubReservation(params) {
-    var _a, _b;
     const eligibleSubReservations = params.availableOffer.eligibleSubReservation;
     // サブ予約条件が存在すればacceptedOfferが適切かどうか確認する
     if (Array.isArray(eligibleSubReservations)) {
-        const subReservations = (_b = (_a = params.acceptedOffer.itemOffered) === null || _a === void 0 ? void 0 : _a.serviceOutput) === null || _b === void 0 ? void 0 : _b.subReservation;
+        const subReservations = params.acceptedOffer.itemOffered?.serviceOutput?.subReservation;
         if (!Array.isArray(subReservations)) {
             throw new factory.errors.ArgumentNull('subReservation');
         }
@@ -161,8 +175,7 @@ function validateEligibleSubReservation(params) {
         const screeningRoomSection = params.screeningRoomSection;
         if (screeningRoomSection !== undefined) {
             seats4subReservation = subReservations.map((subReservation) => {
-                var _a, _b;
-                const seatNumber4subReservation = (_b = (_a = subReservation.reservedTicket) === null || _a === void 0 ? void 0 : _a.ticketedSeat) === null || _b === void 0 ? void 0 : _b.seatNumber;
+                const seatNumber4subReservation = subReservation.reservedTicket?.ticketedSeat?.seatNumber;
                 const seat4subReservation = screeningRoomSection.containsPlace.find((p) => p.branchCode === seatNumber4subReservation);
                 if (seat4subReservation === undefined) {
                     throw new factory.errors.NotFound(factory.placeType.Seat, `${factory.placeType.Seat} ${seatNumber4subReservation} not found`);
@@ -172,9 +185,8 @@ function validateEligibleSubReservation(params) {
         }
         if (Array.isArray(params.availableSeatOffers)) {
             seats4subReservation = subReservations.map((subReservation) => {
-                var _a, _b;
-                const seatNumber4subReservation = (_b = (_a = subReservation.reservedTicket) === null || _a === void 0 ? void 0 : _a.ticketedSeat) === null || _b === void 0 ? void 0 : _b.seatNumber;
-                const seat4subReservation = params.availableSeatOffers.find((p) => { var _a; return p.branchCode === seatNumber4subReservation && ((_a = p.containedInPlace) === null || _a === void 0 ? void 0 : _a.branchCode) === params.seatSection; });
+                const seatNumber4subReservation = subReservation.reservedTicket?.ticketedSeat?.seatNumber;
+                const seat4subReservation = params.availableSeatOffers.find((p) => p.branchCode === seatNumber4subReservation && p.containedInPlace?.branchCode === params.seatSection);
                 if (seat4subReservation === undefined) {
                     throw new factory.errors.NotFound(factory.placeType.Seat, `${factory.placeType.Seat} ${seatNumber4subReservation} not found`);
                 }
@@ -205,7 +217,7 @@ function validateEligibleMembershipType(params) {
     // 使用メンバーシップがeligibleMembershipに含まれればよい
     const eligibleMembershipType = params.availableOffer.eligibleMembershipType;
     if (Array.isArray(eligibleMembershipType)) {
-        if ((programMembershipUsed === null || programMembershipUsed === void 0 ? void 0 : programMembershipUsed.typeOf) !== factory.programMembership.ProgramMembershipType.ProgramMembership) {
+        if (programMembershipUsed?.typeOf !== factory.programMembership.ProgramMembershipType.ProgramMembership) {
             throw new factory.errors.Argument('programMembershipUsed', 'programMembership required');
         }
         const { identifier, issuedThrough } = programMembershipUsed;
@@ -223,7 +235,6 @@ function validateEligibleMembershipType(params) {
     }
 }
 function validateAppliesToMovieTicket(params) {
-    var _a, _b;
     // 複数決済カード指定対応(2022-08-01~)
     let isAppliesToMovieTicketSpecifiedAsArray = false;
     let appliesToMovieTicketAsArray;
@@ -231,11 +242,11 @@ function validateAppliesToMovieTicket(params) {
         isAppliesToMovieTicketSpecifiedAsArray = true;
         appliesToMovieTicketAsArray = params.appliesToMovieTicket;
     }
-    else if (typeof ((_a = params.appliesToMovieTicket) === null || _a === void 0 ? void 0 : _a.identifier) === 'string') {
+    else if (typeof params.appliesToMovieTicket?.identifier === 'string') {
         appliesToMovieTicketAsArray = [params.appliesToMovieTicket];
     }
     // 複数決済カード対応(2022-07-11~)
-    const priceSpecificationAppliesToMovieTicket = (_b = params.availableOffer.priceSpecification) === null || _b === void 0 ? void 0 : _b.appliesToMovieTicket;
+    const priceSpecificationAppliesToMovieTicket = params.availableOffer.priceSpecification?.appliesToMovieTicket;
     if (Array.isArray(priceSpecificationAppliesToMovieTicket)) {
         // ひとまず1以外は未実装(2022-07-11~)
         // 決済カード指定数は1 or 2(2022-09-09~)
@@ -259,7 +270,7 @@ function validateAppliesToMovieTicket(params) {
         }
         // Array指定の場合、決済方法は適切か
         if (isAppliesToMovieTicketSpecifiedAsArray) {
-            const paymentMethodTypesSpecified = appliesToMovieTicketAsArray.map((a) => { var _a; return String((_a = a.serviceOutput) === null || _a === void 0 ? void 0 : _a.typeOf); });
+            const paymentMethodTypesSpecified = appliesToMovieTicketAsArray.map((a) => String(a.serviceOutput?.typeOf));
             const paymentMethodTypesRequired = priceSpecificationAppliesToMovieTicket.map((a) => String(a.serviceOutput.typeOf));
             if (paymentMethodTypesSpecified.length !== paymentMethodTypesRequired.length) {
                 throw new factory.errors.Argument('appliesToMovieTicket', 'invalid paymentMethodTypes');
@@ -286,8 +297,7 @@ function validateAppliesToMovieTicket(params) {
  * 追加特性を生成する
  */
 function createAdditionalProperty(params) {
-    var _a, _b;
-    let additionalProperty = (_b = (_a = params.acceptedOffer.itemOffered) === null || _a === void 0 ? void 0 : _a.serviceOutput) === null || _b === void 0 ? void 0 : _b.additionalProperty;
+    let additionalProperty = params.acceptedOffer.itemOffered?.serviceOutput?.additionalProperty;
     if (!Array.isArray(additionalProperty)) {
         additionalProperty = [];
     }
@@ -297,12 +307,10 @@ function createAdditionalProperty(params) {
  * 追加チケットテキストを生成する
  */
 function createAdditionalTicketText(params) {
-    var _a, _b;
-    return (_b = (_a = params.acceptedOffer.itemOffered) === null || _a === void 0 ? void 0 : _a.serviceOutput) === null || _b === void 0 ? void 0 : _b.additionalTicketText;
+    return params.acceptedOffer.itemOffered?.serviceOutput?.additionalTicketText;
 }
 // tslint:disable-next-line:cyclomatic-complexity max-func-body-length
 function createReservation(params) {
-    var _a, _b;
     // 適用メンバーシップ確認
     validateEligibleMembershipType({
         availableOffer: params.availableOffer,
@@ -318,59 +326,89 @@ function createReservation(params) {
     // priceを最適化
     const price4reservation = (0, price_1.createPrice)(params);
     if (params.reservationFor.typeOf === factory.eventType.ScreeningEvent) {
-        return Object.assign(Object.assign(Object.assign({ 
+        return {
             // project: params.project, // 廃止(2024-04-08~)
-            typeOf: factory.reservationType.EventReservation, id: params.id, 
+            typeOf: factory.reservationType.EventReservation,
+            id: params.id,
             // reservationPackage保管に移行(2023-06-06~)
             // issuedThrough,
-            additionalProperty: params.additionalProperty, 
+            additionalProperty: params.additionalProperty,
             // bookingTime: params.reserveDate, // 廃止(2024-04-08~)
             // modifiedTime: params.reserveDate, // 廃止(2024-04-08~)
-            numSeats: 1, price: price4reservation, priceCurrency: factory.priceCurrency.JPY, 
+            numSeats: 1,
+            price: price4reservation,
+            priceCurrency: factory.priceCurrency.JPY,
             // reservationNumber: params.reservationNumber, // 廃止(2024-04-08~)
             // statusは不要なので削除(2023-07-19~)
             // reservationStatus: factory.reservationStatusType.ReservationPending,
-            reservedTicket: params.reservedTicket }, (typeof params.additionalTicketText === 'string') ? { additionalTicketText: params.additionalTicketText } : undefined), (Array.isArray(params.subReservation))
-            ? {
-                subReservation: params.subReservation.map((r) => {
-                    return {
-                        reservedTicket: {
-                            ticketedSeat: r.reservedTicket.ticketedSeat,
-                            typeOf: 'Ticket'
-                        }
-                    };
-                })
-            }
-            : undefined), (typeof ((_a = params.programMembershipUsed) === null || _a === void 0 ? void 0 : _a.identifier) === 'string')
-            ? { programMembershipUsed: params.programMembershipUsed }
-            : undefined);
+            reservedTicket: params.reservedTicket,
+            // underName: { // 廃止(2024-04-08~)
+            //     typeOf: params.agent.typeOf,
+            //     name: params.agent.name
+            // },
+            // checkedIn: false, // 廃止(2024-04-08~)
+            // attended: false, // 廃止(2024-04-08~)
+            ...(typeof params.additionalTicketText === 'string') ? { additionalTicketText: params.additionalTicketText } : undefined,
+            ...(Array.isArray(params.subReservation))
+                ? {
+                    subReservation: params.subReservation.map((r) => {
+                        return {
+                            reservedTicket: {
+                                ticketedSeat: r.reservedTicket.ticketedSeat,
+                                typeOf: 'Ticket'
+                            }
+                        };
+                    })
+                }
+                : undefined,
+            // reservationPackage保管に移行(2023-06-06~)
+            // ...(typeof params.broker?.typeOf === 'string') ? { broker: params.broker } : undefined,
+            ...(typeof params.programMembershipUsed?.identifier === 'string')
+                ? { programMembershipUsed: params.programMembershipUsed }
+                : undefined
+        };
     }
     else {
-        return Object.assign(Object.assign(Object.assign({ 
+        return {
             // project: params.project,
-            typeOf: factory.reservationType.BusReservation, id: params.id, 
+            typeOf: factory.reservationType.BusReservation,
+            id: params.id,
             // reservationPackage保管に移行(2023-06-06~)
             // issuedThrough,
-            additionalProperty: params.additionalProperty, 
+            additionalProperty: params.additionalProperty,
             // bookingTime: params.reserveDate,
             // modifiedTime: params.reserveDate,
-            numSeats: 1, price: price4reservation, priceCurrency: factory.priceCurrency.JPY, 
+            numSeats: 1,
+            price: price4reservation,
+            priceCurrency: factory.priceCurrency.JPY,
             // reservationNumber: params.reservationNumber,
             // statusは不要なので削除(2023-07-19~)
             // reservationStatus: factory.reservationStatusType.ReservationPending,
-            reservedTicket: params.reservedTicket }, (typeof params.additionalTicketText === 'string') ? { additionalTicketText: params.additionalTicketText } : undefined), (Array.isArray(params.subReservation))
-            ? {
-                subReservation: params.subReservation.map((r) => {
-                    return {
-                        reservedTicket: {
-                            ticketedSeat: r.reservedTicket.ticketedSeat,
-                            typeOf: 'Ticket'
-                        }
-                    };
-                })
-            }
-            : undefined), (typeof ((_b = params.programMembershipUsed) === null || _b === void 0 ? void 0 : _b.identifier) === 'string')
-            ? { programMembershipUsed: params.programMembershipUsed }
-            : undefined);
+            reservedTicket: params.reservedTicket,
+            // underName: {
+            //     typeOf: params.agent.typeOf,
+            //     name: params.agent.name
+            // },
+            // checkedIn: false,
+            // attended: false,
+            ...(typeof params.additionalTicketText === 'string') ? { additionalTicketText: params.additionalTicketText } : undefined,
+            ...(Array.isArray(params.subReservation))
+                ? {
+                    subReservation: params.subReservation.map((r) => {
+                        return {
+                            reservedTicket: {
+                                ticketedSeat: r.reservedTicket.ticketedSeat,
+                                typeOf: 'Ticket'
+                            }
+                        };
+                    })
+                }
+                : undefined,
+            // reservationPackage保管に移行(2023-06-06~)
+            // ...(typeof params.broker?.typeOf === 'string') ? { broker: params.broker } : undefined,
+            ...(typeof params.programMembershipUsed?.identifier === 'string')
+                ? { programMembershipUsed: params.programMembershipUsed }
+                : undefined
+        };
     }
 }

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

@@ -3,7 +3,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.createStartParams = createStartParams;
 const factory = require("../../../../../factory");
 function createStartParams(params) {
-    var _a;
     const { reservationNumber, acceptedOffers4transactionObject, objectSubReservations, agent, expires, project, instrument } = params;
     const provider = {
         id: params.provider.id,
@@ -12,9 +11,19 @@ function createStartParams(params) {
     // reservationFor,issuedThrough保管をaddReservationsから移行(2024-07-01~)
     const reservationFor = createReservationFor(params.event, true);
     const { issuedThrough } = createIssuedThrough({ reservationFor: params.event });
-    const reservationPackage = Object.assign({ issuedThrough, // addReservationsから移行(2024-07-01~)
+    const reservationPackage = {
+        issuedThrough, // addReservationsから移行(2024-07-01~)
         provider,
-        reservationFor, reservationNumber: reservationNumber, reservationStatus: factory.reservationStatusType.ReservationPending, disablePendingReservations: true, useHoldStockByTransactionNumber: true, typeOf: factory.reservationType.ReservationPackage, acceptedOffer: acceptedOffers4transactionObject, subReservation: objectSubReservations }, (typeof ((_a = params.object.broker) === null || _a === void 0 ? void 0 : _a.typeOf) === 'string') ? { broker: params.object.broker } : undefined);
+        reservationFor, // addReservationsから移行(2024-07-01~)
+        reservationNumber: reservationNumber,
+        reservationStatus: factory.reservationStatusType.ReservationPending,
+        disablePendingReservations: true, // trueで固定(2023-07-19~)
+        useHoldStockByTransactionNumber: true, // fix true(2024-07-02~)
+        typeOf: factory.reservationType.ReservationPackage,
+        acceptedOffer: acceptedOffers4transactionObject, // addReservationsから移行(2024-07-06~)
+        subReservation: objectSubReservations, // addReservationsから移行(2024-07-06~)
+        ...(typeof params.object.broker?.typeOf === 'string') ? { broker: params.object.broker } : undefined
+    };
     return {
         project: { id: project.id, typeOf: factory.organizationType.Project },
         typeOf: factory.assetTransactionType.Reserve,
@@ -26,9 +35,18 @@ function createStartParams(params) {
 }
 function createReservationFor(params, useOptimizeReservation) {
     if (params.typeOf === factory.eventType.ScreeningEvent) {
-        return Object.assign({ endDate: params.endDate, id: params.id, location: params.location, name: params.name, startDate: params.startDate, superEvent: optimizeReservationSuperEvent(params, useOptimizeReservation), typeOf: params.typeOf }, (params.doorTime instanceof Date)
-            ? { doorTime: params.doorTime }
-            : undefined);
+        return {
+            endDate: params.endDate,
+            id: params.id,
+            location: params.location,
+            name: params.name,
+            startDate: params.startDate,
+            superEvent: optimizeReservationSuperEvent(params, useOptimizeReservation),
+            typeOf: params.typeOf,
+            ...(params.doorTime instanceof Date)
+                ? { doorTime: params.doorTime }
+                : undefined
+        };
     }
     else {
         throw new factory.errors.NotImplemented(`typeOf: ${params.typeOf}`);
@@ -36,34 +54,45 @@ function createReservationFor(params, useOptimizeReservation) {
 }
 function optimizeReservationSuperEvent(params, useOptimizeReservation) {
     const superEvent = params.superEvent;
-    return Object.assign(Object.assign({ id: superEvent.id, 
+    return {
+        id: superEvent.id,
         // kanaName: superEvent.kanaName, // 廃止(2024-01-26~)
-        location: superEvent.location, name: superEvent.name, soundFormat: superEvent.soundFormat, typeOf: superEvent.typeOf, workPerformed: superEvent.workPerformed }, (superEvent.headline !== undefined)
-        ? { headline: superEvent.headline }
-        : undefined), (useOptimizeReservation)
-        ? {}
-        : {
-            additionalProperty: (Array.isArray(superEvent.additionalProperty))
-                ? superEvent.additionalProperty
-                : []
-        }
-    // videoFormatをデータとしても廃止(万が一に備えてUSE_DEPRECATED_VIDEO_FORMATで再設定可能)(2026-02-03~)
-    // ...(USE_DEPRECATED_VIDEO_FORMAT)
-    //     ? {
-    //         // 現時点で型廃止済だがデータとしては互換性維持(2026-01-15~)
-    //         videoFormat: (<any>superEvent).videoFormat
-    //     }
-    //     : undefined
-    );
+        location: superEvent.location,
+        name: superEvent.name,
+        soundFormat: superEvent.soundFormat,
+        typeOf: superEvent.typeOf,
+        workPerformed: superEvent.workPerformed,
+        // 廃止(2024-01-26~)
+        // ...(superEvent.description !== undefined)
+        //     ? { description: superEvent.description }
+        //     : undefined,
+        ...(superEvent.headline !== undefined)
+            ? { headline: superEvent.headline }
+            : undefined,
+        // 最適化対応(2024-03-16~)
+        ...(useOptimizeReservation)
+            ? {}
+            : {
+                additionalProperty: (Array.isArray(superEvent.additionalProperty))
+                    ? superEvent.additionalProperty
+                    : []
+            }
+        // videoFormatをデータとしても廃止(万が一に備えてUSE_DEPRECATED_VIDEO_FORMATで再設定可能)(2026-02-03~)
+        // ...(USE_DEPRECATED_VIDEO_FORMAT)
+        //     ? {
+        //         // 現時点で型廃止済だがデータとしては互換性維持(2026-01-15~)
+        //         videoFormat: (<any>superEvent).videoFormat
+        //     }
+        //     : undefined
+    };
 }
 function createIssuedThrough(params) {
-    var _a;
     const eventOffers = params.reservationFor.offers;
     // offersは必ず存在するはず
     if (eventOffers === undefined) {
         throw new factory.errors.NotFound('reservationFor.offers');
     }
-    const serviceTypeOfIssuedThrough = (typeof ((_a = eventOffers.itemOffered.serviceType) === null || _a === void 0 ? void 0 : _a.codeValue) === 'string')
+    const serviceTypeOfIssuedThrough = (typeof eventOffers.itemOffered.serviceType?.codeValue === 'string')
         ? {
             codeValue: eventOffers.itemOffered.serviceType.codeValue,
             inCodeSet: {
@@ -79,17 +108,27 @@ function createIssuedThrough(params) {
         throw new factory.errors.NotFound('reservationFor.offers.availableChannel');
     }
     if (params.reservationFor.typeOf === factory.eventType.ScreeningEvent) {
-        const issuedThrough = Object.assign({ typeOf: factory.product.ProductType.EventService, 
+        const issuedThrough = {
+            typeOf: factory.product.ProductType.EventService,
             // 興行IDを追加(2022-09-08~)
-            id: eventOffers.itemOffered.id, availableChannel }, (typeof (serviceTypeOfIssuedThrough === null || serviceTypeOfIssuedThrough === void 0 ? void 0 : serviceTypeOfIssuedThrough.typeOf) === 'string') ? { serviceType: serviceTypeOfIssuedThrough } : undefined);
+            id: eventOffers.itemOffered.id,
+            availableChannel,
+            // issuedThrough.serviceTypeを連携
+            ...(typeof serviceTypeOfIssuedThrough?.typeOf === 'string') ? { serviceType: serviceTypeOfIssuedThrough } : undefined
+        };
         return {
             issuedThrough
         };
     }
     else {
-        const issuedThrough = Object.assign({ typeOf: factory.product.ProductType.Transportation, 
+        const issuedThrough = {
+            typeOf: factory.product.ProductType.Transportation,
             // 興行IDを追加(2022-09-08~)
-            id: eventOffers.itemOffered.id, availableChannel }, (typeof (serviceTypeOfIssuedThrough === null || serviceTypeOfIssuedThrough === void 0 ? void 0 : serviceTypeOfIssuedThrough.typeOf) === 'string') ? { serviceType: serviceTypeOfIssuedThrough } : undefined);
+            id: eventOffers.itemOffered.id,
+            availableChannel,
+            // issuedThrough.serviceTypeを連携
+            ...(typeof serviceTypeOfIssuedThrough?.typeOf === 'string') ? { serviceType: serviceTypeOfIssuedThrough } : undefined
+        };
         return {
             issuedThrough
         };

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

@@ -67,7 +67,6 @@ function createUnitPriceSpecsAppliedToAddOn(params) {
     return unitPriceSpecsAppliedToAddOn;
 }
 function createPriceSpecsByEventOffer(params) {
-    var _a;
     // 適用決済カードを配列で指定されたかどうか(互換性維持対応として、配列でない指定がありえるため)
     let isAppliesToMovieTicketSpecifiedAsArray = false;
     let appliesToMovieTicketSpecifiedAsArray;
@@ -75,7 +74,7 @@ function createPriceSpecsByEventOffer(params) {
         isAppliesToMovieTicketSpecifiedAsArray = true;
         appliesToMovieTicketSpecifiedAsArray = params.appliesToMovieTicket;
     }
-    else if (typeof ((_a = params.appliesToMovieTicket) === null || _a === void 0 ? void 0 : _a.identifier) === 'string') {
+    else if (typeof params.appliesToMovieTicket?.identifier === 'string') {
         appliesToMovieTicketSpecifiedAsArray = [params.appliesToMovieTicket];
     }
     let categoryCodeChargePriceComponent;
@@ -125,7 +124,6 @@ function createPriceSpecsByEventOffer(params) {
  * 興行オファーの単価仕様を予約単価仕様に最適化する
  */
 function eventOfferUnitPriceSpec2reservationUnitPriceSpec(params) {
-    var _a;
     const priceSpec = params.unitPriceSpec;
     let appliesToMovieTicket;
     // 複数決済カード対応(2022-07-11~)
@@ -137,17 +135,15 @@ function eventOfferUnitPriceSpec2reservationUnitPriceSpec(params) {
             throw new factory.errors.NotImplemented(`${priceSpecificationAppliesToMovieTicket.length} appliesToMovieTicket not implemented`);
         }
         appliesToMovieTicket = priceSpecificationAppliesToMovieTicket.map((appliesToMovieTicketRequired) => {
-            var _a, _b, _c, _d;
             // 指定された決済カードから適用決済方法の識別子を検索する
             let appliesToMovieTicketIdentifier;
             if (params.isAppliesToMovieTicketSpecifiedAsArray) {
-                appliesToMovieTicketIdentifier = (_b = (_a = params.appliesToMovieTicketSpecifiedAsArray) === null || _a === void 0 ? void 0 : _a.find((a) => {
-                    var _a;
-                    return ((_a = a.serviceOutput) === null || _a === void 0 ? void 0 : _a.typeOf) === appliesToMovieTicketRequired.serviceOutput.typeOf;
-                })) === null || _b === void 0 ? void 0 : _b.identifier;
+                appliesToMovieTicketIdentifier = params.appliesToMovieTicketSpecifiedAsArray?.find((a) => {
+                    return a.serviceOutput?.typeOf === appliesToMovieTicketRequired.serviceOutput.typeOf;
+                })?.identifier;
             }
             else {
-                appliesToMovieTicketIdentifier = (_d = (_c = params.appliesToMovieTicketSpecifiedAsArray) === null || _c === void 0 ? void 0 : _c.shift()) === null || _d === void 0 ? void 0 : _d.identifier;
+                appliesToMovieTicketIdentifier = params.appliesToMovieTicketSpecifiedAsArray?.shift()?.identifier;
             }
             // 適用決済カードの識別子指定が必須
             if (typeof appliesToMovieTicketIdentifier !== 'string' || appliesToMovieTicketIdentifier.length === 0) {
@@ -169,17 +165,30 @@ function eventOfferUnitPriceSpec2reservationUnitPriceSpec(params) {
     }
     let accounting4reservation;
     const accounting = priceSpec.accounting;
-    if (typeof (accounting === null || accounting === void 0 ? void 0 : accounting.typeOf) === 'string') {
-        accounting4reservation = Object.assign(Object.assign({ typeOf: accounting.typeOf }, (typeof accounting.accountsReceivable === 'number')
-            ? { accountsReceivable: accounting.accountsReceivable }
-            : undefined), (typeof ((_a = accounting.operatingRevenue) === null || _a === void 0 ? void 0 : _a.typeOf) === 'string')
-            ? {
-                operatingRevenue: {
-                    typeOf: accounting.operatingRevenue.typeOf,
-                    codeValue: accounting.operatingRevenue.codeValue
+    if (typeof accounting?.typeOf === 'string') {
+        accounting4reservation = {
+            typeOf: accounting.typeOf,
+            ...(typeof accounting.accountsReceivable === 'number')
+                ? { accountsReceivable: accounting.accountsReceivable }
+                : undefined,
+            ...(typeof accounting.operatingRevenue?.typeOf === 'string')
+                ? {
+                    operatingRevenue: {
+                        typeOf: accounting.operatingRevenue.typeOf,
+                        codeValue: accounting.operatingRevenue.codeValue
+                    }
                 }
-            }
-            : undefined);
+                : undefined
+        };
     }
-    return Object.assign(Object.assign({ name: priceSpec.name, price: priceSpec.price, priceCurrency: priceSpec.priceCurrency, referenceQuantity: priceSpec.referenceQuantity, typeOf: priceSpec.typeOf, valueAddedTaxIncluded: priceSpec.valueAddedTaxIncluded }, (Array.isArray(appliesToMovieTicket)) ? { appliesToMovieTicket } : undefined), (typeof (accounting4reservation === null || accounting4reservation === void 0 ? void 0 : accounting4reservation.typeOf) === 'string') ? { accounting: accounting4reservation } : undefined);
+    return {
+        name: priceSpec.name,
+        price: priceSpec.price,
+        priceCurrency: priceSpec.priceCurrency,
+        referenceQuantity: priceSpec.referenceQuantity,
+        typeOf: priceSpec.typeOf,
+        valueAddedTaxIncluded: priceSpec.valueAddedTaxIncluded,
+        ...(Array.isArray(appliesToMovieTicket)) ? { appliesToMovieTicket } : undefined,
+        ...(typeof accounting4reservation?.typeOf === 'string') ? { accounting: accounting4reservation } : undefined
+    };
 }