@chevre/domain 23.2.0-alpha.9 → 24.0.0-alpha.0

package/lib/chevre/service/offer/eventServiceByCOA/changeOffers.js

@@ -1,41 +1,56 @@
 "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());
-    });
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || function (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
+};
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.changeOffers = changeOffers;
-const moment = require("moment");
+const moment_1 = __importDefault(require("moment"));
 const any_1 = require("../any");
 const factory_1 = require("./authorize/factory");
 const validateAcceptedOffers_1 = require("./authorize/validateAcceptedOffers");
-const factory = require("../../../factory");
+const factory = __importStar(require("../../../factory"));
 /**
  * COA興行オファー承認のオファーを変更
  */
 function changeOffers(params) {
-    // tslint:disable-next-line:max-func-body-length
-    return (repos) => __awaiter(this, void 0, void 0, function* () {
-        var _a, _b, _c, _d;
-        const transaction = yield repos.transaction.projectFieldsInProgressById({
+    return async (repos) => {
+        const transaction = await repos.transaction.projectFieldsInProgressById({
             typeOf: factory.transactionType.PlaceOrder,
             id: params.transaction.id
         }, ['typeOf', 'agent', 'project', 'seller']);
         if (transaction.agent.id !== params.agent.id) {
             throw new factory.errors.Forbidden('Transaction not yours');
         }
-        const orderNumber = yield repos.transaction.findInProgressOrderNumberById({ id: params.transaction.id });
+        const orderNumber = await repos.transaction.findInProgressOrderNumberById({ id: params.transaction.id });
         if (typeof orderNumber !== 'string') {
             // 事前に発行されているはず
             throw new factory.errors.NotFound('transaction.object.orderNumber');
         }
         // 取引内のアクションかどうか確認
-        const authorizeAction = yield repos.action.findById({ typeOf: factory.actionType.AuthorizeAction, id: params.id });
+        const authorizeAction = await repos.action.findById({ typeOf: factory.actionType.AuthorizeAction, id: params.id });
         if (authorizeAction.purpose.typeOf !== transaction.typeOf || authorizeAction.purpose.id !== transaction.id) {
             throw new factory.errors.Argument('Transaction', 'Action not found in the transaction');
         }
@@ -46,13 +61,13 @@ function changeOffers(params) {
         if (typeof originalAcceptActionId !== 'string' || originalAcceptActionId === '') {
             throw new factory.errors.NotFound('authorizeAction.object.id');
         }
-        const originalAcceptResult = (_a = (yield repos.action.search({
+        const originalAcceptResult = (await repos.action.search({
             limit: 1,
             page: 1,
             project: { id: { $eq: authorizeAction.project.id } },
             id: { $in: [originalAcceptActionId] },
             typeOf: { $eq: factory.actionType.AcceptAction }
-        }, ['result'])).shift()) === null || _a === void 0 ? void 0 : _a.result;
+        }, ['result'])).shift()?.result;
         if (originalAcceptResult === undefined) {
             throw new factory.errors.NotFound(`${factory.actionType.AcceptAction}.result`);
         }
@@ -62,37 +77,44 @@ function changeOffers(params) {
             // remove dependency authorizeAction.object.acceptedOffer(2024-06-19~)
             // const originalAcceptedOfferBySeatNumber = authorizeAction.object.acceptedOffer.find((originalOffer) => {
             const originalAcceptedOfferBySeatNumber = originalAcceptResult.object.acceptedOffer.find((originalOffer) => {
-                var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o;
-                return ((_d = (_c = (_b = (_a = originalOffer.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) === null || _d === void 0 ? void 0 : _d.seatSection)
-                    === ((_g = (_f = (_e = offer.itemOffered.serviceOutput) === null || _e === void 0 ? void 0 : _e.reservedTicket) === null || _f === void 0 ? void 0 : _f.ticketedSeat) === null || _g === void 0 ? void 0 : _g.seatSection)
-                    && ((_k = (_j = (_h = originalOffer.itemOffered.serviceOutput) === null || _h === void 0 ? void 0 : _h.reservedTicket) === null || _j === void 0 ? void 0 : _j.ticketedSeat) === null || _k === void 0 ? void 0 : _k.seatNumber)
-                        === ((_o = (_m = (_l = offer.itemOffered.serviceOutput) === null || _l === void 0 ? void 0 : _l.reservedTicket) === null || _m === void 0 ? void 0 : _m.ticketedSeat) === null || _o === void 0 ? void 0 : _o.seatNumber);
+                return originalOffer.itemOffered?.serviceOutput?.reservedTicket?.ticketedSeat?.seatSection
+                    === offer.itemOffered.serviceOutput?.reservedTicket?.ticketedSeat?.seatSection
+                    && originalOffer.itemOffered.serviceOutput?.reservedTicket?.ticketedSeat?.seatNumber
+                        === offer.itemOffered.serviceOutput?.reservedTicket?.ticketedSeat?.seatNumber;
             });
             if (originalAcceptedOfferBySeatNumber === undefined) {
                 throw new factory.errors.Argument('offers', 'seatSection or seatNumber not matched.');
             }
-            return Object.assign(Object.assign({}, offer), { ticketInfo: Object.assign(Object.assign({}, offer.ticketInfo), { spseatAdd1: originalAcceptedOfferBySeatNumber.ticketInfo.spseatAdd1, spseatAdd2: originalAcceptedOfferBySeatNumber.ticketInfo.spseatAdd2, spseatKbn: originalAcceptedOfferBySeatNumber.ticketInfo.spseatKbn }) });
+            return {
+                ...offer,
+                ticketInfo: {
+                    ...offer.ticketInfo,
+                    spseatAdd1: originalAcceptedOfferBySeatNumber.ticketInfo.spseatAdd1,
+                    spseatAdd2: originalAcceptedOfferBySeatNumber.ticketInfo.spseatAdd2,
+                    spseatKbn: originalAcceptedOfferBySeatNumber.ticketInfo.spseatKbn
+                }
+            };
         });
         // イベント取得属性最適化(2023-01-23~)
-        const screeningEvent = yield repos.event.projectEventFieldsById({ id: params.object.event.id }, [
+        const screeningEvent = await repos.event.projectEventFieldsById({ id: params.object.event.id }, [
             'coaInfo', 'doorTime', 'endDate', 'location', 'startDate',
             'superEvent', 'typeOf', 'identifier', 'name'
         ] // optimize(2024-07-18~)
         );
-        const availablePaymentMethodTypes = yield repos.categoryCode.projectCategoryCodeFields({
+        const availablePaymentMethodTypes = await repos.categoryCode.projectCategoryCodeFields({
             project: { id: { $eq: transaction.project.id } },
             inCodeSet: { identifier: { $eq: factory.categoryCode.CategorySetIdentifier.PaymentMethodType } }
         }, []);
-        const seatingTypes = yield repos.categoryCode.projectCategoryCodeFields({
+        const seatingTypes = await repos.categoryCode.projectCategoryCodeFields({
             project: { id: { $eq: transaction.project.id } },
             inCodeSet: { identifier: { $eq: factory.categoryCode.CategorySetIdentifier.SeatingType } }
         }, []);
-        const videoFormatTypes = yield repos.categoryCode.projectCategoryCodeFields({
+        const videoFormatTypes = await repos.categoryCode.projectCategoryCodeFields({
             project: { id: { $eq: transaction.project.id } },
             inCodeSet: { identifier: { $eq: factory.categoryCode.CategorySetIdentifier.VideoFormatType } }
         }, []);
         // COA仮予約後にリクエストが来る前提
-        const { acceptedOffers } = yield (0, validateAcceptedOffers_1.validateAcceptedOffers)({
+        const { acceptedOffers } = await (0, validateAcceptedOffers_1.validateAcceptedOffers)({
             object: params.object,
             project: { id: transaction.project.id },
             screeningEvent,
@@ -104,11 +126,11 @@ function changeOffers(params) {
         // authorizeAction.object.acceptedOffer = acceptedOffers; // discontinue acceptedOffers(2024-06-21~)
         // recipe依存へ変更(2024-06-11~)
         // const updTmpReserveSeatResult = authorizeAction.result?.responseBody;
-        const recipe = yield repos.action.findRecipeByAction({
+        const recipe = await repos.action.findRecipeByAction({
             project: { id: transaction.project.id },
             recipeFor: { id: originalAcceptActionId }
         });
-        const updTmpReserveSeatResult = (_d = (_c = (_b = recipe === null || recipe === void 0 ? void 0 : recipe.step[0]) === null || _b === void 0 ? void 0 : _b.itemListElement[0]) === null || _c === void 0 ? void 0 : _c.itemListElement[0]) === null || _d === void 0 ? void 0 : _d.afterMedia;
+        const updTmpReserveSeatResult = recipe?.step[0]?.itemListElement[0]?.itemListElement[0]?.afterMedia;
         if (updTmpReserveSeatResult === undefined) {
             throw new factory.errors.NotFound('afterMedia by recipe');
         }
@@ -119,19 +141,24 @@ function changeOffers(params) {
             acceptedOffer: acceptedOffers,
             event: screeningEvent,
             seller: transaction.seller,
-            bookingTime: moment(authorizeAction.startDate)
+            bookingTime: (0, moment_1.default)(authorizeAction.startDate)
                 .toDate(),
             totalPrice: price
         });
-        const actionResult = Object.assign(Object.assign({}, authorizeAction.result), { price: price, amount: eligibleMonetaryAmount });
+        const actionResult = {
+            ...authorizeAction.result,
+            price: price,
+            amount: eligibleMonetaryAmount
+            // acceptedOffers: [] // discontinue(2024-06-17~)
+        };
         // ActiveActionStatus->CompletedActionStatusで再実装(2024-01-15~)
-        yield repos.action.reStart({ id: authorizeAction.id, typeOf: authorizeAction.typeOf });
+        await repos.action.reStart({ id: authorizeAction.id, typeOf: authorizeAction.typeOf });
         try {
             // まずvoidAcceptedOffer
             // const orderNumberByTransaction = transaction.object.orderNumber;
             const orderNumberByTransaction = orderNumber; // transaction.objectへのアクセス回避(2024-05-30~)
             if (typeof orderNumberByTransaction === 'string') {
-                yield (0, any_1.voidAcceptedOffer)({
+                await (0, any_1.voidAcceptedOffer)({
                     // authorizeActions: [authorizeAction],
                     authorizeActionsWithInstrument: [authorizeAction],
                     orderNumber: orderNumberByTransaction
@@ -139,7 +166,7 @@ function changeOffers(params) {
             }
             // add orderInTransaction(2024-01-15~)
             // if (params.options.useCreateOrderOnOfferAccepted) {
-            yield (0, any_1.acceptOffer)({
+            await (0, any_1.acceptOffer)({
                 orderNumber,
                 project: transaction.project,
                 acceptedOffers: acceptedOffers4result
@@ -148,7 +175,7 @@ function changeOffers(params) {
         }
         catch (error) {
             try {
-                yield repos.action.giveUp({ typeOf: authorizeAction.typeOf, id: authorizeAction.id, error });
+                await repos.action.giveUp({ typeOf: authorizeAction.typeOf, id: authorizeAction.id, error });
             }
             catch (__) {
                 // no op
@@ -156,7 +183,7 @@ function changeOffers(params) {
             throw error;
         }
         // 承認アクションを再完了
-        yield repos.action.reCompleteAuthorizeEventOfferAction({
+        await repos.action.reCompleteAuthorizeEventOfferAction({
             id: params.id,
             object: authorizeAction.object,
             result: actionResult
@@ -166,7 +193,7 @@ function changeOffers(params) {
             instrument: authorizeAction.instrument,
             result: actionResult
         };
-    });
+    };
 }
 function validate4changeOffer(params) {
     // アクション中のイベント識別子と座席リストが合っているかどうか確認
@@ -177,7 +204,6 @@ function validate4changeOffer(params) {
     if (authorizeAction.actionStatus !== factory.actionStatusType.CompletedActionStatus) {
         throw new factory.errors.NotFound('authorizeAction');
     }
-    // tslint:disable-next-line:no-single-line-block-comment
     /* istanbul ignore if */
     // if (authorizeAction.object.event === undefined) {
     //     throw new factory.errors.NotFound('authorizeAction.object.event');
@@ -194,11 +220,10 @@ function validate4changeOffer(params) {
     // const allSeatsExisted = authorizeAction.object.acceptedOffer.every((originalAcceptedOffer) => {
     const allSeatsExisted = originalAuthorizeActionObject.acceptedOffer.every((originalAcceptedOffer) => {
         return acceptedOfferParams.some((o) => {
-            var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o;
-            const newSeatSection = (_c = (_b = (_a = o.itemOffered.serviceOutput) === null || _a === void 0 ? void 0 : _a.reservedTicket) === null || _b === void 0 ? void 0 : _b.ticketedSeat) === null || _c === void 0 ? void 0 : _c.seatSection;
-            const newSeatNumber = (_f = (_e = (_d = o.itemOffered.serviceOutput) === null || _d === void 0 ? void 0 : _d.reservedTicket) === null || _e === void 0 ? void 0 : _e.ticketedSeat) === null || _f === void 0 ? void 0 : _f.seatNumber;
-            return ((_k = (_j = (_h = (_g = originalAcceptedOffer.itemOffered) === null || _g === void 0 ? void 0 : _g.serviceOutput) === null || _h === void 0 ? void 0 : _h.reservedTicket) === null || _j === void 0 ? void 0 : _j.ticketedSeat) === null || _k === void 0 ? void 0 : _k.seatSection) === newSeatSection
-                && ((_o = (_m = (_l = originalAcceptedOffer.itemOffered.serviceOutput) === null || _l === void 0 ? void 0 : _l.reservedTicket) === null || _m === void 0 ? void 0 : _m.ticketedSeat) === null || _o === void 0 ? void 0 : _o.seatNumber) === newSeatNumber;
+            const newSeatSection = o.itemOffered.serviceOutput?.reservedTicket?.ticketedSeat?.seatSection;
+            const newSeatNumber = o.itemOffered.serviceOutput?.reservedTicket?.ticketedSeat?.seatNumber;
+            return originalAcceptedOffer.itemOffered?.serviceOutput?.reservedTicket?.ticketedSeat?.seatSection === newSeatSection
+                && originalAcceptedOffer.itemOffered.serviceOutput?.reservedTicket?.ticketedSeat?.seatNumber === newSeatNumber;
         });
     });
     const allSeatsMatched = (acceptedOfferParams.length === originalAuthorizeActionObject.acceptedOffer.length) && allSeatsExisted;

package/lib/chevre/service/offer/eventServiceByCOA/findAcceptAction.js

@@ -1,21 +1,34 @@
 "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());
-    });
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || function (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.findAcceptAction = findAcceptAction;
-const factory = require("../../../factory");
+const factory = __importStar(require("../../../factory"));
 function findAcceptAction(params) {
-    return (repos) => __awaiter(this, void 0, void 0, function* () {
-        var _a, _b;
+    return async (repos) => {
         // タスク検索
-        const task = (yield repos.task.projectFields({
+        const task = (await repos.task.projectFields({
             limit: 1,
             page: 1,
             id: { $eq: params.sameAs.id },
@@ -25,39 +38,46 @@ function findAcceptAction(params) {
         if (task === undefined) {
             throw new factory.errors.NotFound(factory.taskName.AcceptCOAOffer);
         }
-        const errorByTask = (_a = task.executionResults.shift()) === null || _a === void 0 ? void 0 : _a.error;
+        const errorByTask = task.executionResults.shift()?.error;
         let defaultActionError;
         if (typeof errorByTask === 'string') {
             defaultActionError = { message: errorByTask };
         }
-        else if (typeof (errorByTask === null || errorByTask === void 0 ? void 0 : errorByTask.message) === 'string') {
+        else if (typeof errorByTask?.message === 'string') {
             defaultActionError = { message: errorByTask.message, name: errorByTask.name };
         }
-        let action = Object.assign({ actionStatus: factory.actionStatusType.PotentialActionStatus }, (defaultActionError !== undefined) ? { error: defaultActionError } : undefined);
+        let action = {
+            actionStatus: factory.actionStatusType.PotentialActionStatus,
+            ...(defaultActionError !== undefined) ? { error: defaultActionError } : undefined
+        };
         switch (task.status) {
             case factory.taskStatus.Ready:
                 break;
             default:
                 // タスクがReadyでなければアクション検索
-                const acceptAction = (yield repos.action.searchBySameAs({
+                const acceptAction = (await repos.action.searchBySameAs({
                     sameAs: { id: { $eq: task.id } },
                     typeOf: { $eq: factory.actionType.AcceptAction }
                     // purpose: { id: { $eq: String(params.purpose.id) } }
                 })).shift();
                 if (acceptAction !== undefined) {
                     // purpose検証
-                    if (((_b = acceptAction.purpose) === null || _b === void 0 ? void 0 : _b.id) !== params.purpose.id) {
+                    if (acceptAction.purpose?.id !== params.purpose.id) {
                         throw new factory.errors.NotFound('Action');
                     }
-                    action = Object.assign({ id: acceptAction.id, actionStatus: acceptAction.actionStatus }, (acceptAction.error !== undefined)
-                        ? {
-                            error: (Array.isArray(acceptAction.error))
-                                ? acceptAction.error[0]
-                                : acceptAction.error
-                        }
-                        : undefined);
+                    action = {
+                        id: acceptAction.id,
+                        actionStatus: acceptAction.actionStatus,
+                        ...(acceptAction.error !== undefined)
+                            ? {
+                                error: (Array.isArray(acceptAction.error))
+                                    ? acceptAction.error[0]
+                                    : acceptAction.error
+                            }
+                            : undefined
+                    };
                 }
         }
         return action;
-    });
+    };
 }

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

@@ -1,7 +1,30 @@
 "use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || function (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.createCompoundPriceSpec4event = createCompoundPriceSpec4event;
-const factory = require("../../factory");
+const factory = __importStar(require("../../factory"));
 function categoryCodeChargePriceSpec2component(params) {
     return {
         id: params.id,
@@ -40,9 +63,7 @@ function mvtkChargePriceSpec2component(params) {
         // ...(typeof params.accounting?.typeOf === 'string') ? { accounting: params.accounting } : undefined // 不要(2024-12-15~)
     };
 }
-// tslint:disable-next-line:max-func-body-length
 function createCompoundPriceSpec4event(params) {
-    var _a;
     // priceSpecificationはマスタ管理の仕様上必ず存在するはず
     if (params.offer.priceSpecification === undefined) {
         throw new factory.errors.NotFound(`priceSpecification of the offer: ${params.offer.id}`);
@@ -51,7 +72,7 @@ function createCompoundPriceSpec4event(params) {
     let soundFormatChargeSpecComponents = [];
     let potentialSeatingTypeChargeSpecComponents = [];
     // 区分加算料金を適用しないオプションを追加(2023-01-26~)
-    const ignoreCategoryCodeChargeSpec = ((_a = params.offer.settings) === null || _a === void 0 ? void 0 : _a.ignoreCategoryCodeChargeSpec) === true;
+    const ignoreCategoryCodeChargeSpec = params.offer.settings?.ignoreCategoryCodeChargeSpec === true;
     if (!ignoreCategoryCodeChargeSpec) {
         videoFormatChargeSpecComponents = params.videoFormatChargeSpecs.map(categoryCodeChargePriceSpec2component);
         soundFormatChargeSpecComponents = params.soundFormatChargeSpecs.map(categoryCodeChargePriceSpec2component);
@@ -71,7 +92,10 @@ function createCompoundPriceSpec4event(params) {
                 }];
         }
     }
-    const unitPriceSpec = Object.assign(Object.assign({}, params.offer.priceSpecification), { name: params.offer.name });
+    const unitPriceSpec = {
+        ...params.offer.priceSpecification,
+        name: params.offer.name
+    };
     const mvtkPriceComponents = [];
     // 複数決済カード対応(2022-07-11~)
     if (Array.isArray(unitPriceSpec.appliesToMovieTicket)) {
@@ -80,8 +104,7 @@ function createCompoundPriceSpec4event(params) {
             // すべての上映方式に該当する加算料金を追加
             params.videoFormatTypes.forEach((videoFormatType) => {
                 let existingMvtkSpec4appliesToMovieTicket = params.movieTicketTypeChargeSpecs.find((s) => {
-                    var _a;
-                    return ((_a = s.appliesToMovieTicket.serviceOutput) === null || _a === void 0 ? void 0 : _a.typeOf) === appliesToMovieTicket.serviceOutput.typeOf
+                    return s.appliesToMovieTicket.serviceOutput?.typeOf === appliesToMovieTicket.serviceOutput.typeOf
                         && s.appliesToMovieTicket.serviceType === appliesToMovieTicket.serviceType
                         && s.appliesToVideoFormat === videoFormatType;
                 });
@@ -123,10 +146,20 @@ function createCompoundPriceSpec4event(params) {
     };
     // 必要な属性のみに限定(2023-02-24~)
     const { acceptedPaymentMethod, name, description, alternateName, color, typeOf, id, availability, category, eligibleMembershipType, eligibleSeatingType, eligibleMonetaryAmount, eligibleSubReservation, priceCurrency, validFrom, validThrough, validRateLimit, additionalProperty, identifier, itemOffered, offerIndex, parentOffer } = params.offer;
-    return Object.assign(Object.assign(Object.assign(Object.assign(Object.assign({ name, description, alternateName, color, typeOf, id,
+    return {
+        name, description, alternateName, color, typeOf, id,
         category,
         eligibleMembershipType, eligibleSeatingType, eligibleMonetaryAmount, eligibleSubReservation,
         priceCurrency,
         validFrom, validThrough, validRateLimit, additionalProperty,
-        identifier, itemOffered, addOn: params.addOn, eligibleQuantity: params.eligibleQuantity, priceSpecification: compoundPriceSpecification }, (typeof params.availability === 'string') ? { availability: params.availability } : { availability }), (typeof params.sortIndex === 'number') ? { sortIndex: params.sortIndex } : undefined), (typeof offerIndex === 'number') ? { offerIndex } : undefined), (typeof (parentOffer === null || parentOffer === void 0 ? void 0 : parentOffer.id) === 'string') ? { parentOffer: { id: parentOffer.id } } : undefined), (Array.isArray(acceptedPaymentMethod)) ? { acceptedPaymentMethod } : undefined);
+        identifier, itemOffered,
+        addOn: params.addOn,
+        eligibleQuantity: params.eligibleQuantity,
+        priceSpecification: compoundPriceSpecification,
+        ...(typeof params.availability === 'string') ? { availability: params.availability } : { availability },
+        ...(typeof params.sortIndex === 'number') ? { sortIndex: params.sortIndex } : undefined,
+        ...(typeof offerIndex === 'number') ? { offerIndex } : undefined,
+        ...(typeof parentOffer?.id === 'string') ? { parentOffer: { id: parentOffer.id } } : undefined,
+        ...(Array.isArray(acceptedPaymentMethod)) ? { acceptedPaymentMethod } : undefined
+    };
 }