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

package/lib/chevre/service/moneyTransfer.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;
 exports.cancelMoneyTransfer = cancelMoneyTransfer;
@@ -23,19 +14,19 @@ const errorHandler_1 = require("../errorHandler");
  * 口座残高差し押さえ
  */
 function authorize(params) {
-    return (repos) => __awaiter(this, void 0, void 0, function* () {
-        const project = yield repos.project.findById({
+    return async (repos) => {
+        const project = await repos.project.findById({
             id: params.project.id,
             inclusion: ['settings', 'typeOf']
         });
-        const transaction = yield repos.assetTransaction.findById({
+        const transaction = await repos.assetTransaction.findById({
             typeOf: params.purpose.typeOf,
             id: params.purpose.id
         });
         // 口座取引開始
         // let pendingTransaction: factory.action.transfer.moneyTransfer.IPendingTransaction;
         try {
-            yield processAccountTransaction({
+            await processAccountTransaction({
                 typeOf: params.typeOf,
                 identifier: params.identifier,
                 transactionNumber: params.transactionNumber,
@@ -52,10 +43,10 @@ function authorize(params) {
             throw error;
         }
         // return pendingTransaction;
-    });
+    };
 }
 function processAccountTransaction(params) {
-    return (repos) => __awaiter(this, void 0, void 0, function* () {
+    return async (repos) => {
         const transaction = params.transaction;
         const agent = createAccountTransactionAgent(params);
         const recipient = createAccountTransactionRecipient(params);
@@ -65,10 +56,10 @@ function processAccountTransaction(params) {
             .add(1, 'month')
             .toDate();
         const issuedThroughId = getIssuedThroughId(params);
-        const permitServiceCredentials = yield createPermitServiceCredentials({ issuedThrough: { id: issuedThroughId } })(repos);
-        const permitService = new (yield pecorinoapi.loadPecorino()).service.Permit({
+        const permitServiceCredentials = await createPermitServiceCredentials({ issuedThrough: { id: issuedThroughId } })(repos);
+        const permitService = new (await pecorinoapi.loadPecorino()).service.Permit({
             endpoint: permitServiceCredentials.permitServiceEndpoint,
-            auth: yield pecorinoapi.auth.ClientCredentials.createInstance({
+            auth: await pecorinoapi.auth.ClientCredentials.createInstance({
                 domain: permitServiceCredentials.permitServiceAuthorizeServerDomain,
                 clientId: permitServiceCredentials.permitServiceClientId,
                 clientSecret: permitServiceCredentials.permitServiceClientSecret,
@@ -78,7 +69,7 @@ function processAccountTransaction(params) {
         });
         switch (params.typeOf) {
             case factory.account.transactionType.Deposit:
-                yield processDepositTransaction({
+                await processDepositTransaction({
                     identifier: params.identifier,
                     transactionNumber: params.transactionNumber,
                     project: params.project,
@@ -91,7 +82,7 @@ function processAccountTransaction(params) {
                 })({ permit: permitService });
                 break;
             case factory.account.transactionType.Transfer:
-                yield processTransferTransaction({
+                await processTransferTransaction({
                     identifier: params.identifier,
                     transactionNumber: params.transactionNumber,
                     project: params.project,
@@ -104,7 +95,7 @@ function processAccountTransaction(params) {
                 })({ permit: permitService });
                 break;
             case factory.account.transactionType.Withdraw:
-                yield processWithdrawTransaction({
+                await processWithdrawTransaction({
                     identifier: params.identifier,
                     transactionNumber: params.transactionNumber,
                     project: params.project,
@@ -120,14 +111,13 @@ function processAccountTransaction(params) {
                 throw new factory.errors.Argument('Object', 'At least one of accounts from and to must be specified');
         }
         // return pendingTransaction;
-    });
+    };
 }
 function processDepositTransaction(params) {
-    return (repos) => __awaiter(this, void 0, void 0, function* () {
-        var _a;
-        const accountTransactionService = new (yield pecorinoapi.loadPecorino()).service.AccountTransaction({
+    return async (repos) => {
+        const accountTransactionService = new (await pecorinoapi.loadPecorino()).service.AccountTransaction({
             endpoint: params.permitServiceCredentials.permitServiceEndpoint,
-            auth: yield pecorinoapi.auth.ClientCredentials.createInstance({
+            auth: await pecorinoapi.auth.ClientCredentials.createInstance({
                 domain: params.permitServiceCredentials.permitServiceAuthorizeServerDomain,
                 clientId: params.permitServiceCredentials.permitServiceClientId,
                 clientSecret: params.permitServiceCredentials.permitServiceClientSecret,
@@ -138,26 +128,34 @@ function processDepositTransaction(params) {
         if (typeof params.object.toLocation.identifier !== 'string') {
             throw new factory.errors.ArgumentNull('object.toLocation.identifier');
         }
-        const permit = yield repos.permit.findByIdentifier({
+        const permit = await repos.permit.findByIdentifier({
             project: { id: params.project.id },
             identifier: params.object.toLocation.identifier,
             issuedThrough: { typeOf: factory.product.ProductType.PaymentCard }
         });
-        return accountTransactionService.start(Object.assign({ transactionNumber: params.transactionNumber, project: { typeOf: params.project.typeOf, id: params.project.id }, typeOf: factory.account.transactionType.Deposit, agent: params.agent, expires: params.expires, recipient: params.recipient, object: {
+        return accountTransactionService.start({
+            transactionNumber: params.transactionNumber,
+            project: { typeOf: params.project.typeOf, id: params.project.id },
+            typeOf: factory.account.transactionType.Deposit,
+            agent: params.agent,
+            expires: params.expires,
+            recipient: params.recipient,
+            object: {
                 amount: { value: params.object.amount },
                 description: params.description,
                 toLocation: {
-                    accountNumber: String((_a = permit.paymentAccount) === null || _a === void 0 ? void 0 : _a.accountNumber)
+                    accountNumber: String(permit.paymentAccount?.accountNumber)
                 }
-            } }, (typeof params.identifier === 'string') ? { identifier: params.identifier } : undefined));
-    });
+            },
+            ...(typeof params.identifier === 'string') ? { identifier: params.identifier } : undefined
+        });
+    };
 }
 function processTransferTransaction(params) {
-    return (repos) => __awaiter(this, void 0, void 0, function* () {
-        var _a, _b;
-        const accountTransactionService = new (yield pecorinoapi.loadPecorino()).service.AccountTransaction({
+    return async (repos) => {
+        const accountTransactionService = new (await pecorinoapi.loadPecorino()).service.AccountTransaction({
             endpoint: params.permitServiceCredentials.permitServiceEndpoint,
-            auth: yield pecorinoapi.auth.ClientCredentials.createInstance({
+            auth: await pecorinoapi.auth.ClientCredentials.createInstance({
                 domain: params.permitServiceCredentials.permitServiceAuthorizeServerDomain,
                 clientId: params.permitServiceCredentials.permitServiceClientId,
                 clientSecret: params.permitServiceCredentials.permitServiceClientSecret,
@@ -176,40 +174,48 @@ function processTransferTransaction(params) {
             // no op
         }
         else {
-            const fromLocationPermit = yield repos.permit.findByIdentifier({
+            const fromLocationPermit = await repos.permit.findByIdentifier({
                 project: { id: params.project.id },
                 identifier: params.object.fromLocation.identifier,
                 issuedThrough: { typeOf: factory.product.ProductType.PaymentCard }
             });
-            fromAccountNumber = String((_a = fromLocationPermit.paymentAccount) === null || _a === void 0 ? void 0 : _a.accountNumber);
+            fromAccountNumber = String(fromLocationPermit.paymentAccount?.accountNumber);
         }
         let toAccountNumber = params.object.toLocation.identifier;
         if (params.object.toLocation.hasNoPermit === true) {
             // no op
         }
         else {
-            const toLocationPermit = yield repos.permit.findByIdentifier({
+            const toLocationPermit = await repos.permit.findByIdentifier({
                 project: { id: params.project.id },
                 identifier: params.object.toLocation.identifier,
                 issuedThrough: { typeOf: factory.product.ProductType.PaymentCard }
             });
-            toAccountNumber = String((_b = toLocationPermit.paymentAccount) === null || _b === void 0 ? void 0 : _b.accountNumber);
+            toAccountNumber = String(toLocationPermit.paymentAccount?.accountNumber);
         }
-        return accountTransactionService.start(Object.assign({ transactionNumber: params.transactionNumber, project: { typeOf: params.project.typeOf, id: params.project.id }, typeOf: factory.account.transactionType.Transfer, agent: params.agent, expires: params.expires, recipient: params.recipient, object: {
+        return accountTransactionService.start({
+            transactionNumber: params.transactionNumber,
+            project: { typeOf: params.project.typeOf, id: params.project.id },
+            typeOf: factory.account.transactionType.Transfer,
+            agent: params.agent,
+            expires: params.expires,
+            recipient: params.recipient,
+            object: {
                 amount: { value: params.object.amount },
                 description: params.description,
                 fromLocation: { accountNumber: fromAccountNumber },
                 toLocation: { accountNumber: toAccountNumber }
-            } }, (typeof params.identifier === 'string') ? { identifier: params.identifier } : undefined));
-    });
+            },
+            ...(typeof params.identifier === 'string') ? { identifier: params.identifier } : undefined
+        });
+    };
 }
 function processWithdrawTransaction(params) {
-    return (repos) => __awaiter(this, void 0, void 0, function* () {
-        var _a;
+    return async (repos) => {
         // 転送先口座が指定されていない場合は、出金取引
-        const accountTransactionService = new (yield pecorinoapi.loadPecorino()).service.AccountTransaction({
+        const accountTransactionService = new (await pecorinoapi.loadPecorino()).service.AccountTransaction({
             endpoint: params.permitServiceCredentials.permitServiceEndpoint,
-            auth: yield pecorinoapi.auth.ClientCredentials.createInstance({
+            auth: await pecorinoapi.auth.ClientCredentials.createInstance({
                 domain: params.permitServiceCredentials.permitServiceAuthorizeServerDomain,
                 clientId: params.permitServiceCredentials.permitServiceClientId,
                 clientSecret: params.permitServiceCredentials.permitServiceClientSecret,
@@ -220,20 +226,29 @@ function processWithdrawTransaction(params) {
         if (typeof params.object.fromLocation.identifier !== 'string') {
             throw new factory.errors.ArgumentNull('object.toLocation.identifier');
         }
-        const fromLocationPermit4withdraw = yield repos.permit.findByIdentifier({
+        const fromLocationPermit4withdraw = await repos.permit.findByIdentifier({
             project: { id: params.project.id },
             identifier: params.object.fromLocation.identifier,
             issuedThrough: { typeOf: factory.product.ProductType.PaymentCard }
         });
-        return accountTransactionService.start(Object.assign({ transactionNumber: params.transactionNumber, project: { typeOf: params.project.typeOf, id: params.project.id }, typeOf: factory.account.transactionType.Withdraw, agent: params.agent, expires: params.expires, recipient: params.recipient, object: {
+        return accountTransactionService.start({
+            transactionNumber: params.transactionNumber,
+            project: { typeOf: params.project.typeOf, id: params.project.id },
+            typeOf: factory.account.transactionType.Withdraw,
+            agent: params.agent,
+            expires: params.expires,
+            recipient: params.recipient,
+            object: {
                 amount: { value: params.object.amount },
                 description: params.description,
                 fromLocation: {
-                    accountNumber: String((_a = fromLocationPermit4withdraw.paymentAccount) === null || _a === void 0 ? void 0 : _a.accountNumber)
+                    accountNumber: String(fromLocationPermit4withdraw.paymentAccount?.accountNumber)
                 },
                 force: params.object.force === true
-            } }, (typeof params.identifier === 'string') ? { identifier: params.identifier } : undefined));
-    });
+            },
+            ...(typeof params.identifier === 'string') ? { identifier: params.identifier } : undefined
+        });
+    };
 }
 function createAccountTransactionAgent(params) {
     return {
@@ -273,15 +288,14 @@ function createAccountTransactionRecipient(params) {
     return recipient;
 }
 function getIssuedThroughId(params) {
-    var _a, _b;
     let issuedThroughId;
     switch (params.typeOf) {
         case factory.account.transactionType.Deposit:
-            issuedThroughId = String((_a = params.object.toLocation.issuedThrough) === null || _a === void 0 ? void 0 : _a.id);
+            issuedThroughId = String(params.object.toLocation.issuedThrough?.id);
             break;
         case factory.account.transactionType.Transfer:
         case factory.account.transactionType.Withdraw:
-            issuedThroughId = String((_b = params.object.fromLocation.issuedThrough) === null || _b === void 0 ? void 0 : _b.id);
+            issuedThroughId = String(params.object.fromLocation.issuedThrough?.id);
             break;
         default:
             throw new factory.errors.Argument('AccountTransactionType', `invalid type: ${params.typeOf}`);
@@ -289,18 +303,17 @@ function getIssuedThroughId(params) {
     return issuedThroughId;
 }
 function getIssuedThroughIdByTransaction(params) {
-    var _a, _b, _c;
     let issuedThroughId;
-    const pendingTransactionType = (_a = params.transaction.object.pendingTransaction) === null || _a === void 0 ? void 0 : _a.typeOf;
+    const pendingTransactionType = params.transaction.object.pendingTransaction?.typeOf;
     switch (pendingTransactionType) {
         case factory.account.transactionType.Deposit:
             issuedThroughId =
-                String((_b = params.transaction.object.toLocation.issuedThrough) === null || _b === void 0 ? void 0 : _b.id);
+                String(params.transaction.object.toLocation.issuedThrough?.id);
             break;
         case factory.account.transactionType.Transfer:
         case factory.account.transactionType.Withdraw:
             issuedThroughId =
-                String((_c = params.transaction.object.fromLocation.issuedThrough) === null || _c === void 0 ? void 0 : _c.id);
+                String(params.transaction.object.fromLocation.issuedThrough?.id);
             break;
         default:
             throw new factory.errors.Argument('AccountTransactionType', `invalid type: ${pendingTransactionType}`);
@@ -308,18 +321,17 @@ function getIssuedThroughIdByTransaction(params) {
     return issuedThroughId;
 }
 function getIssuedThroughIdByAction(params) {
-    var _a, _b;
     let issuedThroughId;
     const pendingTransactionType = params.pendingTransactionType;
     switch (pendingTransactionType) {
         case factory.account.transactionType.Deposit:
             issuedThroughId =
-                String((_a = params.action.toLocation.issuedThrough) === null || _a === void 0 ? void 0 : _a.id);
+                String(params.action.toLocation.issuedThrough?.id);
             break;
         case factory.account.transactionType.Transfer:
         case factory.account.transactionType.Withdraw:
             issuedThroughId =
-                String((_b = params.action.fromLocation.issuedThrough) === null || _b === void 0 ? void 0 : _b.id);
+                String(params.action.fromLocation.issuedThrough?.id);
             break;
         default:
             throw new factory.errors.Argument('AccountTransactionType', `invalid type: ${pendingTransactionType}`);
@@ -327,9 +339,8 @@ function getIssuedThroughIdByAction(params) {
     return issuedThroughId;
 }
 function createPermitServiceCredentials(params) {
-    return (repos) => __awaiter(this, void 0, void 0, function* () {
-        var _a, _b, _c, _d, _e, _f, _g;
-        const paymentCardService = (yield repos.product.projectFields({
+    return async (repos) => {
+        const paymentCardService = (await repos.product.projectFields({
             limit: 1,
             page: 1,
             id: { $eq: params.issuedThrough.id },
@@ -340,10 +351,10 @@ function createPermitServiceCredentials(params) {
         if (paymentCardService === undefined) {
             throw new factory.errors.NotFound(factory.product.ProductType.PaymentCard);
         }
-        const permitServiceEndpoint = (_a = paymentCardService.availableChannel) === null || _a === void 0 ? void 0 : _a.serviceUrl;
-        const permitServiceAuthorizeServerDomain = (_c = (_b = paymentCardService.availableChannel) === null || _b === void 0 ? void 0 : _b.credentials) === null || _c === void 0 ? void 0 : _c.authorizeServerDomain;
-        const permitServiceClientId = (_e = (_d = paymentCardService.availableChannel) === null || _d === void 0 ? void 0 : _d.credentials) === null || _e === void 0 ? void 0 : _e.clientId;
-        const permitServiceClientSecret = (_g = (_f = paymentCardService.availableChannel) === null || _f === void 0 ? void 0 : _f.credentials) === null || _g === void 0 ? void 0 : _g.clientSecret;
+        const permitServiceEndpoint = paymentCardService.availableChannel?.serviceUrl;
+        const permitServiceAuthorizeServerDomain = paymentCardService.availableChannel?.credentials?.authorizeServerDomain;
+        const permitServiceClientId = paymentCardService.availableChannel?.credentials?.clientId;
+        const permitServiceClientSecret = paymentCardService.availableChannel?.credentials?.clientSecret;
         if (typeof permitServiceEndpoint !== 'string' || permitServiceEndpoint.length === 0
             || typeof permitServiceAuthorizeServerDomain !== 'string' || permitServiceAuthorizeServerDomain.length === 0
             || typeof permitServiceClientId !== 'string' || permitServiceClientId.length === 0
@@ -356,28 +367,27 @@ function createPermitServiceCredentials(params) {
             permitServiceClientId,
             permitServiceClientSecret
         };
-    });
+    };
 }
 /**
  * 口座承認取消
  */
 function cancelMoneyTransfer(params) {
-    return (repos) => __awaiter(this, void 0, void 0, function* () {
-        var _a;
-        const transactions = yield repos.assetTransaction.search({
+    return async (repos) => {
+        const transactions = await repos.assetTransaction.search({
             typeOf: factory.assetTransactionType.MoneyTransfer,
             ids: [params.purpose.id]
         });
         if (transactions.length > 0) {
             for (const transaction of transactions) {
-                const pendingTransaction = (_a = transaction.object) === null || _a === void 0 ? void 0 : _a.pendingTransaction;
-                if (typeof (pendingTransaction === null || pendingTransaction === void 0 ? void 0 : pendingTransaction.transactionNumber) === 'string') {
+                const pendingTransaction = transaction.object?.pendingTransaction;
+                if (typeof pendingTransaction?.transactionNumber === 'string') {
                     const issuedThroughId = getIssuedThroughIdByTransaction({ transaction });
-                    const { permitServiceEndpoint, permitServiceAuthorizeServerDomain, permitServiceClientId, permitServiceClientSecret } = yield createPermitServiceCredentials({ issuedThrough: { id: issuedThroughId } })(repos);
+                    const { permitServiceEndpoint, permitServiceAuthorizeServerDomain, permitServiceClientId, permitServiceClientSecret } = await createPermitServiceCredentials({ issuedThrough: { id: issuedThroughId } })(repos);
                     // 汎用中止サービスを使用(2022-09-27~)
-                    const accountTransactionService = new (yield pecorinoapi.loadPecorino()).service.AccountTransaction({
+                    const accountTransactionService = new (await pecorinoapi.loadPecorino()).service.AccountTransaction({
                         endpoint: permitServiceEndpoint,
-                        auth: yield pecorinoapi.auth.ClientCredentials.createInstance({
+                        auth: await pecorinoapi.auth.ClientCredentials.createInstance({
                             domain: permitServiceAuthorizeServerDomain,
                             clientId: permitServiceClientId,
                             clientSecret: permitServiceClientSecret,
@@ -386,34 +396,34 @@ function cancelMoneyTransfer(params) {
                         })
                     });
                     // 取引存在検証(2022-10-26~)
-                    const searchAccountTransactionsResult = yield accountTransactionService.search({
+                    const searchAccountTransactionsResult = await accountTransactionService.search({
                         limit: 1,
                         project: { id: { $eq: transaction.project.id } },
                         transactionNumber: { $eq: pendingTransaction.transactionNumber }
                     });
                     if (searchAccountTransactionsResult.data.length > 0) {
-                        yield accountTransactionService.cancelSync({ transactionNumber: pendingTransaction.transactionNumber });
+                        await accountTransactionService.cancelSync({ transactionNumber: pendingTransaction.transactionNumber });
                     }
                 }
             }
         }
-    });
+    };
 }
 function moneyTransfer(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 pendingTransaction = params.object.pendingTransaction;
             let transactionType = params.object.typeOf;
             if (pendingTransaction !== undefined) {
                 transactionType = pendingTransaction.typeOf;
             }
-            const transactionNumber = yield fixAccountTransactionNumber(params)({ transactionNumber: repos.transactionNumber });
+            const transactionNumber = await fixAccountTransactionNumber(params)({ transactionNumber: repos.transactionNumber });
             const issuedThroughId = getIssuedThroughIdByAction({ action: params, pendingTransactionType: transactionType });
-            const permitServiceCredentials = yield createPermitServiceCredentials({ issuedThrough: { id: issuedThroughId } })(repos);
-            const accountTransactionService = new (yield pecorinoapi.loadPecorino()).service.AccountTransaction({
+            const permitServiceCredentials = await createPermitServiceCredentials({ issuedThrough: { id: issuedThroughId } })(repos);
+            const accountTransactionService = new (await pecorinoapi.loadPecorino()).service.AccountTransaction({
                 endpoint: permitServiceCredentials.permitServiceEndpoint,
-                auth: yield pecorinoapi.auth.ClientCredentials.createInstance({
+                auth: await pecorinoapi.auth.ClientCredentials.createInstance({
                     domain: permitServiceCredentials.permitServiceAuthorizeServerDomain,
                     clientId: permitServiceCredentials.permitServiceClientId,
                     clientSecret: permitServiceCredentials.permitServiceClientSecret,
@@ -423,17 +433,17 @@ function moneyTransfer(params) {
             });
             // 入金取引の場合、承認済でないケースがある(ポイント付与など)
             if (transactionType === factory.account.transactionType.Deposit && pendingTransaction === undefined) {
-                yield processDepositFromNow(params, permitServiceCredentials, transactionNumber)({
+                await processDepositFromNow(params, permitServiceCredentials, transactionNumber)({
                     accountTransactionService
                 });
             }
             else {
-                yield accountTransactionService.confirmSync({ transactionNumber: transactionNumber });
+                await accountTransactionService.confirmSync({ transactionNumber: transactionNumber });
             }
         }
         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
@@ -441,11 +451,11 @@ function moneyTransfer(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 });
+    };
 }
 function fixAccountTransactionNumber(params) {
-    return (repos) => __awaiter(this, void 0, void 0, function* () {
+    return async (repos) => {
         const pendingTransaction = params.object.pendingTransaction;
         let transactionNumber = params.object.transactionNumber;
         if (pendingTransaction !== undefined) {
@@ -453,13 +463,13 @@ function fixAccountTransactionNumber(params) {
         }
         // 取引番号指定でなければ発行
         if (typeof transactionNumber !== 'string') {
-            const publishTransactionNumberResult = yield repos.transactionNumber.publishByTimestamp({
+            const publishTransactionNumberResult = await repos.transactionNumber.publishByTimestamp({
                 startDate: new Date()
             });
             transactionNumber = publishTransactionNumberResult.transactionNumber;
         }
         return transactionNumber;
-    });
+    };
 }
 /**
  * 新規で入金取引を確定させる
@@ -469,14 +479,13 @@ function fixAccountTransactionNumber(params) {
  * 3.取引が存在しなければ新たに取引開始してconfirmSync
  */
 function processDepositFromNow(params, permitServiceCredentials, transactionNumber) {
-    return (repos) => __awaiter(this, void 0, void 0, function* () {
-        var _a;
+    return async (repos) => {
         const accountTransactionIdentifier = params.purpose.identifier;
         // すでに入金済かどうか確認
         let confirmedAccountTransactionNumber;
         if (typeof accountTransactionIdentifier === 'string') {
             // 口座取引で確認する(2022-10-27~)
-            const searchAccountTransactionsResult = yield repos.accountTransactionService.search({
+            const searchAccountTransactionsResult = await repos.accountTransactionService.search({
                 limit: 100,
                 project: { id: { $eq: params.project.id } },
                 identifier: { $eq: accountTransactionIdentifier }
@@ -487,13 +496,13 @@ function processDepositFromNow(params, permitServiceCredentials, transactionNumb
                     confirmedAccountTransactionNumber = existingAccountTransaction.transactionNumber;
                 }
                 else {
-                    yield repos.accountTransactionService.cancelSync({ transactionNumber: existingAccountTransaction.transactionNumber });
+                    await repos.accountTransactionService.cancelSync({ transactionNumber: existingAccountTransaction.transactionNumber });
                 }
             }
         }
         if (typeof confirmedAccountTransactionNumber === 'string') {
             // 念のためconfirm
-            yield repos.accountTransactionService.confirmSync({ transactionNumber: confirmedAccountTransactionNumber });
+            await repos.accountTransactionService.confirmSync({ transactionNumber: confirmedAccountTransactionNumber });
             return;
         }
         const agent = createAgent4depositFromNow(params);
@@ -505,9 +514,9 @@ function processDepositFromNow(params, permitServiceCredentials, transactionNumb
         const description = (typeof params.description === 'string') ? params.description : params.purpose.typeOf;
         const permitIdentifier = String(params.toLocation.identifier);
         // Permitの存在確認
-        const permitService = new (yield pecorinoapi.loadPecorino()).service.Permit({
+        const permitService = new (await pecorinoapi.loadPecorino()).service.Permit({
             endpoint: permitServiceCredentials.permitServiceEndpoint,
-            auth: yield pecorinoapi.auth.ClientCredentials.createInstance({
+            auth: await pecorinoapi.auth.ClientCredentials.createInstance({
                 domain: permitServiceCredentials.permitServiceAuthorizeServerDomain,
                 clientId: permitServiceCredentials.permitServiceClientId,
                 clientSecret: permitServiceCredentials.permitServiceClientSecret,
@@ -515,27 +524,35 @@ function processDepositFromNow(params, permitServiceCredentials, transactionNumb
                 state: ''
             })
         });
-        const permit = yield permitService.findByIdentifier({
+        const permit = await permitService.findByIdentifier({
             project: { id: params.project.id },
             identifier: permitIdentifier,
             issuedThrough: { typeOf: factory.product.ProductType.PaymentCard }
         });
-        yield repos.accountTransactionService.start(Object.assign({ transactionNumber, project: { typeOf: params.project.typeOf, id: params.project.id }, typeOf: factory.account.transactionType.Deposit, agent,
+        await repos.accountTransactionService.start({
+            transactionNumber,
+            project: { typeOf: params.project.typeOf, id: params.project.id },
+            typeOf: factory.account.transactionType.Deposit,
+            agent,
             expires,
-            recipient, object: {
+            recipient,
+            object: {
                 amount: { value: amount },
                 description: description,
                 // fromLocation: params.fromLocation,
-                toLocation: { accountNumber: String((_a = permit.paymentAccount) === null || _a === void 0 ? void 0 : _a.accountNumber) }
-            } }, (typeof accountTransactionIdentifier === 'string') ? { identifier: accountTransactionIdentifier } : undefined));
+                toLocation: { accountNumber: String(permit.paymentAccount?.accountNumber) }
+            },
+            // 入金取引に識別子を指定する
+            ...(typeof accountTransactionIdentifier === 'string') ? { identifier: accountTransactionIdentifier } : undefined
+        });
         try {
-            yield repos.accountTransactionService.confirmSync({ transactionNumber });
+            await repos.accountTransactionService.confirmSync({ transactionNumber });
         }
         catch (error) {
-            yield repos.accountTransactionService.cancelSync({ transactionNumber });
+            await repos.accountTransactionService.cancelSync({ transactionNumber });
             throw error;
         }
-    });
+    };
 }
 function createAgent4depositFromNow(params) {
     return {
@@ -547,13 +564,12 @@ function createAgent4depositFromNow(params) {
     };
 }
 function createRecipient4depositFromNow(params) {
-    var _a, _b;
     let recipient = {
         typeOf: factory.personType.Person,
         id: String(String(params.toLocation.identifier)),
         name: params.toLocation.typeOf
     };
-    if (((_a = params.recipient) === null || _a === void 0 ? void 0 : _a.typeOf) === factory.organizationType.Corporation) {
+    if (params.recipient?.typeOf === factory.organizationType.Corporation) {
         recipient = {
             typeOf: params.recipient.typeOf,
             id: String(params.recipient.id),
@@ -562,7 +578,7 @@ function createRecipient4depositFromNow(params) {
                 : params.toLocation.typeOf
         };
     }
-    else if (typeof ((_b = params.recipient) === null || _b === void 0 ? void 0 : _b.typeOf) === 'string') {
+    else if (typeof params.recipient?.typeOf === 'string') {
         if (params.recipient.typeOf === factory.creativeWorkType.SoftwareApplication) {
             throw new factory.errors.NotImplemented(`recipient.typeOf [${params.recipient.typeOf}] not implemented`);
         }

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

@@ -8,15 +8,14 @@ const moment = require("moment");
 const factory = require("../../factory");
 exports.ABORT_REPORT_SUBJECT = 'tasks aborted';
 function task2lineNotify(params) {
-    var _a;
     const task = params.task;
     const lastExecutionResult = (task.executionResults.length > 0) ? task.executionResults.slice(-1)[0] : undefined;
-    let lastError = lastExecutionResult === null || lastExecutionResult === void 0 ? void 0 : lastExecutionResult.error;
+    let lastError = lastExecutionResult?.error;
     if (typeof lastError === 'string') {
         lastError = { message: lastError, name: 'Error' };
     }
-    const lastMessage = `${String(lastError === null || lastError === void 0 ? void 0 : lastError.name)} ${String(lastError === null || lastError === void 0 ? void 0 : lastError.message)}`;
-    const content = `project:${(_a = task.project) === null || _a === void 0 ? void 0 : _a.id}
+    const lastMessage = `${String(lastError?.name)} ${String(lastError?.message)}`;
+    const content = `project:${task.project?.id}
 id:${task.id}
 name:${task.name}
 runsAt:${moment(task.runsAt)
@@ -35,7 +34,6 @@ function tasks2lineNotify(params) {
     const subject = `${params.tasks.length} ${exports.ABORT_REPORT_SUBJECT}`;
     let content = subject;
     // あまりに通知タスク数が多いケースに対応
-    // tslint:disable-next-line:no-magic-numbers
     if (params.tasks.length > 10) {
         content = params.tasks.map((task) => {
             return `* project:${task.project.id}
@@ -45,16 +43,15 @@ function tasks2lineNotify(params) {
             .join('\n');
     }
     else {
-        // tslint:disable-next-line:no-magic-numbers
         const maxLastMessageLength = (params.tasks.length <= 5) ? 150 : MAX_LAST_MESSAGE_LENGTH; // 通知タスク数に応じてメッセージ長を調整
         content = params.tasks.map((task) => {
             const lastExecutionResult = (task.executionResults.length > 0) ? task.executionResults.slice(-1)[0] : undefined;
-            let lastError = lastExecutionResult === null || lastExecutionResult === void 0 ? void 0 : lastExecutionResult.error;
+            let lastError = lastExecutionResult?.error;
             if (typeof lastError === 'string') {
                 lastError = { message: lastError, name: 'Error' };
             }
-            let lastMessage = String(lastError === null || lastError === void 0 ? void 0 : lastError.name);
-            if (typeof (lastError === null || lastError === void 0 ? void 0 : lastError.message) === 'string' && lastError.message.length > 0) {
+            let lastMessage = String(lastError?.name);
+            if (typeof lastError?.message === 'string' && lastError.message.length > 0) {
                 lastMessage = lastError.message;
             }
             const abbreviatedMessage = (lastMessage.length > maxLastMessageLength)
@@ -88,7 +85,11 @@ function createSendEmailMessageRecipe(params) {
                     {
                         typeOf: 'HowToStep',
                         identifier: factory.recipe.StepIdentifier.sendMultiple,
-                        itemListElement: [Object.assign(Object.assign({ typeOf: 'HowToDirection' }, (beforeMedia !== undefined) ? { beforeMedia } : undefined), (afterMedia !== undefined) ? { afterMedia } : undefined)]
+                        itemListElement: [{
+                                typeOf: 'HowToDirection',
+                                ...(beforeMedia !== undefined) ? { beforeMedia } : undefined,
+                                ...(afterMedia !== undefined) ? { afterMedia } : undefined
+                            }]
                     }
                 ]
             }]