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

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");
@@ -19,23 +10,21 @@ const factory = 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 +35,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 +51,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 +100,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 +119,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 +140,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 +149,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 +157,7 @@ function changeOffers(params) {
             throw error;
         }
         // 承認アクションを再完了
-        yield repos.action.reCompleteAuthorizeEventOfferAction({
+        await repos.action.reCompleteAuthorizeEventOfferAction({
             id: params.id,
             object: authorizeAction.object,
             result: actionResult
@@ -166,7 +167,7 @@ function changeOffers(params) {
             instrument: authorizeAction.instrument,
             result: actionResult
         };
-    });
+    };
 }
 function validate4changeOffer(params) {
     // アクション中のイベント識別子と座席リストが合っているかどうか確認
@@ -177,7 +178,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 +194,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,11 @@
 "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.findAcceptAction = findAcceptAction;
 const factory = 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 +15,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

@@ -40,9 +40,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 +49,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 +69,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 +81,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 +123,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
+    };
 }

package/lib/chevre/service/offer/moneyTransfer/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");
@@ -16,8 +7,8 @@ const MoneyTransferAssetTransactionService = require("../../assetTransaction/mon
 const publishOrderNumberIfNotExist_1 = require("../../transaction/placeOrder/publishOrderNumberIfNotExist");
 const any_1 = require("../any");
 function authorize(params) {
-    return (repos) => __awaiter(this, void 0, void 0, function* () {
-        const transaction = yield repos.transaction.projectFieldsInProgressById({
+    return async (repos) => {
+        const transaction = await repos.transaction.projectFieldsInProgressById({
             typeOf: params.purpose.typeOf,
             id: params.purpose.id
         }, ['seller', 'project', 'agent', 'typeOf']);
@@ -25,13 +16,13 @@ function authorize(params) {
             throw new factory.errors.Forbidden('Transaction not yours');
         }
         const now = new Date();
-        const orderNumber = yield (0, publishOrderNumberIfNotExist_1.publishOrderNumberIfNotExist)({
+        const orderNumber = await (0, publishOrderNumberIfNotExist_1.publishOrderNumberIfNotExist)({
             project: { id: params.project.id },
             id: transaction.id,
             object: { orderDate: now }
         })(repos);
         // まず取引番号発行
-        const { transactionNumber } = yield repos.transactionNumber.publishByTimestamp({ startDate: now });
+        const { transactionNumber } = await repos.transactionNumber.publishByTimestamp({ startDate: now });
         let requestBody;
         let responseBody;
         let acceptedOffers4result = [];
@@ -41,11 +32,11 @@ function authorize(params) {
             object: params.object,
             transactionNumber
         });
-        const action = yield repos.action.start(actionAttributes);
+        const action = await repos.action.start(actionAttributes);
         // priceを確定する
         let price = 0;
         try {
-            const startDepositTransactionResult = yield processStartDepositTransaction({
+            const startDepositTransactionResult = await processStartDepositTransaction({
                 project: params.project,
                 transaction: transaction,
                 object: params.object,
@@ -58,7 +49,7 @@ function authorize(params) {
                 price = Number(responseBody.object.amount.value);
             }
             acceptedOffers4result = responseBody2resultAcceptedOffer({ responseBody, object: actionAttributes.object });
-            yield (0, any_1.acceptOffer)({
+            await (0, any_1.acceptOffer)({
                 orderNumber,
                 project: transaction.project,
                 acceptedOffers: acceptedOffers4result
@@ -66,7 +57,7 @@ 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 (__) {
                 // 失敗したら仕方ない
@@ -80,12 +71,11 @@ function authorize(params) {
             responseBody
             // acceptedOffers: acceptedOffers4result // discontinue(2024-06-17~)
         };
-        yield repos.action.completeWithVoid({ typeOf: action.typeOf, id: action.id, result: result });
+        await repos.action.completeWithVoid({ typeOf: action.typeOf, id: action.id, result: result });
         return { id: action.id };
-    });
+    };
 }
 function responseBody2resultAcceptedOffer(params) {
-    var _a;
     const acceptedOffers = [];
     const { typeOf, transactionNumber } = params.responseBody;
     const amountValue = params.responseBody.object.amount.value;
@@ -101,7 +91,7 @@ function responseBody2resultAcceptedOffer(params) {
             typeOf: params.object.itemOffered.toLocation.typeOf,
             // いったんマスク
             identifier: 'xxx',
-            issuedThrough: { id: (_a = params.object.itemOffered.toLocation.issuedThrough) === null || _a === void 0 ? void 0 : _a.id }
+            issuedThrough: { id: params.object.itemOffered.toLocation.issuedThrough?.id }
         },
         object: {
             // MonetaryAmountの識別子として、MoneyTransfer取引番号をセットする
@@ -117,7 +107,6 @@ function responseBody2resultAcceptedOffer(params) {
     return acceptedOffers;
 }
 function createAuthorizeMoneyTransferOfferActionattributes(params) {
-    var _a, _b;
     const transaction = params.transaction;
     const seller = transaction.seller;
     return {
@@ -130,16 +119,23 @@ function createAuthorizeMoneyTransferOfferActionattributes(params) {
         object: {
             project: { typeOf: transaction.project.typeOf, id: transaction.project.id },
             typeOf: factory.offerType.Offer,
-            itemOffered: Object.assign(Object.assign({ typeOf: factory.actionType.MoneyTransfer, amount: params.object.itemOffered.amount, toLocation: params.object.itemOffered.toLocation, object: {
+            itemOffered: {
+                typeOf: factory.actionType.MoneyTransfer,
+                amount: params.object.itemOffered.amount,
+                toLocation: params.object.itemOffered.toLocation,
+                object: {
                     pendingTransaction: {
                         typeOf: factory.assetTransactionType.MoneyTransfer,
                         transactionNumber: params.transactionNumber
                     }
-                } }, (typeof params.object.itemOffered.description === 'string')
-                ? { description: params.object.itemOffered.description }
-                : undefined), (typeof params.object.itemOffered.name === 'string')
-                ? { name: params.object.itemOffered.name }
-                : undefined),
+                },
+                ...(typeof params.object.itemOffered.description === 'string')
+                    ? { description: params.object.itemOffered.description }
+                    : undefined,
+                ...(typeof params.object.itemOffered.name === 'string')
+                    ? { name: params.object.itemOffered.name }
+                    : undefined
+            },
             seller: {
                 // ...transaction.seller,
                 // project: transaction.project,
@@ -147,7 +143,7 @@ function createAuthorizeMoneyTransferOfferActionattributes(params) {
                 typeOf: transaction.seller.typeOf,
                 name: (typeof transaction.seller.name === 'string')
                     ? transaction.seller.name
-                    : String((_a = transaction.seller.name) === null || _a === void 0 ? void 0 : _a.ja)
+                    : String(transaction.seller.name?.ja)
             },
             priceCurrency: factory.priceCurrency.JPY
         },
@@ -156,7 +152,7 @@ function createAuthorizeMoneyTransferOfferActionattributes(params) {
             typeOf: seller.typeOf,
             name: (typeof seller.name === 'string')
                 ? seller.name
-                : String((_b = seller.name) === null || _b === void 0 ? void 0 : _b.ja)
+                : String(seller.name?.ja)
         },
         recipient: {
             id: transaction.agent.id,
@@ -166,8 +162,7 @@ function createAuthorizeMoneyTransferOfferActionattributes(params) {
     };
 }
 function processStartDepositTransaction(params) {
-    return (repos) => __awaiter(this, void 0, void 0, function* () {
-        var _a, _b;
+    return async (repos) => {
         let requestBody;
         let responseBody;
         try {
@@ -179,7 +174,7 @@ function processStartDepositTransaction(params) {
             const toLocation = {
                 typeOf: factory.permit.PermitType.Permit,
                 identifier: params.object.itemOffered.toLocation.identifier,
-                issuedThrough: { id: (_a = params.object.itemOffered.toLocation.issuedThrough) === null || _a === void 0 ? void 0 : _a.id }
+                issuedThrough: { id: params.object.itemOffered.toLocation.issuedThrough?.id }
             };
             // 販売者が取引人に入金
             requestBody = {
@@ -192,7 +187,7 @@ function processStartDepositTransaction(params) {
                     id: String(params.transaction.seller.id),
                     name: (typeof params.transaction.seller.name === 'string')
                         ? params.transaction.seller.name
-                        : String((_b = params.transaction.seller.name) === null || _b === void 0 ? void 0 : _b.ja)
+                        : String(params.transaction.seller.name?.ja)
                 },
                 object: {
                     amount: {
@@ -223,11 +218,11 @@ function processStartDepositTransaction(params) {
                 },
                 expires: expires
             };
-            responseBody = yield MoneyTransferAssetTransactionService.start(requestBody)(repos);
+            responseBody = await MoneyTransferAssetTransactionService.start(requestBody)(repos);
         }
         catch (error) {
             throw error;
         }
         return { requestBody, responseBody };
-    });
+    };
 }

package/lib/chevre/service/offer/moneyTransfer/returnMoneyTransfer.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.returnMoneyTransfer = returnMoneyTransfer;
 const moment = require("moment");
@@ -18,12 +9,12 @@ const MoneyTransferAssetTransactionService = require("../../assetTransaction/mon
  * 入金を返却する
  */
 function returnMoneyTransfer(params) {
-    return (repos) => __awaiter(this, void 0, void 0, function* () {
-        const action = yield repos.action.start(params);
+    return async (repos) => {
+        const action = await repos.action.start(params);
         try {
             // 取引番号で通貨転送取引を検索
             const transactionNumber = params.object.object.transactionNumber;
-            const existingAssetTransactions = yield repos.assetTransaction.search({
+            const existingAssetTransactions = await repos.assetTransaction.search({
                 limit: 1,
                 page: 1,
                 project: { id: { $eq: params.project.id } },
@@ -37,8 +28,8 @@ function returnMoneyTransfer(params) {
                 // 入金時の資産取引に対して一意な識別子をMoneyTransfer資産取引指定する
                 const identifier2withdrawAssetTransaction = util.format('%s:%s:%s', params.project.id, 'returnMoneyTransfer', depositTransaction.transactionNumber);
                 // まず取引番号発行
-                const publishTransactionNumber4returnMoneyTransferResult = yield repos.transactionNumber.publishByTimestamp({ startDate: new Date() });
-                const withdrawTransaction = yield MoneyTransferAssetTransactionService.start({
+                const publishTransactionNumber4returnMoneyTransferResult = await repos.transactionNumber.publishByTimestamp({ startDate: new Date() });
+                const withdrawTransaction = await MoneyTransferAssetTransactionService.start({
                     identifier: identifier2withdrawAssetTransaction,
                     project: depositTransaction.project,
                     transactionNumber: publishTransactionNumber4returnMoneyTransferResult.transactionNumber,
@@ -61,12 +52,12 @@ function returnMoneyTransfer(params) {
                         }
                     }
                 })(repos);
-                yield MoneyTransferAssetTransactionService.confirm({ id: withdrawTransaction.id })(repos);
+                await MoneyTransferAssetTransactionService.confirm({ id: withdrawTransaction.id })(repos);
             }
         }
         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
@@ -74,6 +65,6 @@ function returnMoneyTransfer(params) {
             throw error;
         }
         const actionResult = {};
-        yield repos.action.completeWithVoid({ typeOf: action.typeOf, id: action.id, result: actionResult });
-    });
+        await repos.action.completeWithVoid({ typeOf: action.typeOf, id: action.id, result: actionResult });
+    };
 }