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

package/lib/chevre/service/assetTransaction/pay/publishPaymentUrl.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.publishPaymentUrl = publishPaymentUrl;
 const factory = require("../../../factory");
@@ -50,14 +41,11 @@ function publishPaymentUrlResult2recipe(params) {
 /**
  * 決済ロケーション発行
  */
-// tslint:disable-next-line:max-func-body-length
 function publishPaymentUrl(params, options) {
-    // tslint:disable-next-line:max-func-body-length
-    return (repos, settings) => __awaiter(this, void 0, void 0, function* () {
-        var _a, _b, _c, _d, _e, _f;
-        const paymentServiceType = (_a = params.object) === null || _a === void 0 ? void 0 : _a.typeOf;
+    return async (repos, settings) => {
+        const paymentServiceType = params.object?.typeOf;
         // 金額をfix
-        const amount = (_b = params.object.paymentMethod) === null || _b === void 0 ? void 0 : _b.amount;
+        const amount = params.object.paymentMethod?.amount;
         if (typeof amount !== 'number') {
             throw new factory.errors.ArgumentNull('object.paymentMethod.amount');
         }
@@ -65,36 +53,48 @@ function publishPaymentUrl(params, options) {
         if (typeof transactionNumber !== 'string' || transactionNumber.length === 0) {
             throw new factory.errors.ArgumentNull('transactionNumber');
         }
-        yield (0, validateSeller_1.validateSeller)(params)(repos);
+        await (0, validateSeller_1.validateSeller)(params)(repos);
         // リソースの対応決済方法検証(2025-12-02~)
-        yield (0, validateAcceptedPaymentMethodIfNeeded_1.validateAcceptedPaymentMethodIfNeeded)(params)(repos);
+        await (0, validateAcceptedPaymentMethodIfNeeded_1.validateAcceptedPaymentMethodIfNeeded)(params)(repos);
         // 決済サービス確認
         const paymentServiceId = getPaymentServiceId(params);
         // 決済受入アクション生成(2024-03-28~)
-        const taskId = (_c = options === null || options === void 0 ? void 0 : options.executor) === null || _c === void 0 ? void 0 : _c.id;
-        const actionAttributes = Object.assign(Object.assign(Object.assign({ project: params.project, typeOf: factory.actionType.AcceptAction, agent: params.agent, object: {
+        const taskId = options?.executor?.id;
+        const actionAttributes = {
+            project: params.project,
+            typeOf: factory.actionType.AcceptAction,
+            agent: params.agent,
+            object: {
                 object: params.object,
                 transactionNumber,
                 typeOf: params.typeOf
-            }, purpose: { typeOf: factory.transactionType.PlaceOrder, id: options.purposeAsTransaction.id }, instrument: (Array.isArray(params.instrument)) ? params.instrument : [] }, (typeof taskId === 'string')
-            ? { sameAs: { id: taskId, typeOf: 'Task' } } // タスク関連付け(2024-05-22~)
-            : undefined), (typeof ((_d = params.location) === null || _d === void 0 ? void 0 : _d.typeOf) === 'string')
-            ? { location: params.location }
-            : undefined), (typeof params.identifier === 'string') ? { identifier: params.identifier } : undefined);
-        const action = yield repos.action.start(actionAttributes);
+            },
+            purpose: { typeOf: factory.transactionType.PlaceOrder, id: options.purposeAsTransaction.id },
+            instrument: (Array.isArray(params.instrument)) ? params.instrument : [],
+            ...(typeof taskId === 'string')
+                ? { sameAs: { id: taskId, typeOf: 'Task' } } // タスク関連付け(2024-05-22~)
+                : undefined,
+            ...(typeof params.location?.typeOf === 'string')
+                ? { location: params.location }
+                : undefined,
+            ...(typeof params.identifier === 'string') ? { identifier: params.identifier } : undefined
+        };
+        const action = await repos.action.start(actionAttributes);
         let result;
         let recipe;
         try {
             switch (paymentServiceType) {
                 case factory.service.paymentService.PaymentServiceType.CreditCard:
-                    const authorizeResult = yield CreditCardPayment.authorize(Object.assign(Object.assign({}, params), { id: '' // 決済URL発行プロセスにおいては決済取引IDは使用しないので空文字でok
-                     }), paymentServiceId, {
+                    const authorizeResult = await CreditCardPayment.authorize({
+                        ...params,
+                        id: '' // 決済URL発行プロセスにおいては決済取引IDは使用しないので空文字でok
+                    }, paymentServiceId, {
                         processPublishPaymentUrl: true,
-                        executor: (typeof ((_e = options.executor) === null || _e === void 0 ? void 0 : _e.id) === 'string') ? { id: options.executor.id } : {} // タスク関連付け(2024-05-22~)
+                        executor: (typeof options.executor?.id === 'string') ? { id: options.executor.id } : {} // タスク関連付け(2024-05-22~)
                     })(repos, settings);
                     let paymentUrl;
                     // 3DS拡張(2024-01-02~)
-                    const retUrl = (_f = params.object.paymentMethod.creditCard) === null || _f === void 0 ? void 0 : _f.retUrl;
+                    const retUrl = params.object.paymentMethod.creditCard?.retUrl;
                     if (typeof retUrl === 'string' && retUrl.length > 0) {
                         paymentUrl = authorizeResult.execTranResult.redirectUrl;
                     }
@@ -124,7 +124,7 @@ function publishPaymentUrl(params, options) {
         }
         catch (error) {
             try {
-                yield repos.action.giveUp({ typeOf: actionAttributes.typeOf, id: action.id, error });
+                await repos.action.giveUp({ typeOf: actionAttributes.typeOf, id: action.id, error });
             }
             catch (__) {
                 // 失敗したら仕方ない
@@ -135,14 +135,13 @@ function publishPaymentUrl(params, options) {
             paymentMethodId: result.paymentMethodId,
             paymentUrl: result.paymentUrl
         };
-        yield repos.action.completeWithVoid({ typeOf: actionAttributes.typeOf, id: action.id, result: actionResult, recipe });
+        await repos.action.completeWithVoid({ typeOf: actionAttributes.typeOf, id: action.id, result: actionResult, recipe });
         return result;
-    });
+    };
 }
 function getPaymentServiceId(params) {
-    var _a;
     let paymentServiceId = '';
-    const paymentServiceType = (_a = params.object) === null || _a === void 0 ? void 0 : _a.typeOf;
+    const paymentServiceType = params.object?.typeOf;
     if (typeof params.object.id === 'string' && params.object.id.length > 0) {
         paymentServiceId = params.object.id;
     }

package/lib/chevre/service/assetTransaction/pay/searchGMOTrade.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.searchGMOTrade = searchGMOTrade;
 const factory = require("../../../factory");
@@ -16,9 +7,8 @@ const CreditCardPayment = require("../../payment/creditCard");
  * 決済代行取引参照
  */
 function searchGMOTrade(params) {
-    return (repos, settings) => __awaiter(this, void 0, void 0, function* () {
-        var _a, _b;
-        const assetTransaction = yield repos.assetTransaction.findByTransactionNumber({
+    return async (repos, settings) => {
+        const assetTransaction = await repos.assetTransaction.findByTransactionNumber({
             typeOf: factory.assetTransactionType.Pay,
             transactionNumber: params.transactionNumber
         });
@@ -29,21 +19,21 @@ function searchGMOTrade(params) {
         //     throw new factory.errors.Argument('transactionNumber', 'must be confirmed');
         // }
         // CreditCard系統の決済方法タイプは動的
-        const paymentMethodType = (_a = assetTransaction.object.paymentMethod) === null || _a === void 0 ? void 0 : _a.identifier;
+        const paymentMethodType = assetTransaction.object.paymentMethod?.identifier;
         if (typeof paymentMethodType !== 'string') {
             throw new factory.errors.ArgumentNull('object.paymentMethod.identifier');
         }
         const paymentServiceId = String(assetTransaction.object.id);
-        const availableChannel = yield repos.paymentService.findAvailableChannelCreditCard({
+        const availableChannel = await repos.paymentService.findAvailableChannelCreditCard({
             project: assetTransaction.project,
             // typeOf: factory.service.paymentService.PaymentServiceType.CreditCard,
             id: paymentServiceId
         });
-        const sellerId = (_b = assetTransaction.recipient) === null || _b === void 0 ? void 0 : _b.id;
+        const sellerId = assetTransaction.recipient?.id;
         if (typeof sellerId !== 'string') {
             throw new factory.errors.ArgumentNull('recipient.id');
         }
-        const { shopId, shopPass } = yield CreditCardPayment.getGMOInfoFromSeller({
+        const { shopId, shopPass } = await CreditCardPayment.getGMOInfoFromSeller({
             paymentMethodType,
             seller: { id: sellerId },
             paymentServiceId,
@@ -55,5 +45,5 @@ function searchGMOTrade(params) {
             shopId,
             shopPass
         }, settings);
-    });
+    };
 }

package/lib/chevre/service/assetTransaction/pay/start/account/validation.js

@@ -1,30 +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.validateAccount = validateAccount;
 const factory = require("../../../../../factory");
 function validateAccount(params) {
-    return (repos) => __awaiter(this, void 0, void 0, function* () {
-        var _a, _b, _c;
+    return async (repos) => {
         // 引き出し口座の存在を確認する
-        const paymentMethodType = (_a = params.object.paymentMethod) === null || _a === void 0 ? void 0 : _a.identifier;
+        const paymentMethodType = params.object.paymentMethod?.identifier;
         if (typeof paymentMethodType !== 'string') {
             throw new factory.errors.ArgumentNull('object.paymentMethod.identifier');
         }
-        const accountNumber = (_b = params.object.paymentMethod) === null || _b === void 0 ? void 0 : _b.accountId;
+        const accountNumber = params.object.paymentMethod?.accountId;
         if (typeof accountNumber !== 'string') {
             throw new factory.errors.ArgumentNull('object.paymentMethod.accountId');
         }
         // 販売者から決済情報取得
-        const sellerId = (_c = params.recipient) === null || _c === void 0 ? void 0 : _c.id;
+        const sellerId = params.recipient?.id;
         if (typeof sellerId !== 'string') {
             throw new factory.errors.ArgumentNull('recipient.id');
         }
@@ -42,12 +32,12 @@ function validateAccount(params) {
         //     throw new factory.errors.NotFound(factory.organizationType.Corporation);
         // }
         // const paymentAccepted = seller.paymentAccepted?.some((a) => a.paymentMethodType === paymentMethodType);
-        const paymentAccepted = yield repos.paymentAccepted.isAcceptedBySeller({
+        const paymentAccepted = await repos.paymentAccepted.isAcceptedBySeller({
             seller: { id: sellerId },
             codeValue: paymentMethodType
         });
         if (paymentAccepted !== true) {
             throw new factory.errors.Argument('recipient', `payment not accepted [${paymentMethodType}]`);
         }
-    });
+    };
 }

package/lib/chevre/service/assetTransaction/pay/start/factory.js

@@ -5,22 +5,20 @@ exports.createStartParams = createStartParams;
  * 決済取引ファクトリー
  */
 const factory = require("../../../../factory");
-// tslint:disable-next-line:cyclomatic-complexity max-func-body-length
 function createStartParams(params, options) {
-    var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s, _t, _u, _v, _w, _x, _y, _z, _0, _1;
     const { instrument } = params;
     const paymentServiceId = (params.paymentService !== undefined)
         ? String(params.paymentService.id)
         : '';
     const paymentMethodType = (params.paymentService !== undefined)
         // FaceToFace以外は、プロダクトから決済方法タイプを自動取得
-        ? (_a = params.paymentService.serviceType) === null || _a === void 0 ? void 0 : _a.codeValue
-        : (_b = params.object.paymentMethod) === null || _b === void 0 ? void 0 : _b.identifier;
+        ? params.paymentService.serviceType?.codeValue
+        : params.object.paymentMethod?.identifier;
     if (typeof paymentMethodType !== 'string') {
         throw new factory.errors.ArgumentNull('object.paymentMethod.identifier');
     }
     let totalPaymentDue;
-    let accountId = (_c = params.object.paymentMethod) === null || _c === void 0 ? void 0 : _c.accountId;
+    let accountId = params.object.paymentMethod?.accountId;
     switch (params.paymentServiceType) {
         case factory.service.paymentService.PaymentServiceType.FaceToFace:
             // 対面決済ではとりあえず問答無用にJPY
@@ -39,14 +37,14 @@ function createStartParams(params, options) {
             accountId = ''; // 強制的に空文字化(2024-06-14~)
             break;
         case factory.service.paymentService.PaymentServiceType.MovieTicket:
-            const specifiedMovieTickets = (_d = params.object.paymentMethod) === null || _d === void 0 ? void 0 : _d.movieTickets;
+            const specifiedMovieTickets = params.object.paymentMethod?.movieTickets;
             totalPaymentDue = {
                 typeOf: 'MonetaryAmount',
                 currency: factory.unitCode.C62,
                 value: (Array.isArray(specifiedMovieTickets)) ? specifiedMovieTickets.length : 0
             };
             // MovieTicketIFの決済取引において最大同時着券数を設定可能にする(2023-03-27~)
-            const totalPaymentDueMaxValue = (_g = (_f = (_e = params.paymentService) === null || _e === void 0 ? void 0 : _e.availableChannel) === null || _f === void 0 ? void 0 : _f.totalPaymentDue) === null || _g === void 0 ? void 0 : _g.maxValue;
+            const totalPaymentDueMaxValue = params.paymentService?.availableChannel?.totalPaymentDue?.maxValue;
             const totalPaymentDueValue = totalPaymentDue.value;
             if (typeof totalPaymentDueValue === 'number' && typeof totalPaymentDueMaxValue === 'number') {
                 if (totalPaymentDueValue > totalPaymentDueMaxValue) {
@@ -67,19 +65,19 @@ function createStartParams(params, options) {
     // currencyはデフォルトでJPY
     let paymentMethodCurrency = factory.priceCurrency.JPY;
     if (params.paymentServiceType === factory.service.paymentService.PaymentServiceType.PaymentCard) {
-        const paymentCardServiceOutputCurrency = (_k = (_j = (_h = params.paymentService) === null || _h === void 0 ? void 0 : _h.serviceOutput) === null || _j === void 0 ? void 0 : _j.amount) === null || _k === void 0 ? void 0 : _k.currency;
+        const paymentCardServiceOutputCurrency = params.paymentService?.serviceOutput?.amount?.currency;
         if (typeof paymentCardServiceOutputCurrency === 'string') {
             paymentMethodCurrency = paymentCardServiceOutputCurrency;
         }
     }
     else if (params.paymentServiceType === factory.service.paymentService.PaymentServiceType.CreditCard) {
-        const creditCardPaymentServiceOutput = (_l = params.paymentService) === null || _l === void 0 ? void 0 : _l.serviceOutput;
+        const creditCardPaymentServiceOutput = params.paymentService?.serviceOutput;
         const invoiceAsServiceOutput = (Array.isArray(creditCardPaymentServiceOutput))
-            ? creditCardPaymentServiceOutput.find((output) => (output === null || output === void 0 ? void 0 : output.typeOf) === 'Invoice')
+            ? creditCardPaymentServiceOutput.find((output) => output?.typeOf === 'Invoice')
             : creditCardPaymentServiceOutput;
         // カード通貨区分が存在すれば適用
-        if ((invoiceAsServiceOutput === null || invoiceAsServiceOutput === void 0 ? void 0 : invoiceAsServiceOutput.typeOf) === 'Invoice') {
-            const creditCardAsPaymentServiceOutputCurrency = (_o = (_m = invoiceAsServiceOutput.paymentMethod) === null || _m === void 0 ? void 0 : _m.amount) === null || _o === void 0 ? void 0 : _o.currency;
+        if (invoiceAsServiceOutput?.typeOf === 'Invoice') {
+            const creditCardAsPaymentServiceOutputCurrency = invoiceAsServiceOutput.paymentMethod?.amount?.currency;
             if (typeof creditCardAsPaymentServiceOutputCurrency === 'string') {
                 paymentMethodCurrency = creditCardAsPaymentServiceOutputCurrency;
             }
@@ -90,43 +88,72 @@ function createStartParams(params, options) {
         currency: paymentMethodCurrency,
         value: params.amount
     };
-    const paymentMethod = Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign({ additionalProperty: (Array.isArray((_p = params.object.paymentMethod) === null || _p === void 0 ? void 0 : _p.additionalProperty))
-            ? (_q = params.object.paymentMethod) === null || _q === void 0 ? void 0 : _q.additionalProperty
-            : [], name: (typeof ((_r = params.object.paymentMethod) === null || _r === void 0 ? void 0 : _r.name) === 'string')
+    const paymentMethod = {
+        additionalProperty: (Array.isArray(params.object.paymentMethod?.additionalProperty))
+            ? params.object.paymentMethod?.additionalProperty
+            : [],
+        name: (typeof params.object.paymentMethod?.name === 'string')
             ? params.object.paymentMethod.name
-            : paymentMethodType, amount: paymentMethodAmount, identifier: paymentMethodType }, (typeof ((_s = params.object.paymentMethod) === null || _s === void 0 ? void 0 : _s.description) === 'string')
-        ? { description: (_t = params.object.paymentMethod) === null || _t === void 0 ? void 0 : _t.description }
-        : undefined), (totalPaymentDue !== undefined)
-        ? { totalPaymentDue: totalPaymentDue }
-        : undefined), (typeof accountId === 'string') ? { accountId: accountId } : undefined), (typeof ((_u = params.object.paymentMethod) === null || _u === void 0 ? void 0 : _u.method) === 'string')
-        ? { method: (_v = params.object.paymentMethod) === null || _v === void 0 ? void 0 : _v.method }
-        : undefined), (((_w = params.object.paymentMethod) === null || _w === void 0 ? void 0 : _w.creditCard) !== undefined)
-        ? { creditCard: (_x = params.object.paymentMethod) === null || _x === void 0 ? void 0 : _x.creditCard }
-        : undefined), (Array.isArray((_y = params.object.paymentMethod) === null || _y === void 0 ? void 0 : _y.movieTickets))
-        ? { movieTickets: (_z = params.object.paymentMethod) === null || _z === void 0 ? void 0 : _z.movieTickets }
-        : undefined), (params.paymentServiceType === factory.service.paymentService.PaymentServiceType.CreditCard)
-        ? { paymentMethodId: params.transactionNumber } // 必要ないはずだが互換性維持対応(2024-06-14~)
-        : undefined);
-    const object = Object.assign({ accountId: (typeof accountId === 'string') ? accountId : '', paymentMethodId: params.transactionNumber, typeOf: params.paymentServiceType, id: paymentServiceId, 
+            : paymentMethodType,
+        amount: paymentMethodAmount, // MonetaryAmount対応(2023-08-14~)
+        identifier: paymentMethodType, // 追加(2023-08-29~)
+        ...(typeof params.object.paymentMethod?.description === 'string')
+            ? { description: params.object.paymentMethod?.description }
+            : undefined,
+        ...(totalPaymentDue !== undefined)
+            ? { totalPaymentDue: totalPaymentDue }
+            : undefined,
+        ...(typeof accountId === 'string') ? { accountId: accountId } : undefined,
+        ...(typeof params.object.paymentMethod?.method === 'string')
+            ? { method: params.object.paymentMethod?.method }
+            : undefined,
+        ...(params.object.paymentMethod?.creditCard !== undefined)
+            ? { creditCard: params.object.paymentMethod?.creditCard }
+            : undefined,
+        ...(Array.isArray(params.object.paymentMethod?.movieTickets))
+            ? { movieTickets: params.object.paymentMethod?.movieTickets }
+            : undefined,
+        ...(params.paymentServiceType === factory.service.paymentService.PaymentServiceType.CreditCard)
+            ? { paymentMethodId: params.transactionNumber } // 必要ないはずだが互換性維持対応(2024-06-14~)
+            : undefined
+    };
+    const object = {
+        accountId: (typeof accountId === 'string') ? accountId : '',
+        paymentMethodId: params.transactionNumber,
+        typeOf: params.paymentServiceType,
+        id: paymentServiceId,
         // onPaymentStatusChanged: { informPayment: params.informActions }, // discontinue(2025-02-09~)
-        paymentMethod, serviceOutput: (((_0 = params.object.serviceOutput) === null || _0 === void 0 ? void 0 : _0.typeOf) === 'Invoice') // support serviceOutput(2025-11-24~)
+        paymentMethod,
+        serviceOutput: (params.object.serviceOutput?.typeOf === 'Invoice') // support serviceOutput(2025-11-24~)
             ? params.object.serviceOutput
             : {
                 typeOf: 'Invoice',
                 referencesOrder: { typeOf: factory.order.OrderType.Order }
-            } }, (params.paymentServiceType === factory.service.paymentService.PaymentServiceType.MovieTicket)
-        ? { checkedAction: { id: options.checkedAction.id } } // add checkedAction(2024-12-13~)
-        : undefined);
+            },
+        ...(params.paymentServiceType === factory.service.paymentService.PaymentServiceType.MovieTicket)
+            ? { checkedAction: { id: options.checkedAction.id } } // add checkedAction(2024-12-13~)
+            : undefined
+    };
     const potentialAction = [];
     params.informActions.forEach((informAction) => {
         if (typeof informAction.id === 'string' && informAction.id !== '') {
             potentialAction.push({ id: informAction.id, typeOf: factory.actionType.InformAction });
         }
     });
-    return Object.assign(Object.assign({ project: { typeOf: factory.organizationType.Project, id: params.project.id }, transactionNumber: params.transactionNumber, typeOf: factory.assetTransactionType.Pay, agent: params.agent, recipient: params.recipient, object, expires: params.expires, instrument: (Array.isArray(instrument)) ? instrument : [] }, (typeof ((_1 = params.location) === null || _1 === void 0 ? void 0 : _1.typeOf) === 'string')
-        ? { location: params.location }
-        : undefined), (potentialAction.length > 0) ? { potentialAction } : undefined // add potentialAction(2025-02-05~)
-    );
+    return {
+        project: { typeOf: factory.organizationType.Project, id: params.project.id },
+        transactionNumber: params.transactionNumber,
+        typeOf: factory.assetTransactionType.Pay,
+        agent: params.agent,
+        recipient: params.recipient,
+        object,
+        expires: params.expires,
+        instrument: (Array.isArray(instrument)) ? instrument : [], // add(2025-02-18~)
+        ...(typeof params.location?.typeOf === 'string')
+            ? { location: params.location }
+            : undefined,
+        ...(potentialAction.length > 0) ? { potentialAction } : undefined // add potentialAction(2025-02-05~)
+    };
 }
 // function createInformPaymentParams(params: {
 //     paymentService?: Pick<factory.service.paymentService.IService, 'availableChannel' | 'potentialAction'>;

package/lib/chevre/service/assetTransaction/pay/start/preStart/validateAcceptedPaymentMethodIfNeeded.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.validateAcceptedPaymentMethodIfNeeded = validateAcceptedPaymentMethodIfNeeded;
 const createDebug = require("debug");
@@ -16,11 +7,8 @@ const debug = createDebug('chevre-domain:service:assetTransaction:pay');
 /**
  * 必要あらば関連リソースの対応決済方法を検証する
  */
-// tslint:disable-next-line:max-func-body-length
 function validateAcceptedPaymentMethodIfNeeded(params) {
-    // tslint:disable-next-line:max-func-body-length
-    return (repos) => __awaiter(this, void 0, void 0, function* () {
-        var _a, _b;
+    return async (repos) => {
         const now = new Date();
         /**
          * 検証対象のイベントIDリスト
@@ -31,7 +19,7 @@ function validateAcceptedPaymentMethodIfNeeded(params) {
         // CreditCard or MovieTicket?
         if (paymentServiceType === factory.service.paymentService.PaymentServiceType.CreditCard) {
             // クレジットカードIF決済の場合、objectに注文アイテム指定があればそちらで検証する
-            const orderedItems = (_a = params.object.serviceOutput) === null || _a === void 0 ? void 0 : _a.referencesOrder.orderedItem;
+            const orderedItems = params.object.serviceOutput?.referencesOrder.orderedItem;
             if (Array.isArray(orderedItems)) {
                 checkingEventIds = orderedItems.map((orderedItem) => orderedItem.orderedItem.serviceOutput.reservationFor.id);
             }
@@ -56,7 +44,7 @@ function validateAcceptedPaymentMethodIfNeeded(params) {
                 throw new factory.errors.ArgumentNull('object.serviceOutput.referencesOrder.orderedItem');
             }
             // 指定された全イベントについて、施設コンテンツの対応決済方法を検証する
-            const eventSeriesIds = (yield repos.event.projectEventFields({
+            const eventSeriesIds = (await repos.event.projectEventFields({
                 limit: checkingEventIds.length,
                 page: 1,
                 id: { $in: checkingEventIds },
@@ -68,7 +56,7 @@ function validateAcceptedPaymentMethodIfNeeded(params) {
             const uniqueEventSeriesIds = [...new Set(eventSeriesIds)];
             debug('validateAcceptedPaymentMethodIfNeeded: eventSeries with AggregateOffer?', uniqueEventSeriesIds);
             for (const eventSeriesId of uniqueEventSeriesIds) {
-                const eventSeries = (yield repos.eventSeries.projectEventSeriesFields({
+                const eventSeries = (await repos.eventSeries.projectEventSeriesFields({
                     limit: 1,
                     page: 1,
                     id: { $eq: eventSeriesId }
@@ -76,7 +64,7 @@ function validateAcceptedPaymentMethodIfNeeded(params) {
                 if (eventSeries === undefined) {
                     throw new factory.errors.NotFound(factory.eventType.ScreeningEventSeries);
                 }
-                if (((_b = eventSeries.offers) === null || _b === void 0 ? void 0 : _b.typeOf) === factory.offerType.AggregateOffer) {
+                if (eventSeries.offers?.typeOf === factory.offerType.AggregateOffer) {
                     // 対応決済方法オファーIDの指定が必要
                     const acceptedPaymentMethodOfferIds = [];
                     params.instrument.forEach((instrument) => {
@@ -88,7 +76,7 @@ function validateAcceptedPaymentMethodIfNeeded(params) {
                         throw new factory.errors.ArgumentNull('acceptedPaymentMethodOfferIds');
                     }
                     // 全施設コンテンツについて有効な対応決済方法オファーの存在を検証
-                    const validAcceptedPaymentMethodOffer = (yield repos.acceptedPaymentMethod.findAcceptedPaymentMethods({
+                    const validAcceptedPaymentMethodOffer = (await repos.acceptedPaymentMethod.findAcceptedPaymentMethods({
                         limit: 1,
                         page: 1,
                         id: { $in: acceptedPaymentMethodOfferIds }, // 指定されたIDで
@@ -109,5 +97,5 @@ function validateAcceptedPaymentMethodIfNeeded(params) {
         else {
             // 関連注文の指定がなければ検証の必要なし
         }
-    });
+    };
 }

package/lib/chevre/service/assetTransaction/pay/start/preStart/validateSeller.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.validateSeller = validateSeller;
 const factory = require("../../../../../factory");
@@ -15,13 +6,12 @@ const factory = require("../../../../../factory");
  * 販売者の対応決済方法検証
  */
 function validateSeller(params) {
-    return (repos) => __awaiter(this, void 0, void 0, function* () {
-        var _a, _b;
-        const sellerId = (_a = params.recipient) === null || _a === void 0 ? void 0 : _a.id;
+    return async (repos) => {
+        const sellerId = params.recipient?.id;
         if (typeof sellerId !== 'string') {
             throw new factory.errors.ArgumentNull('recipient.id');
         }
-        const paymentMethodType = (_b = params.object.paymentMethod) === null || _b === void 0 ? void 0 : _b.identifier;
+        const paymentMethodType = params.object.paymentMethod?.identifier;
         if (typeof paymentMethodType !== 'string') {
             throw new factory.errors.ArgumentNull('object.paymentMethod.identifier');
         }
@@ -30,7 +20,7 @@ function validateSeller(params) {
             if (paymentMethodType.length > 0) {
                 // 販売者の対応決済方法かどうか確認
                 // const paymentAccepted = seller.paymentAccepted?.some((a) => a.paymentMethodType === paymentMethodType);
-                const paymentAccepted = yield repos.paymentAccepted.isAcceptedBySeller({
+                const paymentAccepted = await repos.paymentAccepted.isAcceptedBySeller({
                     seller: { id: sellerId },
                     codeValue: paymentMethodType
                 });
@@ -42,7 +32,7 @@ function validateSeller(params) {
         else {
             // 販売者の対応決済方法かどうか確認
             // const paymentAccepted = seller.paymentAccepted?.some((a) => a.paymentMethodType === paymentMethodType);
-            const paymentAccepted = yield repos.paymentAccepted.isAcceptedBySeller({
+            const paymentAccepted = await repos.paymentAccepted.isAcceptedBySeller({
                 seller: { id: sellerId },
                 codeValue: paymentMethodType
             });
@@ -50,5 +40,5 @@ function validateSeller(params) {
                 throw new factory.errors.Argument('object.paymentMethod.identifier', `payment not accepted [${paymentMethodType}]`);
             }
         }
-    });
+    };
 }

package/lib/chevre/service/assetTransaction/pay/start/processAuthorizeAccount.js

@@ -1,27 +1,17 @@
 "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.processAuthorizeAccount = processAuthorizeAccount;
 const factory = require("../../../../factory");
 const PaymentCardPayment = require("../../../payment/paymentCard");
 const validation_1 = require("./account/validation");
 function processAuthorizeAccount(params, transaction, paymentServiceId) {
-    return (repos) => __awaiter(this, void 0, void 0, function* () {
-        var _a;
-        const amount = (_a = params.object.paymentMethod) === null || _a === void 0 ? void 0 : _a.amount;
+    return async (repos) => {
+        const amount = params.object.paymentMethod?.amount;
         if (typeof amount !== 'number') {
             throw new factory.errors.ArgumentNull('object.paymentMethod?.amount');
         }
-        yield (0, validation_1.validateAccount)(params)(repos);
-        const { pendingTransaction, currency, accountNumber } = yield PaymentCardPayment.authorize(params, paymentServiceId)(repos);
+        await (0, validation_1.validateAccount)(params)(repos);
+        const { pendingTransaction, currency, accountNumber } = await PaymentCardPayment.authorize(params, paymentServiceId)(repos);
         const totalPaymentDue = {
             typeOf: 'MonetaryAmount',
             currency,
@@ -40,10 +30,10 @@ function processAuthorizeAccount(params, transaction, paymentServiceId) {
                 'object.pendingTransaction': savingPendingTransaction
             }
         })(repos);
-    });
+    };
 }
 function saveAuthorizeResult(params) {
-    return (repos) => __awaiter(this, void 0, void 0, function* () {
+    return async (repos) => {
         return repos.assetTransaction.findByIdAndUpdateInProgress(params);
-    });
+    };
 }

package/lib/chevre/service/assetTransaction/pay/start/processAuthorizeCreditCard.js

@@ -1,22 +1,16 @@
 "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.processAuthorizeCreditCard = processAuthorizeCreditCard;
 const CreditCardPayment = require("../../../payment/creditCard");
 function processAuthorizeCreditCard(params, transaction, paymentServiceId, options) {
-    return (repos, settings) => __awaiter(this, void 0, void 0, function* () {
-        var _a;
-        yield CreditCardPayment.authorize(Object.assign(Object.assign({}, params), { id: transaction.id }), paymentServiceId, Object.assign({ processPublishPaymentUrl: false, executor: (typeof ((_a = options.executor) === null || _a === void 0 ? void 0 : _a.id) === 'string') ? { id: options.executor.id } : {} }, (options.pendingPaymentAgencyTransaction !== undefined)
-            ? { pendingPaymentAgencyTransaction: options.pendingPaymentAgencyTransaction }
-            : undefined))(repos, settings);
+    return async (repos, settings) => {
+        await CreditCardPayment.authorize({ ...params, id: transaction.id }, paymentServiceId, {
+            processPublishPaymentUrl: false,
+            executor: (typeof options.executor?.id === 'string') ? { id: options.executor.id } : {}, // タスク関連付け(2024-05-18~)
+            ...(options.pendingPaymentAgencyTransaction !== undefined)
+                ? { pendingPaymentAgencyTransaction: options.pendingPaymentAgencyTransaction }
+                : undefined
+        })(repos, settings);
         // ↓discontinue(2024-06-14~)
         // return saveAuthorizeResult({
         //     id: transaction.id,
@@ -33,5 +27,5 @@ function processAuthorizeCreditCard(params, transaction, paymentServiceId, optio
         //             : undefined
         //     }
         // })(repos);
-    });
+    };
 }