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

package/lib/chevre/service/offer/eventServiceByCOA/authorize/validateAcceptedOffers.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.validateAcceptedOffers = validateAcceptedOffers;
 const factory = require("../../../../factory");
@@ -21,7 +12,7 @@ function createAppliesToMovieTicket(params) {
         if (typeof kbnMgtk !== 'string') {
             kbnMgtk = '';
         }
-        const availablePaymentMethodType = params.availablePaymentMethodTypes.find((categoryCode) => { var _a, _b; return ((_b = (_a = categoryCode.additionalProperty) === null || _a === void 0 ? void 0 : _a.find((property) => property.name === 'kbnMgtk')) === null || _b === void 0 ? void 0 : _b.value) === kbnMgtk; });
+        const availablePaymentMethodType = params.availablePaymentMethodTypes.find((categoryCode) => categoryCode.additionalProperty?.find((property) => property.name === 'kbnMgtk')?.value === kbnMgtk);
         if (availablePaymentMethodType === undefined) {
             throw new factory.errors.Argument('offer', `available payment method type not found for kbnMgtk: ${kbnMgtk}`);
         }
@@ -50,11 +41,10 @@ function createAppliesToMovieTicket(params) {
 }
 // tslint:disable-next-line:cyclomatic-complexity max-func-body-length
 function createPriceComponent(params) {
-    var _a, _b, _c, _d, _e, _f, _g, _h;
     const acceptedOffer = params.acceptedOffer;
     const availableUnitPriceOffer = params.availableUnitPriceOffer;
-    const kbnJoueihousiki = (_a = params.screeningEvent.superEvent.coaInfo) === null || _a === void 0 ? void 0 : _a.kbnJoueihousiki;
-    const appliesToVideoFormat = (typeof (kbnJoueihousiki === null || kbnJoueihousiki === void 0 ? void 0 : kbnJoueihousiki.kubunCode) === 'string')
+    const kbnJoueihousiki = params.screeningEvent.superEvent.coaInfo?.kbnJoueihousiki;
+    const appliesToVideoFormat = (typeof kbnJoueihousiki?.kubunCode === 'string')
         ? kbnJoueihousiki.kubunCode
         : 'Default';
     const { name, ticketInfo } = acceptedOffer;
@@ -68,12 +58,12 @@ function createPriceComponent(params) {
     let appliesToMovieTicket4surfrock;
     // let eligibleMonetaryAmount: [factory.offer.IEligibleMonetaryAmount] | undefined;
     // appliesToSurfrockの指定があれば強制的にMovieTicket決済
-    const appliesToSurfrockByUnitPriceOffer = (_b = availableUnitPriceOffer.priceSpecification.appliesToMovieTicket) === null || _b === void 0 ? void 0 : _b.at(0);
-    const surfrockIdentifier = (_d = (_c = acceptedOffer.priceSpecification) === null || _c === void 0 ? void 0 : _c.appliesToSurfrock) === null || _d === void 0 ? void 0 : _d.identifier;
-    const surfrockPaymentMethodType = (_g = (_f = (_e = acceptedOffer.priceSpecification) === null || _e === void 0 ? void 0 : _e.appliesToSurfrock) === null || _f === void 0 ? void 0 : _f.serviceOutput) === null || _g === void 0 ? void 0 : _g.typeOf;
+    const appliesToSurfrockByUnitPriceOffer = availableUnitPriceOffer.priceSpecification.appliesToMovieTicket?.at(0);
+    const surfrockIdentifier = acceptedOffer.priceSpecification?.appliesToSurfrock?.identifier;
+    const surfrockPaymentMethodType = acceptedOffer.priceSpecification?.appliesToSurfrock?.serviceOutput?.typeOf;
     if (typeof surfrockIdentifier === 'string' && surfrockIdentifier.length > 0
         && typeof surfrockPaymentMethodType === 'string' && surfrockPaymentMethodType.length > 0) {
-        const paymentMethodTypeByUnitPriceOffer = appliesToSurfrockByUnitPriceOffer === null || appliesToSurfrockByUnitPriceOffer === void 0 ? void 0 : appliesToSurfrockByUnitPriceOffer.serviceOutput.typeOf;
+        const paymentMethodTypeByUnitPriceOffer = appliesToSurfrockByUnitPriceOffer?.serviceOutput.typeOf;
         if (typeof paymentMethodTypeByUnitPriceOffer === 'string') {
             if (paymentMethodTypeByUnitPriceOffer !== surfrockPaymentMethodType) {
                 throw new factory.errors.Argument(`priceSpecification.appliesToSurfrock.serviceOutput.typeOf must be ${paymentMethodTypeByUnitPriceOffer}`);
@@ -105,7 +95,7 @@ function createPriceComponent(params) {
         // if (Array.isArray(availableUnitPriceOffer.eligibleMonetaryAmount)) {
         //     eligibleMonetaryAmount = availableUnitPriceOffer.eligibleMonetaryAmount;
         // }
-        if (typeof (appliesToSurfrockByUnitPriceOffer === null || appliesToSurfrockByUnitPriceOffer === void 0 ? void 0 : appliesToSurfrockByUnitPriceOffer.serviceType) === 'string') {
+        if (typeof appliesToSurfrockByUnitPriceOffer?.serviceType === 'string') {
             throw new factory.errors.ArgumentNull('priceSpecification.appliesToSurfrock');
         }
     }
@@ -146,33 +136,42 @@ function createPriceComponent(params) {
         // no op
         // referenceQuantity.value = 1;
     }
-    const unitPriceSpec = Object.assign({ typeOf: factory.priceSpecificationType.UnitPriceSpecification, name: { ja: ticketInfo.ticketName, en: ticketInfo.ticketNameEng }, price, priceCurrency: factory.priceCurrency.JPY, referenceQuantity, valueAddedTaxIncluded: true, accounting: {
+    const unitPriceSpec = {
+        typeOf: factory.priceSpecificationType.UnitPriceSpecification,
+        name: { ja: ticketInfo.ticketName, en: ticketInfo.ticketNameEng },
+        price,
+        priceCurrency: factory.priceCurrency.JPY,
+        referenceQuantity,
+        valueAddedTaxIncluded: true,
+        accounting: {
             typeOf: 'Accounting',
             accountsReceivable
-        } }, (appliesToMovieTicket !== undefined || appliesToMovieTicket4surfrock !== undefined)
-        ? {
-            appliesToMovieTicket: [
-                ...(appliesToMovieTicket !== undefined) ? [appliesToMovieTicket] : [],
-                ...(appliesToMovieTicket4surfrock !== undefined) ? [appliesToMovieTicket4surfrock] : []
-            ]
-        }
-        : undefined);
+        },
+        ...(appliesToMovieTicket !== undefined || appliesToMovieTicket4surfrock !== undefined)
+            ? {
+                appliesToMovieTicket: [
+                    ...(appliesToMovieTicket !== undefined) ? [appliesToMovieTicket] : [],
+                    ...(appliesToMovieTicket4surfrock !== undefined) ? [appliesToMovieTicket4surfrock] : []
+                ]
+            }
+            : undefined
+    };
     // 区分加算料金
     const categoryCodeChargeSpecs = [];
     // movieTicketTypeChargePriceSpecにaddPriceが含まれる場合は除く
     if (movieTicketTypeChargePriceSpec === undefined) {
         if (ticketInfo.addPrice > 0) {
-            const videoFormatTypeCharge = (typeof (kbnJoueihousiki === null || kbnJoueihousiki === void 0 ? void 0 : kbnJoueihousiki.kubunAddPrice) === 'number') ? kbnJoueihousiki.kubunAddPrice : 0;
-            const kbnAcoustic = (_h = params.screeningEvent.coaInfo) === null || _h === void 0 ? void 0 : _h.kbnAcoustic;
-            const soundFormatTypeCharge = (typeof (kbnAcoustic === null || kbnAcoustic === void 0 ? void 0 : kbnAcoustic.kubunAddPrice) === 'number') ? kbnAcoustic.kubunAddPrice : 0;
+            const videoFormatTypeCharge = (typeof kbnJoueihousiki?.kubunAddPrice === 'number') ? kbnJoueihousiki.kubunAddPrice : 0;
+            const kbnAcoustic = params.screeningEvent.coaInfo?.kbnAcoustic;
+            const soundFormatTypeCharge = (typeof kbnAcoustic?.kubunAddPrice === 'number') ? kbnAcoustic.kubunAddPrice : 0;
             // 上映方式区分加算料金と音響区分加算料金を考慮する
             if (videoFormatTypeCharge > 0) {
                 categoryCodeChargeSpecs.push({
                     name: {
-                        en: (typeof (kbnJoueihousiki === null || kbnJoueihousiki === void 0 ? void 0 : kbnJoueihousiki.kubunNameEng) === 'string')
+                        en: (typeof kbnJoueihousiki?.kubunNameEng === 'string')
                             ? kbnJoueihousiki.kubunNameEng
-                            : String(kbnJoueihousiki === null || kbnJoueihousiki === void 0 ? void 0 : kbnJoueihousiki.kubunCode),
-                        ja: (typeof (kbnJoueihousiki === null || kbnJoueihousiki === void 0 ? void 0 : kbnJoueihousiki.kubunName) === 'string')
+                            : String(kbnJoueihousiki?.kubunCode),
+                        ja: (typeof kbnJoueihousiki?.kubunName === 'string')
                             ? `${kbnJoueihousiki.kubunName}加算料金`
                             : '加算単価'
                     },
@@ -181,7 +180,7 @@ function createPriceComponent(params) {
                     typeOf: factory.priceSpecificationType.CategoryCodeChargeSpecification,
                     appliesToCategoryCode: [{
                             typeOf: 'CategoryCode',
-                            codeValue: String(kbnJoueihousiki === null || kbnJoueihousiki === void 0 ? void 0 : kbnJoueihousiki.kubunCode),
+                            codeValue: String(kbnJoueihousiki?.kubunCode),
                             inCodeSet: {
                                 typeOf: 'CategoryCodeSet',
                                 identifier: factory.categoryCode.CategorySetIdentifier.VideoFormatType
@@ -193,10 +192,10 @@ function createPriceComponent(params) {
             if (soundFormatTypeCharge > 0) {
                 categoryCodeChargeSpecs.push({
                     name: {
-                        en: (typeof (kbnAcoustic === null || kbnAcoustic === void 0 ? void 0 : kbnAcoustic.kubunNameEng) === 'string')
+                        en: (typeof kbnAcoustic?.kubunNameEng === 'string')
                             ? kbnAcoustic.kubunNameEng
-                            : String(kbnAcoustic === null || kbnAcoustic === void 0 ? void 0 : kbnAcoustic.kubunCode),
-                        ja: (typeof (kbnAcoustic === null || kbnAcoustic === void 0 ? void 0 : kbnAcoustic.kubunName) === 'string')
+                            : String(kbnAcoustic?.kubunCode),
+                        ja: (typeof kbnAcoustic?.kubunName === 'string')
                             ? `${kbnAcoustic.kubunName}加算料金`
                             : '加算単価'
                     },
@@ -205,7 +204,7 @@ function createPriceComponent(params) {
                     typeOf: factory.priceSpecificationType.CategoryCodeChargeSpecification,
                     appliesToCategoryCode: [{
                             typeOf: 'CategoryCode',
-                            codeValue: String(kbnAcoustic === null || kbnAcoustic === void 0 ? void 0 : kbnAcoustic.kubunCode),
+                            codeValue: String(kbnAcoustic?.kubunCode),
                             inCodeSet: {
                                 typeOf: 'CategoryCodeSet',
                                 identifier: factory.categoryCode.CategorySetIdentifier.SoundFormatType
@@ -220,10 +219,10 @@ function createPriceComponent(params) {
         const existingSeatingType = params.seatingTypes.find((seatingType) => seatingType.codeValue === ticketInfo.spseatKbn);
         categoryCodeChargeSpecs.push({
             name: {
-                en: (typeof (existingSeatingType === null || existingSeatingType === void 0 ? void 0 : existingSeatingType.name.en) === 'string')
+                en: (typeof existingSeatingType?.name.en === 'string')
                     ? `${existingSeatingType.name.en}`
                     : ticketInfo.spseatKbn,
-                ja: (typeof (existingSeatingType === null || existingSeatingType === void 0 ? void 0 : existingSeatingType.name.ja) === 'string')
+                ja: (typeof existingSeatingType?.name.ja === 'string')
                     ? `${existingSeatingType.name.ja}加算料金`
                     : '特別席加算額'
             },
@@ -309,9 +308,8 @@ function createPriceComponent(params) {
 // tslint:disable-next-line:max-func-body-length
 function validateAcceptedOffers(params) {
     // tslint:disable-next-line:max-func-body-length
-    return (repos) => __awaiter(this, void 0, void 0, function* () {
-        var _a;
-        const theaterCode = String((_a = params.screeningEvent.coaInfo) === null || _a === void 0 ? void 0 : _a.theaterCode);
+    return async (repos) => {
+        const theaterCode = String(params.screeningEvent.coaInfo?.theaterCode);
         const offerIdentifiers = (Array.isArray(params.object.acceptedOffer))
             ? [...new Set((params.object.acceptedOffer).map((o) => {
                     return `COA-${theaterCode}-${String(o.ticketInfo.ticketCode)}`;
@@ -321,16 +319,14 @@ function validateAcceptedOffers(params) {
         // 指定された単価オファーを検索
         // ticketCodeで検索(2023-03-22~)
         if (offerIdentifiers.length > 0) {
-            availableUnitPriceOffers = yield repos.offer.search({
+            availableUnitPriceOffers = await repos.offer.search({
                 identifier: { $in: offerIdentifiers },
                 project: { id: { $eq: params.project.id } }
             });
         }
         const acceptedOffers = params.object.acceptedOffer.map((acceptedOffer) => {
-            var _a, _b;
             const availableUnitPriceOffer = availableUnitPriceOffers.find((unitPriceOffer) => {
-                var _a, _b;
-                const ticketCodeByUnitPriceOffer = (_b = (_a = unitPriceOffer.additionalProperty) === null || _a === void 0 ? void 0 : _a.find((p) => p.name === 'ticketCode')) === null || _b === void 0 ? void 0 : _b.value;
+                const ticketCodeByUnitPriceOffer = unitPriceOffer.additionalProperty?.find((p) => p.name === 'ticketCode')?.value;
                 return ticketCodeByUnitPriceOffer === acceptedOffer.ticketInfo.ticketCode;
             });
             if (availableUnitPriceOffer === undefined) {
@@ -366,23 +362,35 @@ function validateAcceptedOffers(params) {
                 ticketInfo.addGlasses,
                 ticketInfo.spseatAdd1
             ].reduce((a, b) => a + b, 0);
-            const usePointValue = (_b = (_a = availableUnitPriceOffer.additionalProperty) === null || _a === void 0 ? void 0 : _a.find((p) => p.name === 'usePoint')) === null || _b === void 0 ? void 0 : _b.value;
-            return Object.assign({ additionalProperty,
+            const usePointValue = availableUnitPriceOffer.additionalProperty?.find((p) => p.name === 'usePoint')?.value;
+            return {
+                additionalProperty,
                 itemOffered,
                 name,
                 price,
-                priceSpecification, ticketInfo: Object.assign(Object.assign({}, ticketInfo), { 
+                priceSpecification,
+                ticketInfo: {
+                    ...ticketInfo,
                     // usePointを自動設定(2023-03-22~)
-                    usePoint: (typeof usePointValue === 'string') ? Number(usePointValue) : 0, salePrice // COAに渡す販売金額を上書き(2023-03-20~)
-                 }), 
+                    usePoint: (typeof usePointValue === 'string') ? Number(usePointValue) : 0,
+                    salePrice // COAに渡す販売金額を上書き(2023-03-20~)
+                },
                 // 以下属性については単価オファーから読む(2023-03-09~)
-                priceCurrency: availableUnitPriceOffer.priceCurrency, id: availableUnitPriceOffer.id, identifier: availableUnitPriceOffer.identifier, typeOf: availableUnitPriceOffer.typeOf }, {
-            // discontinue(2025-01-03~)
-            // seatNumber: itemOffered.serviceOutput?.reservedTicket?.ticketedSeat?.seatNumber,
-            // discontinue(2025-01-03~)
-            // seatSection: itemOffered.serviceOutput?.reservedTicket?.ticketedSeat?.seatSection
-            });
+                priceCurrency: availableUnitPriceOffer.priceCurrency,
+                id: availableUnitPriceOffer.id,
+                identifier: availableUnitPriceOffer.identifier,
+                typeOf: availableUnitPriceOffer.typeOf,
+                // discontinue eligibleMonetaryAmount(2025-01-03~)
+                // ...(Array.isArray(eligibleMonetaryAmount)) ? { eligibleMonetaryAmount } : undefined,
+                // ↓互換性維持対応として
+                ...{
+                // discontinue(2025-01-03~)
+                // seatNumber: itemOffered.serviceOutput?.reservedTicket?.ticketedSeat?.seatNumber,
+                // discontinue(2025-01-03~)
+                // seatSection: itemOffered.serviceOutput?.reservedTicket?.ticketedSeat?.seatSection
+                }
+            };
         });
         return { acceptedOffers };
-    });
+    };
 }

package/lib/chevre/service/offer/eventServiceByCOA/authorize.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.authorize = authorize;
 const moment = require("moment");
@@ -21,9 +12,8 @@ const factory = require("../../../factory");
  */
 function authorize(params) {
     // tslint:disable-next-line:max-func-body-length
-    return (repos) => __awaiter(this, void 0, void 0, function* () {
-        var _a;
-        const transaction = yield repos.transaction.projectFieldsInProgressById({
+    return async (repos) => {
+        const transaction = await repos.transaction.projectFieldsInProgressById({
             typeOf: factory.transactionType.PlaceOrder,
             id: params.transaction.id
         }, ['agent', 'project', 'seller', 'typeOf', 'instrument']);
@@ -31,7 +21,7 @@ function authorize(params) {
             throw new factory.errors.Forbidden('Transaction not yours');
         }
         // クライアント検証(2024-02-07~)
-        const instrumentId = (_a = transaction.instrument) === null || _a === void 0 ? void 0 : _a.id;
+        const instrumentId = transaction.instrument?.id;
         if (typeof instrumentId === 'string' && instrumentId !== params.store.id) {
             throw new factory.errors.Forbidden('client not match that of the transaction');
         }
@@ -48,25 +38,25 @@ function authorize(params) {
             typeOf: factory.assetTransactionType.COAReserveTransaction
         };
         try {
-            screeningEvent = yield repos.event.projectEventFieldsById({ id: params.object.event.id }, [
+            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 validateAcceptedOffersResult = yield (0, validateAcceptedOffers_1.validateAcceptedOffers)({
+            const validateAcceptedOffersResult = await (0, validateAcceptedOffers_1.validateAcceptedOffers)({
                 object: params.object,
                 project: { id: transaction.project.id },
                 screeningEvent,
@@ -85,8 +75,8 @@ function authorize(params) {
                 transaction,
                 pendingTransaction
             });
-            const failedAction = yield repos.action.start(failedActionAttributes);
-            yield repos.action.giveUp({ typeOf: failedAction.typeOf, id: failedAction.id, error });
+            const failedAction = await repos.action.start(failedActionAttributes);
+            await repos.action.giveUp({ typeOf: failedAction.typeOf, id: failedAction.id, error });
             throw error;
         }
         // const now = new Date();
@@ -95,7 +85,7 @@ function authorize(params) {
         //     id: transaction.id,
         //     object: { orderDate: now }
         // })(repos);
-        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');
@@ -109,7 +99,7 @@ function authorize(params) {
             transaction,
             pendingTransaction
         });
-        const action = yield repos.action.start(actionAttributes);
+        const action = await repos.action.start(actionAttributes);
         try {
             // 座席仮予約からオファー情報を生成する
             const { price, eligibleMonetaryAmount } = (0, factory_1.offers2resultPrice)(acceptedOffers);
@@ -134,7 +124,7 @@ function authorize(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
@@ -143,18 +133,18 @@ function authorize(params) {
         }
         catch (error) {
             try {
-                yield repos.action.giveUp({ typeOf: action.typeOf, id: action.id, error });
+                await repos.action.giveUp({ typeOf: action.typeOf, id: action.id, error });
             }
             catch (__) {
                 // no op
             }
             throw error;
         }
-        yield repos.action.completeWithVoid({ typeOf: action.typeOf, id: action.id, result });
+        await repos.action.completeWithVoid({ typeOf: action.typeOf, id: action.id, result });
         return {
             id: action.id,
             instrument: actionAttributes.instrument,
             result
         };
-    });
+    };
 }

package/lib/chevre/service/offer/eventServiceByCOA/authorizeByAcceptAction.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.authorizeByAcceptAction = authorizeByAcceptAction;
 const authorize_1 = require("./authorize");
@@ -17,9 +8,8 @@ const factory = require("../../../factory");
  * 採用アクションからCOA興行オファー承認
  */
 function authorizeByAcceptAction(params) {
-    return (repos) => __awaiter(this, void 0, void 0, function* () {
-        var _a, _b, _c, _d, _e, _f;
-        const acceptAction = (yield repos.action.search({
+    return async (repos) => {
+        const acceptAction = (await repos.action.search({
             limit: 1,
             page: 1,
             project: { id: { $eq: params.project.id } },
@@ -50,19 +40,19 @@ function authorizeByAcceptAction(params) {
                 // useCreateOrderOnOfferAccepted: USE_CREATE_ORDER_ON_OFFER_ACCEPTED // discontinue(2024-05-28~)
                 }
             };
-            action = yield (0, changeOffers_1.changeOffers)(changeOfferParams)(repos);
+            action = await (0, changeOffers_1.changeOffers)(changeOfferParams)(repos);
         }
         else {
             // recipe依存へ変更(2024-06-11~)
-            const recipe = yield repos.action.findRecipeByAction({
+            const recipe = await repos.action.findRecipeByAction({
                 project: { id: params.project.id },
                 recipeFor: { id: params.object.id }
             });
-            const requestBody = (_c = (_b = (_a = recipe === null || recipe === void 0 ? void 0 : 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 requestBody = recipe?.step[0]?.itemListElement[0]?.itemListElement[0]?.beforeMedia;
             if (requestBody === undefined) {
                 throw new factory.errors.NotFound('beforeMedia by recipe');
             }
-            const responseBody = (_f = (_e = (_d = recipe === null || recipe === void 0 ? void 0 : 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 responseBody = recipe?.step[0]?.itemListElement[0]?.itemListElement[0]?.afterMedia;
             if (responseBody === undefined) {
                 throw new factory.errors.NotFound('afterMedia by recipe');
             }
@@ -88,8 +78,8 @@ function authorizeByAcceptAction(params) {
                 // useCreateOrderOnOfferAccepted: USE_CREATE_ORDER_ON_OFFER_ACCEPTED // discontinue(2024-05-28~)
                 }
             };
-            action = yield (0, authorize_1.authorize)(authorizeParams)(repos);
+            action = await (0, authorize_1.authorize)(authorizeParams)(repos);
         }
         return action;
-    });
+    };
 }

package/lib/chevre/service/offer/eventServiceByCOA/changeOffers.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.changeOffers = changeOffers;
 const moment = require("moment");
@@ -20,22 +11,21 @@ const factory = require("../../../factory");
  */
 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 +36,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 +52,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 +101,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');
         }
@@ -123,15 +120,20 @@ function changeOffers(params) {
                 .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 +141,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 +150,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 +158,7 @@ function changeOffers(params) {
             throw error;
         }
         // 承認アクションを再完了
-        yield repos.action.reCompleteAuthorizeEventOfferAction({
+        await repos.action.reCompleteAuthorizeEventOfferAction({
             id: params.id,
             object: authorizeAction.object,
             result: actionResult
@@ -166,7 +168,7 @@ function changeOffers(params) {
             instrument: authorizeAction.instrument,
             result: actionResult
         };
-    });
+    };
 }
 function validate4changeOffer(params) {
     // アクション中のイベント識別子と座席リストが合っているかどうか確認
@@ -194,11 +196,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;