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

package/lib/chevre/service/payment/paymentCard.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.payPaymentCard = payPaymentCard;
@@ -24,15 +15,14 @@ const onPayActionCompleted_1 = require("./any/onPayActionCompleted");
 const onRefundActionCompletedOrFailed_1 = require("./any/onRefundActionCompletedOrFailed");
 const accountTransactionIdentifier_1 = require("../../factory/accountTransactionIdentifier");
 function authorize(params, paymentServiceId) {
-    return (repos) => __awaiter(this, void 0, void 0, function* () {
-        var _a;
+    return async (repos) => {
         const transactionNumber = params.transactionNumber;
         if (typeof transactionNumber !== 'string') {
             throw new factory.errors.ArgumentNull('transactionNumber');
         }
         // 決済方法検証
-        const { permit, currency } = yield validatePaymentMethod(params, paymentServiceId)(repos);
-        const accountNumber = (_a = permit.paymentAccount) === null || _a === void 0 ? void 0 : _a.accountNumber;
+        const { permit, currency } = await validatePaymentMethod(params, paymentServiceId)(repos);
+        const accountNumber = permit.paymentAccount?.accountNumber;
         if (typeof accountNumber !== 'string') {
             throw new factory.errors.ArgumentNull('permit.paymentAccount.accountNumber');
         }
@@ -42,7 +32,7 @@ function authorize(params, paymentServiceId) {
             const expires = moment(params.expires)
                 .add(1, 'month')
                 .toDate();
-            pendingTransaction = yield processAccountTransaction({
+            pendingTransaction = await processAccountTransaction({
                 transactionNumber,
                 project: { id: params.project.id, typeOf: factory.organizationType.Project },
                 paymentMethod: params.object.paymentMethod,
@@ -58,14 +48,13 @@ function authorize(params, paymentServiceId) {
             throw (0, errorHandler_1.handlePecorinoError)(error);
         }
         return { pendingTransaction, currency, accountNumber };
-    });
+    };
 }
 function validatePaymentMethod(params, paymentServiceId) {
-    return (repos) => __awaiter(this, void 0, void 0, function* () {
-        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l;
-        const serviceOutputIdentifier = (_a = params.object.paymentMethod) === null || _a === void 0 ? void 0 : _a.accountId;
-        const amount = (_b = params.object.paymentMethod) === null || _b === void 0 ? void 0 : _b.amount;
-        const paymentMethodType = (_c = params.object.paymentMethod) === null || _c === void 0 ? void 0 : _c.identifier;
+    return async (repos) => {
+        const serviceOutputIdentifier = params.object.paymentMethod?.accountId;
+        const amount = params.object.paymentMethod?.amount;
+        const paymentMethodType = params.object.paymentMethod?.identifier;
         if (typeof serviceOutputIdentifier !== 'string') {
             throw new factory.errors.ArgumentNull('object.paymentMethod.accountId');
         }
@@ -76,7 +65,7 @@ function validatePaymentMethod(params, paymentServiceId) {
             throw new factory.errors.ArgumentNull('object.paymentMethod.identifier');
         }
         // プロダクトから通貨区分を取得
-        const paymentCatdProduct = (yield repos.product.projectFields({
+        const paymentCatdProduct = (await repos.product.projectFields({
             limit: 1,
             page: 1,
             id: { $eq: paymentServiceId },
@@ -84,57 +73,56 @@ function validatePaymentMethod(params, paymentServiceId) {
         }, ['serviceOutput']
         // []
         )).shift();
-        const currency = (_e = (_d = paymentCatdProduct === null || paymentCatdProduct === void 0 ? void 0 : paymentCatdProduct.serviceOutput) === null || _d === void 0 ? void 0 : _d.amount) === null || _e === void 0 ? void 0 : _e.currency;
+        const currency = paymentCatdProduct?.serviceOutput?.amount?.currency;
         if (typeof currency !== 'string') {
             throw new factory.errors.NotFound('product.serviceOutput.amount.currency');
         }
         // プロダクトのavailableChannelを取得する
-        const availableChannel = yield repos.product.findAvailableChannel({
+        const availableChannel = await repos.product.findAvailableChannel({
             project: { id: params.project.id },
             typeOf: factory.service.paymentService.PaymentServiceType.PaymentCard,
             id: paymentServiceId
         });
-        const permitService = new (yield pecorinoapi.loadPecorino()).service.Permit({
+        const permitService = new (await pecorinoapi.loadPecorino()).service.Permit({
             endpoint: String(availableChannel.serviceUrl),
-            auth: yield pecorinoapi.auth.ClientCredentials.createInstance({
-                domain: String((_f = availableChannel.credentials) === null || _f === void 0 ? void 0 : _f.authorizeServerDomain),
-                clientId: String((_g = availableChannel.credentials) === null || _g === void 0 ? void 0 : _g.clientId),
-                clientSecret: String((_h = availableChannel.credentials) === null || _h === void 0 ? void 0 : _h.clientSecret),
+            auth: await pecorinoapi.auth.ClientCredentials.createInstance({
+                domain: String(availableChannel.credentials?.authorizeServerDomain),
+                clientId: String(availableChannel.credentials?.clientId),
+                clientSecret: String(availableChannel.credentials?.clientSecret),
                 scopes: [],
                 state: ''
             })
         });
         // サービスアウトプット存在確認
-        const serviceOutput = yield permitService.findByIdentifier({
+        const serviceOutput = await permitService.findByIdentifier({
             project: { id: params.project.id },
             identifier: serviceOutputIdentifier,
             issuedThrough: { typeOf: factory.product.ProductType.PaymentCard }
         });
         // サービスタイプを確認
-        if (((_j = serviceOutput.issuedThrough) === null || _j === void 0 ? void 0 : _j.typeOf) !== factory.product.ProductType.PaymentCard) {
+        if (serviceOutput.issuedThrough?.typeOf !== factory.product.ProductType.PaymentCard) {
             throw new factory.errors.Argument('object.paymentMethod.accountId', 'serviceOutput.issuedThrough?.typeOf must be PaymentCard');
         }
-        if (((_l = (_k = serviceOutput.issuedThrough) === null || _k === void 0 ? void 0 : _k.serviceType) === null || _l === void 0 ? void 0 : _l.codeValue) !== paymentMethodType) {
+        if (serviceOutput.issuedThrough?.serviceType?.codeValue !== paymentMethodType) {
             throw new factory.errors.Argument('object.paymentMethod.accountId', 'paymentMethodType not matched');
         }
         // 出金金額設定を確認
         const paymentAmount = serviceOutput.paymentAmount;
-        if (typeof (paymentAmount === null || paymentAmount === void 0 ? void 0 : paymentAmount.minValue) === 'number') {
+        if (typeof paymentAmount?.minValue === 'number') {
             if (amount < paymentAmount.minValue) {
                 throw new factory.errors.Argument('object.paymentMethod.amount', `mininum payment amount requirement not satisfied`);
             }
         }
-        if (typeof (paymentAmount === null || paymentAmount === void 0 ? void 0 : paymentAmount.maxValue) === 'number') {
+        if (typeof paymentAmount?.maxValue === 'number') {
             if (amount > paymentAmount.maxValue) {
                 throw new factory.errors.Argument('object.paymentMethod.amount', `maximum payment amount requirement not satisfied`);
             }
         }
         return { permit: serviceOutput, currency };
-    });
+    };
 }
 function processAccountTransaction(params) {
-    return (repos) => __awaiter(this, void 0, void 0, function* () {
-        var _a, _b, _c, _d, _e, _f, _g, _h;
+    return async (repos) => {
         let pendingTransaction;
         const defaultName = `${factory.assetTransactionType.Pay} Transaction ${params.transactionNumber}`;
         const agent = {
@@ -149,30 +137,30 @@ function processAccountTransaction(params) {
                 : defaultName,
             typeOf: params.recipient.typeOf
         };
-        const description = (typeof ((_a = params.paymentMethod) === null || _a === void 0 ? void 0 : _a.description) === 'string') ? (_b = params.paymentMethod) === null || _b === void 0 ? void 0 : _b.description : '';
+        const description = (typeof params.paymentMethod?.description === 'string') ? params.paymentMethod?.description : '';
         const accountNumber = params.accountNumber;
         const accountTransactionIdentifier = (0, accountTransactionIdentifier_1.createPayIdentifier)({
             project: { id: params.project.id },
             paymentMethodId: params.transactionNumber
         });
         // プロダクトのavailableChannelを取得する
-        const availableChannel = yield repos.product.findAvailableChannel({
+        const availableChannel = await repos.product.findAvailableChannel({
             project: { id: params.project.id },
             typeOf: factory.service.paymentService.PaymentServiceType.PaymentCard,
             id: params.paymentServiceId
         });
-        const accountTransactionService = new (yield pecorinoapi.loadPecorino()).service.AccountTransaction({
+        const accountTransactionService = new (await pecorinoapi.loadPecorino()).service.AccountTransaction({
             endpoint: String(availableChannel.serviceUrl),
-            auth: yield pecorinoapi.auth.ClientCredentials.createInstance({
-                domain: String((_c = availableChannel.credentials) === null || _c === void 0 ? void 0 : _c.authorizeServerDomain),
-                clientId: String((_d = availableChannel.credentials) === null || _d === void 0 ? void 0 : _d.clientId),
-                clientSecret: String((_e = availableChannel.credentials) === null || _e === void 0 ? void 0 : _e.clientSecret),
+            auth: await pecorinoapi.auth.ClientCredentials.createInstance({
+                domain: String(availableChannel.credentials?.authorizeServerDomain),
+                clientId: String(availableChannel.credentials?.clientId),
+                clientSecret: String(availableChannel.credentials?.clientSecret),
                 scopes: [],
                 state: ''
             })
         });
         // ひとまず出金取引に限定
-        pendingTransaction = yield accountTransactionService.start({
+        pendingTransaction = await accountTransactionService.start({
             transactionNumber: params.transactionNumber,
             project: { typeOf: params.project.typeOf, id: params.project.id },
             typeOf: factory.account.transactionType.Withdraw,
@@ -181,9 +169,9 @@ function processAccountTransaction(params) {
             recipient: recipient,
             object: {
                 amount: {
-                    value: (typeof ((_f = params.paymentMethod) === null || _f === void 0 ? void 0 : _f.amount) === 'number')
-                        ? (_g = params.paymentMethod) === null || _g === void 0 ? void 0 : _g.amount
-                        : (_h = params.paymentMethod) === null || _h === void 0 ? void 0 : _h.amount.value
+                    value: (typeof params.paymentMethod?.amount === 'number')
+                        ? params.paymentMethod?.amount
+                        : params.paymentMethod?.amount.value
                 },
                 description: description,
                 fromLocation: {
@@ -193,11 +181,10 @@ function processAccountTransaction(params) {
             identifier: accountTransactionIdentifier
         });
         return pendingTransaction;
-    });
+    };
 }
 function voidTransaction(params) {
-    return (repos) => __awaiter(this, void 0, void 0, function* () {
-        var _a, _b, _c;
+    return async (repos) => {
         const transaction = params.object;
         // const paymentMethodId = transaction.object.paymentMethod?.paymentMethodId;
         const paymentMethodId = transaction.object.paymentMethodId;
@@ -207,61 +194,60 @@ function voidTransaction(params) {
         const paymentServiceId = String(transaction.object.id);
         // アクションステータスに関係なく取消処理実行
         // プロダクトのavailableChannelを取得する
-        const availableChannel = yield repos.product.findAvailableChannel({
+        const availableChannel = await repos.product.findAvailableChannel({
             project: { id: transaction.project.id },
             typeOf: factory.service.paymentService.PaymentServiceType.PaymentCard,
             id: paymentServiceId
         });
         // 汎用中止サービスを使用(2022-09-27~)
-        const accountTransactionService = new (yield pecorinoapi.loadPecorino()).service.AccountTransaction({
+        const accountTransactionService = new (await pecorinoapi.loadPecorino()).service.AccountTransaction({
             endpoint: String(availableChannel.serviceUrl),
-            auth: yield pecorinoapi.auth.ClientCredentials.createInstance({
-                domain: String((_a = availableChannel.credentials) === null || _a === void 0 ? void 0 : _a.authorizeServerDomain),
-                clientId: String((_b = availableChannel.credentials) === null || _b === void 0 ? void 0 : _b.clientId),
-                clientSecret: String((_c = availableChannel.credentials) === null || _c === void 0 ? void 0 : _c.clientSecret),
+            auth: await pecorinoapi.auth.ClientCredentials.createInstance({
+                domain: String(availableChannel.credentials?.authorizeServerDomain),
+                clientId: String(availableChannel.credentials?.clientId),
+                clientSecret: String(availableChannel.credentials?.clientSecret),
                 scopes: [],
                 state: ''
             })
         });
         // 取引存在検証(2022-10-26~)
-        const searchAccountTransactionsResult = yield accountTransactionService.search({
+        const searchAccountTransactionsResult = await accountTransactionService.search({
             limit: 1,
             project: { id: { $eq: transaction.project.id } },
             transactionNumber: { $eq: paymentMethodId }
         });
         if (searchAccountTransactionsResult.data.length > 0) {
-            yield accountTransactionService.cancelSync({ transactionNumber: paymentMethodId });
+            await accountTransactionService.cancelSync({ transactionNumber: paymentMethodId });
         }
-    });
+    };
 }
 function payPaymentCard(params) {
-    return (repos) => __awaiter(this, void 0, void 0, function* () {
-        var _a, _b, _c;
+    return async (repos) => {
         const payObject = params.object;
         const paymentServiceId = payObject[0].id;
-        const action = yield repos.action.start(params);
+        const action = await repos.action.start(params);
         try {
             const transactionNumber = payObject[0].paymentMethod.paymentMethodId;
-            const availableChannel = yield repos.product.findAvailableChannel({
+            const availableChannel = await repos.product.findAvailableChannel({
                 project: { id: params.project.id },
                 typeOf: factory.service.paymentService.PaymentServiceType.PaymentCard,
                 id: paymentServiceId
             });
-            const accountTransactionService = new (yield pecorinoapi.loadPecorino()).service.AccountTransaction({
+            const accountTransactionService = new (await pecorinoapi.loadPecorino()).service.AccountTransaction({
                 endpoint: String(availableChannel.serviceUrl),
-                auth: yield pecorinoapi.auth.ClientCredentials.createInstance({
-                    domain: String((_a = availableChannel.credentials) === null || _a === void 0 ? void 0 : _a.authorizeServerDomain),
-                    clientId: String((_b = availableChannel.credentials) === null || _b === void 0 ? void 0 : _b.clientId),
-                    clientSecret: String((_c = availableChannel.credentials) === null || _c === void 0 ? void 0 : _c.clientSecret),
+                auth: await pecorinoapi.auth.ClientCredentials.createInstance({
+                    domain: String(availableChannel.credentials?.authorizeServerDomain),
+                    clientId: String(availableChannel.credentials?.clientId),
+                    clientSecret: String(availableChannel.credentials?.clientSecret),
                     scopes: [],
                     state: ''
                 })
             });
-            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
@@ -269,8 +255,8 @@ function payPaymentCard(params) {
             throw error;
         }
         const actionResult = {};
-        yield repos.action.completeWithVoid({ typeOf: action.typeOf, id: action.id, result: actionResult });
-        yield (0, onPayActionCompleted_1.onPayActionCompleted)({
+        await repos.action.completeWithVoid({ typeOf: action.typeOf, id: action.id, result: actionResult });
+        await (0, onPayActionCompleted_1.onPayActionCompleted)({
             // actionStatus: factory.actionStatusType.CompletedActionStatus,
             id: action.id,
             object: params.object,
@@ -280,38 +266,36 @@ function payPaymentCard(params) {
             typeOf: action.typeOf
         })(repos);
         // return action;
-    });
+    };
 }
 function refundPaymentCard(params) {
-    // tslint:disable-next-line:max-func-body-length
-    return (repos) => __awaiter(this, void 0, void 0, function* () {
-        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m;
-        const paymentMethodId = (_a = params.object[0]) === null || _a === void 0 ? void 0 : _a.paymentMethod.paymentMethodId;
-        const paymentServiceId = (_b = params.object[0]) === null || _b === void 0 ? void 0 : _b.id;
-        const payTransaction = yield repos.assetTransaction.findByTransactionNumber({
+    return async (repos) => {
+        const paymentMethodId = params.object[0]?.paymentMethod.paymentMethodId;
+        const paymentServiceId = params.object[0]?.id;
+        const payTransaction = await repos.assetTransaction.findByTransactionNumber({
             typeOf: factory.assetTransactionType.Pay,
             transactionNumber: paymentMethodId
         });
         // accountNumberをpendingTransactionから取得する
         let accountNumber;
-        accountNumber = (_d = (_c = payTransaction.object.pendingTransaction) === null || _c === void 0 ? void 0 : _c.object.fromLocation) === null || _d === void 0 ? void 0 : _d.accountNumber;
+        accountNumber = payTransaction.object.pendingTransaction?.object.fromLocation?.accountNumber;
         if (typeof accountNumber !== 'string') {
             throw new factory.errors.ArgumentNull('serviceOutput.paymentAccount.accountNumber');
         }
-        const action = yield repos.action.start(params);
+        const action = await repos.action.start(params);
         let accountTransactionNumber4refund;
         try {
-            const availableChannel = yield repos.product.findAvailableChannel({
+            const availableChannel = await repos.product.findAvailableChannel({
                 project: { id: params.project.id },
                 typeOf: factory.service.paymentService.PaymentServiceType.PaymentCard,
                 id: paymentServiceId
             });
-            const accountTransactionService = new (yield pecorinoapi.loadPecorino()).service.AccountTransaction({
+            const accountTransactionService = new (await pecorinoapi.loadPecorino()).service.AccountTransaction({
                 endpoint: String(availableChannel.serviceUrl),
-                auth: yield pecorinoapi.auth.ClientCredentials.createInstance({
-                    domain: String((_e = availableChannel.credentials) === null || _e === void 0 ? void 0 : _e.authorizeServerDomain),
-                    clientId: String((_f = availableChannel.credentials) === null || _f === void 0 ? void 0 : _f.clientId),
-                    clientSecret: String((_g = availableChannel.credentials) === null || _g === void 0 ? void 0 : _g.clientSecret),
+                auth: await pecorinoapi.auth.ClientCredentials.createInstance({
+                    domain: String(availableChannel.credentials?.authorizeServerDomain),
+                    clientId: String(availableChannel.credentials?.clientId),
+                    clientSecret: String(availableChannel.credentials?.clientSecret),
                     scopes: [],
                     state: ''
                 })
@@ -325,7 +309,7 @@ function refundPaymentCard(params) {
             let confirmedAccountTransactionNumber;
             if (typeof accountTransactionIdentifier === 'string') {
                 // 口座取引で確認する(2022-10-27~)
-                const searchAccountTransactionsResult = yield accountTransactionService.search({
+                const searchAccountTransactionsResult = await accountTransactionService.search({
                     limit: 100,
                     project: { id: { $eq: params.project.id } },
                     identifier: { $eq: accountTransactionIdentifier }
@@ -336,23 +320,23 @@ function refundPaymentCard(params) {
                         confirmedAccountTransactionNumber = existingAccountTransaction.transactionNumber;
                     }
                     else {
-                        yield accountTransactionService.cancelSync({ transactionNumber: existingAccountTransaction.transactionNumber });
+                        await accountTransactionService.cancelSync({ transactionNumber: existingAccountTransaction.transactionNumber });
                     }
                 }
             }
             if (typeof confirmedAccountTransactionNumber === 'string') {
                 // 念のためconfirm
-                yield accountTransactionService.confirmSync({ transactionNumber: confirmedAccountTransactionNumber });
+                await accountTransactionService.confirmSync({ transactionNumber: confirmedAccountTransactionNumber });
                 accountTransactionNumber4refund = confirmedAccountTransactionNumber;
             }
             else {
-                const { transactionNumber } = yield repos.transactionNumber.publishByTimestamp({ startDate: new Date() });
+                const { transactionNumber } = await repos.transactionNumber.publishByTimestamp({ startDate: new Date() });
                 const expires = moment()
                     .add(1, 'minute')
                     .toDate();
                 const agent = createAgent4refund(params);
                 const recipient = createRecipient4refund(params);
-                yield accountTransactionService.start({
+                await accountTransactionService.start({
                     transactionNumber: transactionNumber,
                     project: { typeOf: params.project.typeOf, id: params.project.id },
                     typeOf: factory.account.transactionType.Deposit,
@@ -361,26 +345,26 @@ function refundPaymentCard(params) {
                     recipient: recipient,
                     object: {
                         amount: {
-                            value: Number((_k = (_j = (_h = payTransaction.object) === null || _h === void 0 ? void 0 : _h.paymentMethod) === null || _j === void 0 ? void 0 : _j.totalPaymentDue) === null || _k === void 0 ? void 0 : _k.value)
+                            value: Number(payTransaction.object?.paymentMethod?.totalPaymentDue?.value)
                         },
-                        description: `Refund [${(_m = (_l = payTransaction.object) === null || _l === void 0 ? void 0 : _l.paymentMethod) === null || _m === void 0 ? void 0 : _m.description}]`,
+                        description: `Refund [${payTransaction.object?.paymentMethod?.description}]`,
                         toLocation: { accountNumber }
                     },
                     identifier: accountTransactionIdentifier
                 });
                 try {
-                    yield accountTransactionService.confirmSync({ transactionNumber });
+                    await accountTransactionService.confirmSync({ transactionNumber });
                     accountTransactionNumber4refund = transactionNumber;
                 }
                 catch (error) {
-                    yield accountTransactionService.cancelSync({ transactionNumber });
+                    await accountTransactionService.cancelSync({ transactionNumber });
                     throw error;
                 }
             }
         }
         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
@@ -390,8 +374,8 @@ function refundPaymentCard(params) {
         const result = {
             accountTransaction: { transactionNumber: accountTransactionNumber4refund }
         };
-        yield repos.action.completeWithVoid({ typeOf: action.typeOf, id: action.id, result });
-        yield (0, onRefundActionCompletedOrFailed_1.onRefundActionCompletedOrFailed)({
+        await repos.action.completeWithVoid({ typeOf: action.typeOf, id: action.id, result });
+        await (0, onRefundActionCompletedOrFailed_1.onRefundActionCompletedOrFailed)({
             actionStatus: factory.actionStatusType.CompletedActionStatus,
             id: action.id,
             object: params.object,
@@ -401,7 +385,7 @@ function refundPaymentCard(params) {
             typeOf: action.typeOf
         })(repos);
         // return action;
-    });
+    };
 }
 function createAgent4refund(params) {
     return {
@@ -413,15 +397,14 @@ function createAgent4refund(params) {
     };
 }
 function createRecipient4refund(params) {
-    var _a, _b, _c, _d;
-    if (typeof ((_a = params.recipient) === null || _a === void 0 ? void 0 : _a.typeOf) !== 'string') {
+    if (typeof params.recipient?.typeOf !== 'string') {
         throw new factory.errors.NotFound('recipient.typeOf');
     }
     return {
         // ...<factory.person.IPerson | factory.creativeWork.softwareApplication.webApplication.ICreativeWork>params.recipient,
-        name: (typeof ((_b = params.recipient) === null || _b === void 0 ? void 0 : _b.name) === 'string')
+        name: (typeof params.recipient?.name === 'string')
             ? params.recipient.name
-            : `${(_c = params.recipient) === null || _c === void 0 ? void 0 : _c.typeOf} ${(_d = params.recipient) === null || _d === void 0 ? void 0 : _d.id}`,
+            : `${params.recipient?.typeOf} ${params.recipient?.id}`,
         typeOf: params.recipient.typeOf
     };
 }

package/lib/chevre/service/permit.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.issue = issue;
 exports.activate = activate;
@@ -21,17 +12,16 @@ const AccountService = require("./account");
  * 許可証発行
  */
 function issue(params) {
-    return (repos) => __awaiter(this, void 0, void 0, function* () {
+    return async (repos) => {
         switch (params.issuedThrough.typeOf) {
             case factory.product.ProductType.PaymentCard:
                 // 口座開設
                 const openAccountParams = params.serviceOutputs.map((serviceOutput) => {
-                    var _a, _b, _c, _d;
-                    const accountTypeOf = (_a = serviceOutput === null || serviceOutput === void 0 ? void 0 : serviceOutput.paymentAccount) === null || _a === void 0 ? void 0 : _a.typeOf;
-                    const accountNumber = (_b = serviceOutput === null || serviceOutput === void 0 ? void 0 : serviceOutput.paymentAccount) === null || _b === void 0 ? void 0 : _b.accountNumber;
-                    const serviceOutputName = serviceOutput === null || serviceOutput === void 0 ? void 0 : serviceOutput.name;
-                    const accountType = (_c = serviceOutput === null || serviceOutput === void 0 ? void 0 : serviceOutput.amount) === null || _c === void 0 ? void 0 : _c.currency;
-                    const initialBalance = (_d = serviceOutput === null || serviceOutput === void 0 ? void 0 : serviceOutput.amount) === null || _d === void 0 ? void 0 : _d.value;
+                    const accountTypeOf = serviceOutput?.paymentAccount?.typeOf;
+                    const accountNumber = serviceOutput?.paymentAccount?.accountNumber;
+                    const serviceOutputName = serviceOutput?.name;
+                    const accountType = serviceOutput?.amount?.currency;
+                    const initialBalance = serviceOutput?.amount?.value;
                     if (typeof accountTypeOf !== 'string' || accountTypeOf.length === 0) {
                         throw new factory.errors.Internal('serviceOutput.paymentAccount.typeOf undefined');
                     }
@@ -41,9 +31,16 @@ function issue(params) {
                     if (typeof accountType !== 'string' || accountType.length === 0) {
                         throw new factory.errors.Internal('Account currency undefined');
                     }
-                    return Object.assign({ project: { id: params.project.id }, accountType: accountType, accountNumber, name: (typeof serviceOutputName === 'string') ? serviceOutputName : accountNumber, typeOf: accountTypeOf }, (typeof initialBalance === 'number') ? { initialBalance } : undefined);
+                    return {
+                        project: { id: params.project.id },
+                        accountType: accountType,
+                        accountNumber,
+                        name: (typeof serviceOutputName === 'string') ? serviceOutputName : accountNumber,
+                        typeOf: accountTypeOf,
+                        ...(typeof initialBalance === 'number') ? { initialBalance } : undefined
+                    };
                 });
-                yield AccountService.open(openAccountParams.map((bodyParams) => {
+                await AccountService.open(openAccountParams.map((bodyParams) => {
                     return {
                         project: { id: bodyParams.project.id },
                         typeOf: bodyParams.typeOf,
@@ -60,49 +57,50 @@ function issue(params) {
             // no op
         }
         // サービスアウトプット保管
-        yield repos.serviceOutput.issue(params.serviceOutputs);
-    });
+        await repos.serviceOutput.issue(params.serviceOutputs);
+    };
 }
 /**
  * 許可証有効化
  */
 function activate(params) {
-    return (repos) => __awaiter(this, void 0, void 0, function* () {
+    return async (repos) => {
         // Permitに有効期間を設定する
         return repos.serviceOutput.activate(params);
-    });
+    };
 }
 /**
  * プロジェクト指定で、許可証を検索する(ペイメントカードプロダクトの場合、口座詳細込み)
  */
 function search(project, params, projection) {
-    return (repos) => __awaiter(this, void 0, void 0, function* () {
-        var _a, _b;
+    return async (repos) => {
         let permitsWithAccountDetail;
         // アウトプット検索条件のプロジェクトは強制的に上書き
-        const searchConditions = Object.assign(Object.assign({}, params), { project: { id: { $eq: project.id } } });
-        const productType = (_b = (_a = params.issuedThrough) === null || _a === void 0 ? void 0 : _a.typeOf) === null || _b === void 0 ? void 0 : _b.$eq;
+        const searchConditions = {
+            ...params,
+            project: { id: { $eq: project.id } }
+        };
+        const productType = params.issuedThrough?.typeOf?.$eq;
         switch (productType) {
             case factory.product.ProductType.PaymentCard:
-                const permits = yield repos.serviceOutput.search(searchConditions, projection);
+                const permits = await repos.serviceOutput.search(searchConditions, projection);
                 permitsWithAccountDetail = permits;
                 // 口座詳細取得
                 const accountNumbers = [];
                 permits.forEach((permit) => {
-                    var _a;
-                    const accountNumber = (_a = permit.paymentAccount) === null || _a === void 0 ? void 0 : _a.accountNumber;
+                    const accountNumber = permit.paymentAccount?.accountNumber;
                     if (typeof accountNumber === 'string') {
                         accountNumbers.push(accountNumber);
                     }
                 });
                 if (accountNumbers.length > 0) {
-                    const accounts = yield repos.account.search({
+                    const accounts = await repos.account.search({
                         project: { id: { $eq: project.id } },
                         accountNumbers: accountNumbers
                     });
                     permitsWithAccountDetail = permits.map((permit) => {
-                        const account = accounts.find((a) => { var _a; return a.accountNumber === ((_a = permit.paymentAccount) === null || _a === void 0 ? void 0 : _a.accountNumber); });
-                        const paymentAccount = (typeof (account === null || account === void 0 ? void 0 : account.typeOf) === 'string')
+                        const account = accounts.find((a) => a.accountNumber === permit.paymentAccount?.accountNumber);
+                        const paymentAccount = (typeof account?.typeOf === 'string')
                             ? {
                                 accountNumber: account.accountNumber,
                                 availableBalance: account.availableBalance,
@@ -110,13 +108,16 @@ function search(project, params, projection) {
                                 typeOf: account.typeOf
                             }
                             : undefined;
-                        return Object.assign(Object.assign({}, permit), { paymentAccount });
+                        return {
+                            ...permit,
+                            paymentAccount
+                        };
                     });
                 }
                 break;
             default:
-                permitsWithAccountDetail = (yield repos.serviceOutput.search(searchConditions, projection));
+                permitsWithAccountDetail = await repos.serviceOutput.search(searchConditions, projection);
         }
         return permitsWithAccountDetail;
-    });
+    };
 }