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

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

@@ -42,7 +42,6 @@ function mvtkChargePriceSpec2component(params) {
 }
 // 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 +50,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 +70,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 +82,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 +124,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 });
+    };
 }

package/lib/chevre/service/offer/moneyTransfer/settleTransaction.js

@@ -1,27 +1,18 @@
 "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.settleTransaction = settleTransaction;
 const factory = require("../../../factory");
 const MoneyTransferAssetTransactionService = require("../../assetTransaction/moneyTransfer");
 function settleTransaction(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 {
             // 廃止(2024-01-30~)
             // if (typeof params.object.pendingTransaction.id === 'string' && params.object.pendingTransaction.id.length > 0) {
             //     await MoneyTransferAssetTransactionService.confirm({ id: params.object.pendingTransaction.id })(repos);
             // }
             if (typeof params.object.transactionNumber === 'string' && params.object.transactionNumber.length > 0) {
-                yield MoneyTransferAssetTransactionService.confirm({ transactionNumber: params.object.transactionNumber })(repos);
+                await MoneyTransferAssetTransactionService.confirm({ transactionNumber: params.object.transactionNumber })(repos);
             }
             else {
                 throw new factory.errors.ArgumentNull('object.transactionNumber');
@@ -29,7 +20,7 @@ function settleTransaction(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
@@ -37,14 +28,14 @@ function settleTransaction(params) {
             throw error;
         }
         const actionResult = {};
-        yield repos.action.completeWithVoid({ typeOf: action.typeOf, id: action.id, result: actionResult });
-        yield onConfirmed(params)({
+        await repos.action.completeWithVoid({ typeOf: action.typeOf, id: action.id, result: actionResult });
+        await onConfirmed(params)({
             task: repos.task
         });
-    });
+    };
 }
 function onConfirmed(params) {
-    return (repos) => __awaiter(this, void 0, void 0, function* () {
+    return async (repos) => {
         if (params.purpose.typeOf === factory.order.OrderType.Order) {
             // タスク冪等作成
             const onAssetTransactionStatusChangedTaskData = {
@@ -71,7 +62,7 @@ function onConfirmed(params) {
                 executionResults: [],
                 data: onAssetTransactionStatusChangedTaskData
             };
-            yield repos.task.createOnAssetTransactionStatusChangedTaskIfNotExist(onAssetTransactionStatusChangedTask, { emitImmediately: true });
+            await repos.task.createOnAssetTransactionStatusChangedTaskIfNotExist(onAssetTransactionStatusChangedTask, { emitImmediately: true });
         }
-    });
+    };
 }

package/lib/chevre/service/offer/moneyTransfer/voidTransaction.js

@@ -1,29 +1,20 @@
 "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.voidTransaction = voidTransaction;
 const factory = require("../../../factory");
 const MoneyTransferAssetTransactionService = require("../../assetTransaction/moneyTransfer");
 function voidTransaction(params) {
-    return (repos) => __awaiter(this, void 0, void 0, function* () {
+    return async (repos) => {
         let transaction;
         if (params.agent !== undefined && params.agent !== null && typeof params.agent.id === 'string') {
-            transaction = (yield repos.transaction.projectFieldsInProgressById({
+            transaction = await repos.transaction.projectFieldsInProgressById({
                 typeOf: params.purpose.typeOf,
                 id: params.purpose.id
-            }, ['typeOf']));
+            }, ['typeOf']);
         }
         let authorizeActions;
         if (typeof params.id === 'string') {
-            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 (transaction !== undefined) {
                 if (authorizeAction.purpose.typeOf !== transaction.typeOf || authorizeAction.purpose.id !== transaction.id) {
@@ -33,23 +24,22 @@ function voidTransaction(params) {
             authorizeActions = [authorizeAction];
         }
         else {
-            authorizeActions = (yield repos.action.searchByPurpose({
+            authorizeActions = await repos.action.searchByPurpose({
                 typeOf: factory.actionType.AuthorizeAction,
                 purpose: {
                     typeOf: params.purpose.typeOf,
                     id: params.purpose.id
                 }
-            }));
+            });
             authorizeActions = authorizeActions.filter((a) => a.object.typeOf === factory.offerType.Offer)
-                .filter((a) => { var _a; return ((_a = a.object.itemOffered) === null || _a === void 0 ? void 0 : _a.typeOf) === factory.actionType.MoneyTransfer; });
+                .filter((a) => a.object.itemOffered?.typeOf === factory.actionType.MoneyTransfer);
         }
-        yield Promise.all(authorizeActions.map((action) => __awaiter(this, void 0, void 0, function* () {
-            var _a, _b;
-            yield repos.action.cancelWithVoid({ typeOf: action.typeOf, id: action.id });
-            const pendingTransactionTransactionNumber = (_b = (_a = action.object.itemOffered.object) === null || _a === void 0 ? void 0 : _a.pendingTransaction) === null || _b === void 0 ? void 0 : _b.transactionNumber;
+        await Promise.all(authorizeActions.map(async (action) => {
+            await repos.action.cancelWithVoid({ typeOf: action.typeOf, id: action.id });
+            const pendingTransactionTransactionNumber = action.object.itemOffered.object?.pendingTransaction?.transactionNumber;
             if (typeof pendingTransactionTransactionNumber === 'string') {
                 // 取引が存在すれば中止
-                const existingAssetTransactions = yield repos.assetTransaction.search({
+                const existingAssetTransactions = await repos.assetTransaction.search({
                     limit: 1,
                     page: 1,
                     project: { id: { $eq: params.project.id } },
@@ -57,9 +47,9 @@ function voidTransaction(params) {
                     transactionNumber: { $eq: pendingTransactionTransactionNumber }
                 });
                 if (existingAssetTransactions.length > 0) {
-                    yield MoneyTransferAssetTransactionService.cancel({ transactionNumber: pendingTransactionTransactionNumber })(repos);
+                    await MoneyTransferAssetTransactionService.cancel({ transactionNumber: pendingTransactionTransactionNumber })(repos);
                 }
             }
-        })));
-    });
+        }));
+    };
 }