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

package/lib/chevre/service/payment/any.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.person2username = exports.onPaymentStatusChanged = void 0;
 exports.authorize = authorize;
@@ -36,9 +27,9 @@ Object.defineProperty(exports, "person2username", { enumerable: true, get: funct
  * タスクから決済承認を取り消す
  */
 function voidPayTransaction(params) {
-    return (repos
+    return async (repos
     // settings: Settings
-    ) => __awaiter(this, void 0, void 0, function* () {
+    ) => {
         // 決済承認アクション確認不要(2024-03-12~)
         // 決済承認アクションを検索
         // let authorizeActions = <factory.action.authorize.paymentMethod.any.IAction[]>
@@ -59,21 +50,20 @@ function voidPayTransaction(params) {
         // if (authorizeActionsWithChevre.length > 0) {
         //     await processVoidPayTransaction(params)(repos);
         // }
-        yield processVoidPayTransaction(params)(repos);
+        await processVoidPayTransaction(params)(repos);
         // 決済URL無効化もここで処理
-        yield invalidatePaymentUrl(params)(repos);
-    });
+        await invalidatePaymentUrl(params)(repos);
+    };
 }
 function invalidatePaymentUrl(params) {
     // tslint:disable-next-line:max-func-body-length
-    return (repos
+    return async (repos
     // settings: Settings
-    ) => __awaiter(this, void 0, void 0, function* () {
-        var _a, _b, _c, _d;
+    ) => {
         if (params.purpose.typeOf !== factory.transactionType.PlaceOrder) {
             throw new factory.errors.Argument('purpose.typeOf', `must be ${factory.transactionType.PlaceOrder}`);
         }
-        const transaction = yield repos.transaction.projectFieldsById({
+        const transaction = await repos.transaction.projectFieldsById({
             typeOf: params.purpose.typeOf,
             id: params.purpose.id
         }, ['typeOf', 'status', 'object', 'project', 'seller', 'agent']);
@@ -85,7 +75,7 @@ function invalidatePaymentUrl(params) {
         //     }
         // }
         // support multiple accept actions(2025-02-25~)
-        let acceptPayActions = yield repos.action.search({
+        let acceptPayActions = await repos.action.search({
             project: { id: { $eq: transaction.project.id } },
             typeOf: { $eq: factory.actionType.AcceptAction },
             // actionStatus: { $in: [factory.actionStatusType.CompletedActionStatus] }, // all statuses(2025-02-26~)
@@ -100,9 +90,9 @@ function invalidatePaymentUrl(params) {
                 throw new factory.errors.NotImplemented(`${transaction.status} not implemented`);
             case factory.transactionStatusType.Confirmed:
                 // support OrderCanceled(2025-02-25~)
-                const orderCancelled = ((_b = (_a = params.purpose.result) === null || _a === void 0 ? void 0 : _a.order) === null || _b === void 0 ? void 0 : _b.orderStatus) === factory.orderStatus.OrderCancelled;
+                const orderCancelled = params.purpose.result?.order?.orderStatus === factory.orderStatus.OrderCancelled;
                 if (!orderCancelled) {
-                    const paymentMethodIdByPaymentUrl = (_c = transaction.object.paymentMethods) === null || _c === void 0 ? void 0 : _c.paymentMethodId;
+                    const paymentMethodIdByPaymentUrl = transaction.object.paymentMethods?.paymentMethodId;
                     if (typeof paymentMethodIdByPaymentUrl === 'string') {
                         acceptPayActions = acceptPayActions.filter(({ object }) => object.transactionNumber !== paymentMethodIdByPaymentUrl);
                     }
@@ -126,7 +116,7 @@ function invalidatePaymentUrl(params) {
                         typeOf: transaction.seller.typeOf,
                         name: (typeof transaction.seller.name === 'string')
                             ? transaction.seller.name
-                            : String((_d = transaction.seller.name) === null || _d === void 0 ? void 0 : _d.ja),
+                            : String(transaction.seller.name?.ja),
                         id: transaction.seller.id
                     },
                     recipient: {
@@ -162,7 +152,7 @@ function invalidatePaymentUrl(params) {
             }
         }
         if (invalidatePaymentUrlTasks.length > 0) {
-            yield repos.task.saveMany(invalidatePaymentUrlTasks, { emitImmediately: true });
+            await repos.task.saveMany(invalidatePaymentUrlTasks, { emitImmediately: true });
         }
         // const paymentMethodIdByPaymentUrl = transaction.object.paymentMethods?.paymentMethodId;
         // if (typeof paymentMethodIdByPaymentUrl === 'string' && paymentMethodIdByPaymentUrl.length > 0) {
@@ -219,7 +209,7 @@ function invalidatePaymentUrl(params) {
         //         }
         //     }
         // }
-    });
+    };
 }
 /**
  * 決済承認中止
@@ -227,21 +217,24 @@ function invalidatePaymentUrl(params) {
  */
 function processVoidPayTransaction(params) {
     // tslint:disable-next-line:max-func-body-length
-    return (repos) => __awaiter(this, void 0, void 0, function* () {
-        var _a, _b, _c, _d, _e;
-        const cancelAction = Object.assign({ startTime: new Date(), agent: { id: params.project.id, typeOf: factory.organizationType.Project } }, (typeof ((_a = params.sameAs) === null || _a === void 0 ? void 0 : _a.id) === 'string') ? { sameAs: { id: params.sameAs.id, typeOf: 'Task' } } : undefined);
+    return async (repos) => {
+        const cancelAction = {
+            startTime: new Date(),
+            agent: { id: params.project.id, typeOf: factory.organizationType.Project },
+            ...(typeof params.sameAs?.id === 'string') ? { sameAs: { id: params.sameAs.id, typeOf: 'Task' } } : undefined
+        };
         let transaction;
         // アクションID指定の場合、進行中取引検証(2023-02-24~)
         if (typeof params.id === 'string') {
-            transaction = (yield repos.transaction.projectFieldsInProgressById({ typeOf: params.purpose.typeOf, id: params.purpose.id }, ['typeOf', 'status']));
+            transaction = await repos.transaction.projectFieldsInProgressById({ typeOf: params.purpose.typeOf, id: params.purpose.id }, ['typeOf', 'status']);
         }
         else {
-            transaction = (yield repos.transaction.projectFieldsById({ typeOf: params.purpose.typeOf, id: params.purpose.id }, ['typeOf', 'status', 'result']));
+            transaction = await repos.transaction.projectFieldsById({ typeOf: params.purpose.typeOf, id: params.purpose.id }, ['typeOf', 'status', 'result']);
         }
         // 承認アクションを取得
         let authorizeActions;
         if (typeof params.id === 'string') {
-            const authorizeAction = yield repos.action.findById({ typeOf: factory.actionType.AuthorizeAction, id: params.id });
+            const authorizeAction = await repos.action.findById({ typeOf: factory.actionType.AuthorizeAction, id: params.id });
             // 取引内のアクションかどうか確認
             if (authorizeAction.purpose.typeOf !== transaction.typeOf || authorizeAction.purpose.id !== transaction.id) {
                 throw new factory.errors.Argument('Transaction', 'Action not found in the transaction');
@@ -249,21 +242,21 @@ function processVoidPayTransaction(params) {
             authorizeActions = [authorizeAction];
         }
         else {
-            authorizeActions = (yield repos.action.searchByPurpose({
+            authorizeActions = await repos.action.searchByPurpose({
                 typeOf: factory.actionType.AuthorizeAction,
                 purpose: { typeOf: transaction.typeOf, id: transaction.id },
                 object: { typeOf: { $eq: factory.action.authorize.paymentMethod.any.ResultType.Payment } }
-            }));
+            });
             switch (transaction.status) {
                 case factory.transactionStatusType.InProgress:
                     throw new factory.errors.NotImplemented(`${transaction.status} not implemented`);
                 case factory.transactionStatusType.Confirmed:
                     // OrderCancelledを考慮(2023-08-30~)
-                    const orderCancelled = ((_c = (_b = params.purpose.result) === null || _b === void 0 ? void 0 : _b.order) === null || _c === void 0 ? void 0 : _c.orderStatus) === factory.orderStatus.OrderCancelled;
+                    const orderCancelled = params.purpose.result?.order?.orderStatus === factory.orderStatus.OrderCancelled;
                     if (!orderCancelled) {
                         // 取り消すべきアクションに絞る
                         authorizeActions = authorizeActions.filter(({ actionStatus }) => actionStatus !== factory.actionStatusType.CompletedActionStatus);
-                        const actionIdsFromTransactionResult = (_e = (_d = transaction.result) === null || _d === void 0 ? void 0 : _d.authorizeActions) === null || _e === void 0 ? void 0 : _e.map(({ id }) => id);
+                        const actionIdsFromTransactionResult = transaction.result?.authorizeActions?.map(({ id }) => id);
                         if (!Array.isArray(actionIdsFromTransactionResult)) {
                             throw new factory.errors.Argument('Transaction', `${transaction.id} must have result.authorizeActions`);
                         }
@@ -287,11 +280,11 @@ function processVoidPayTransaction(params) {
         for (const action of authorizeActions) {
             // 失敗するケースがあっても、残りが少なくとも処理されるようにエラーハンドリング
             try {
-                yield repos.action.cancelWithVoid({ typeOf: action.typeOf, id: action.id, cancelAction });
+                await repos.action.cancelWithVoid({ typeOf: action.typeOf, id: action.id, cancelAction });
                 // 取引が存在すれば中止
                 const transactionNumber = action.object.paymentMethodId;
                 if (typeof transactionNumber === 'string' && transactionNumber.length > 0) {
-                    const payTransaction = (yield repos.assetTransaction.search({
+                    const payTransaction = (await repos.assetTransaction.search({
                         limit: 1,
                         page: 1,
                         project: { id: { $eq: action.project.id } },
@@ -302,7 +295,7 @@ function processVoidPayTransaction(params) {
                         // ステータス検証(Expiredから実行される可能性がある)
                         if (payTransaction.status !== factory.transactionStatusType.Canceled
                             && payTransaction.status !== factory.transactionStatusType.Expired) {
-                            yield PayTransactionService.cancel({ transactionNumber })(repos);
+                            await PayTransactionService.cancel({ transactionNumber })(repos);
                         }
                     }
                 }
@@ -314,7 +307,7 @@ function processVoidPayTransaction(params) {
         if (errors.length > 0) {
             throw errors[0];
         }
-    });
+    };
 }
 /**
  * 外部決済ロケーションを発行する
@@ -322,25 +315,24 @@ function processVoidPayTransaction(params) {
 // tslint:disable-next-line:max-func-body-length
 function publishPaymentUrl(params) {
     // tslint:disable-next-line:max-func-body-length
-    return (repos, settings) => __awaiter(this, void 0, void 0, function* () {
-        var _a, _b;
+    return async (repos, settings) => {
         const { paymentServiceType, purpose, project } = params;
         if (purpose.typeOf !== factory.transactionType.PlaceOrder) {
             throw new factory.errors.NotImplemented(`purpose.typeOf '${purpose.typeOf} not implemented'`);
         }
         try {
-            const transaction = yield repos.transaction.projectFieldsInProgressById({ typeOf: purpose.typeOf, id: purpose.id }, ['expires', 'seller', 'project']);
+            const transaction = await repos.transaction.projectFieldsInProgressById({ typeOf: purpose.typeOf, id: purpose.id }, ['expires', 'seller', 'project']);
             if (project.id !== transaction.project.id) {
                 throw new factory.errors.NotFound(factory.transactionType.PlaceOrder);
             }
             // publishOrderNumber(2025-03-11~)
-            yield (0, publishOrderNumberIfNotExist_1.publishOrderNumberIfNotExist)({
+            await (0, publishOrderNumberIfNotExist_1.publishOrderNumberIfNotExist)({
                 project: { id: transaction.project.id },
                 id: transaction.id,
                 object: { orderDate: new Date() }
             })(repos);
             // 取引番号生成
-            const { transactionNumber, ticketToken } = yield (0, fixTransactionNumberOnPublishPaymentUrl_1.fixTransactionNumberOnPublishPaymentUrl)({
+            const { transactionNumber, ticketToken } = await (0, fixTransactionNumberOnPublishPaymentUrl_1.fixTransactionNumberOnPublishPaymentUrl)({
                 object: params.object,
                 transaction,
                 paymentServiceType
@@ -361,14 +353,28 @@ function publishPaymentUrl(params) {
             // }
             let result;
             // URL発行
-            const authorizeObject = Object.assign(Object.assign({}, params.object), { accountId: '', paymentMethodId: transactionNumber, typeOf: factory.action.authorize.paymentMethod.any.ResultType.Payment, 
+            const authorizeObject = {
+                ...params.object,
+                accountId: '',
+                paymentMethodId: transactionNumber,
+                typeOf: factory.action.authorize.paymentMethod.any.ResultType.Payment,
                 // support referencesOrder(2025-11-24~)
-                referencesOrder: (((_a = params.object.referencesOrder) === null || _a === void 0 ? void 0 : _a.typeOf) === factory.order.OrderType.Order)
+                referencesOrder: (params.object.referencesOrder?.typeOf === factory.order.OrderType.Order)
                     ? params.object.referencesOrder
-                    : { typeOf: factory.order.OrderType.Order } });
-            const startParams = (0, factory_1.creatPublishPaymentUrlParams)(Object.assign(Object.assign({ object: authorizeObject, paymentServiceType, transaction: transaction, transactionNumber: transactionNumber, location: params.location, instrument: params.instrument }, (typeof params.identifier === 'string') ? { identifier: params.identifier } : undefined), (typeof ticketToken === 'string') ? { ticketToken } : undefined));
-            const taskId = (_b = params.sameAs) === null || _b === void 0 ? void 0 : _b.id;
-            result = yield PayTransactionService.publishPaymentUrl(startParams, {
+                    : { typeOf: factory.order.OrderType.Order }
+            };
+            const startParams = (0, factory_1.creatPublishPaymentUrlParams)({
+                object: authorizeObject,
+                paymentServiceType,
+                transaction: transaction,
+                transactionNumber: transactionNumber,
+                location: params.location,
+                instrument: params.instrument,
+                ...(typeof params.identifier === 'string') ? { identifier: params.identifier } : undefined,
+                ...(typeof ticketToken === 'string') ? { ticketToken } : undefined
+            });
+            const taskId = params.sameAs?.id;
+            result = await PayTransactionService.publishPaymentUrl(startParams, {
                 purposeAsTransaction: { id: transaction.id },
                 executor: (typeof taskId === 'string') ? { id: taskId } : {} // タスク関連付け(2024-05-22~)
             })(repos, settings);
@@ -387,7 +393,7 @@ function publishPaymentUrl(params) {
                 // execTranResult: result.execTranResult, // migrate to recipe(2024-06-05~)
                 // paymentMethod: startParams.object.paymentMethod // 拡張(2024-01-04~) // migrate to acceptAction(2024-06-05~)
             };
-            yield repos.transaction.findByIdAndUpdateInProgress({
+            await repos.transaction.findByIdAndUpdateInProgress({
                 id: transaction.id,
                 update: { $set: { 'object.paymentMethods': paymentMethodByPaymentUrl } }
             });
@@ -405,7 +411,7 @@ function publishPaymentUrl(params) {
                 throw error;
             }
         }
-    });
+    };
 }
 /**
  * 承認アクションオブジェクトから冗長な属性を排除する
@@ -419,23 +425,22 @@ function minimizeObjectIncludingPaymentMethodDetails(authorizeObjectIncludingPay
  */
 function authorize(params) {
     // tslint:disable-next-line:cyclomatic-complexity max-func-body-length
-    return (repos, settings) => __awaiter(this, void 0, void 0, function* () {
-        var _a, _b, _c;
+    return async (repos, settings) => {
         const { paymentServiceType, purpose, project } = params;
         if (purpose.typeOf !== factory.transactionType.PlaceOrder) {
             throw new factory.errors.NotImplemented(`purpose.typeOf '${purpose.typeOf} not implemented'`);
         }
-        const transaction = yield repos.transaction.projectFieldsInProgressById({ typeOf: purpose.typeOf, id: purpose.id }, ['agent', 'expires', 'typeOf', 'project', 'seller']);
+        const transaction = await repos.transaction.projectFieldsInProgressById({ typeOf: purpose.typeOf, id: purpose.id }, ['agent', 'expires', 'typeOf', 'project', 'seller']);
         if (project.id !== transaction.project.id) {
             throw new factory.errors.NotFound(factory.transactionType.PlaceOrder);
         }
-        const { confirmationNumber, orderNumber } = yield (0, fixOrderAsNeeded_1.fixOrderAsNeeded)({
+        const { confirmationNumber, orderNumber } = await (0, fixOrderAsNeeded_1.fixOrderAsNeeded)({
             project: { id: transaction.project.id },
             purpose
             // paymentServiceType
         })(repos);
         // 取引番号生成
-        const fixTransactionNumberResult = yield (0, fixTransactionNumber_1.fixTransactionNumber)({
+        const fixTransactionNumberResult = await (0, fixTransactionNumber_1.fixTransactionNumber)({
             object: params.object,
             transaction,
             paymentServiceType
@@ -498,34 +503,50 @@ function authorize(params) {
         //     transactionNumber = publishTransactionNumberResult.transactionNumber;
         // }
         const movieTickets = (Array.isArray(params.object.movieTickets)) ? params.object.movieTickets.map(factory_1.createMovieTicket) : undefined;
-        const { accountId } = yield fixAccountIdIfPossible({
+        const { accountId } = await fixAccountIdIfPossible({
             object: params.object, project: { id: transaction.project.id }
         })();
-        const authorizeObjectIncludingPaymentMethodDetails = Object.assign(Object.assign(Object.assign(Object.assign({}, params.object), { accountId, paymentMethodId: transactionNumber, typeOf: factory.action.authorize.paymentMethod.any.ResultType.Payment, 
+        const authorizeObjectIncludingPaymentMethodDetails = {
+            ...params.object,
+            accountId,
+            paymentMethodId: transactionNumber,
+            typeOf: factory.action.authorize.paymentMethod.any.ResultType.Payment,
             // support referencesOrder(2025-11-24~)
-            referencesOrder: (((_a = params.object.referencesOrder) === null || _a === void 0 ? void 0 : _a.typeOf) === factory.order.OrderType.Order)
+            referencesOrder: (params.object.referencesOrder?.typeOf === factory.order.OrderType.Order)
                 ? params.object.referencesOrder
-                : { typeOf: factory.order.OrderType.Order } }), (creditCard !== undefined) ? { creditCard } : undefined), (Array.isArray(movieTickets)) ? { movieTickets } : undefined);
+                : { typeOf: factory.order.OrderType.Order },
+            ...(creditCard !== undefined) ? { creditCard } : undefined,
+            ...(Array.isArray(movieTickets)) ? { movieTickets } : undefined
+        };
         const { authorizeObject } = minimizeObjectIncludingPaymentMethodDetails(authorizeObjectIncludingPaymentMethodDetails);
         // 承認アクションを開始する
-        const taskId = (_b = params.sameAs) === null || _b === void 0 ? void 0 : _b.id;
+        const taskId = params.sameAs?.id;
         const uniqueActionIdentifier = util.format(`%s:%s:%s`, factory.actionType.AuthorizeAction, factory.action.authorize.paymentMethod.any.ResultType.Payment, authorizeObject.paymentMethodId);
-        const actionAttributes = Object.assign({ project: transaction.project, typeOf: factory.actionType.AuthorizeAction, object: authorizeObject, agent: {
+        const actionAttributes = {
+            project: transaction.project,
+            typeOf: factory.actionType.AuthorizeAction,
+            object: authorizeObject,
+            agent: {
                 typeOf: transaction.agent.typeOf,
                 id: transaction.agent.id
-            }, instrument: {
+            },
+            instrument: {
                 typeOf: factory.assetTransactionType.Pay, // 資産取引化(2024-03-11~)
                 identifier: factory.action.authorize.paymentMethod.any.ServiceIdentifier.Chevre,
                 transactionNumber
-            }, recipient: {
+            },
+            recipient: {
                 typeOf: transaction.seller.typeOf,
                 id: transaction.seller.id,
                 name: (typeof transaction.seller.name === 'string')
                     ? transaction.seller.name
-                    : String((_c = transaction.seller.name) === null || _c === void 0 ? void 0 : _c.ja)
-            }, purpose: { typeOf: transaction.typeOf, id: transaction.id }, identifier: uniqueActionIdentifier }, (typeof taskId === 'string') ? { sameAs: { id: taskId, typeOf: 'Task' } } : undefined // タスク関連付け(2024-04-22~)
-        );
-        const action = yield repos.action.start(actionAttributes);
+                    : String(transaction.seller.name?.ja)
+            },
+            purpose: { typeOf: transaction.typeOf, id: transaction.id },
+            identifier: uniqueActionIdentifier, // add unique identifier(2025-02-25~)
+            ...(typeof taskId === 'string') ? { sameAs: { id: taskId, typeOf: 'Task' } } : undefined // タスク関連付け(2024-04-22~)
+        };
+        const action = await repos.action.start(actionAttributes);
         let payTransaction;
         try {
             const startParams = (0, factory_1.creatPayTransactionStartParams)({
@@ -542,13 +563,17 @@ function authorize(params) {
                 ticketToken,
                 instrument: params.instrument
             });
-            payTransaction = yield PayTransactionService.start(startParams, Object.assign({ 
+            payTransaction = await PayTransactionService.start(startParams, {
                 // useCheckByIdentifierIfNotYet: params.options.useCheckByIdentifierIfNotYet,
-                executor: (typeof taskId === 'string') ? { id: taskId } : {}, purpose: { id: transaction.id }, checkedAction: params.options.checkedAction }, (pendingPaymentAgencyTransaction !== undefined) ? { pendingPaymentAgencyTransaction } : undefined))(repos, settings);
+                executor: (typeof taskId === 'string') ? { id: taskId } : {}, // タスク関連付け(2024-05-18~)
+                purpose: { id: transaction.id },
+                checkedAction: params.options.checkedAction,
+                ...(pendingPaymentAgencyTransaction !== undefined) ? { pendingPaymentAgencyTransaction } : undefined
+            })(repos, settings);
         }
         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
@@ -563,7 +588,7 @@ function authorize(params) {
                 // }
                 const rawError = Array.isArray(error) ? error[1] : undefined;
                 if (rawError !== undefined && rawError.name !== 'AbortError') {
-                    yield processVoidPayTransaction({
+                    await processVoidPayTransaction({
                         project: actionAttributes.project,
                         id: action.id,
                         purpose: actionAttributes.purpose
@@ -583,15 +608,15 @@ function authorize(params) {
             object: authorizeObjectIncludingPaymentMethodDetails,
             invoiceByTicketToken
         });
-        yield repos.action.completeWithVoid({ typeOf: action.typeOf, id: action.id, result: result });
+        await repos.action.completeWithVoid({ typeOf: action.typeOf, id: action.id, result: result });
         return { id: action.id };
-    });
+    };
 }
 /**
  * 承認しようとしているobjectからaccountIdを決定する
  */
 function fixAccountIdIfPossible(params) {
-    return (
+    return async (
     // repos: {
     //     action: ActionRepo;
     //     authorization: AuthorizationRepo;
@@ -600,11 +625,10 @@ function fixAccountIdIfPossible(params) {
     // credentials: {
     //     jwt: JWTCredentials;
     // }
-    ) => __awaiter(this, void 0, void 0, function* () {
-        var _a, _b;
+    ) => {
         let accountId = '';
-        const fromLocation = (_a = params.object) === null || _a === void 0 ? void 0 : _a.fromLocation;
-        const movieTickets = (_b = params.object) === null || _b === void 0 ? void 0 : _b.movieTickets;
+        const fromLocation = params.object?.fromLocation;
+        const movieTickets = params.object?.movieTickets;
         // discontinue token as fromLocation(ticketTokenへ移行するべき)(2024-12-18~)
         if (typeof fromLocation === 'string') {
             throw new factory.errors.NotImplemented('object.fromLocation as string not implemented');
@@ -631,13 +655,12 @@ function fixAccountIdIfPossible(params) {
             accountId = movieTickets[0].identifier; // 決済カードidentifierは1つのみ許可の前提
         }
         return { accountId };
-    });
+    };
 }
 function findAuthorizeAction(params) {
-    return (repos) => __awaiter(this, void 0, void 0, function* () {
-        var _a, _b;
+    return async (repos) => {
         // タスク検索
-        const task = (yield repos.task.projectFields({
+        const task = (await repos.task.projectFields({
             limit: 1,
             page: 1,
             id: { $eq: params.sameAs.id },
@@ -647,47 +670,53 @@ function findAuthorizeAction(params) {
         if (task === undefined) {
             throw new factory.errors.NotFound(factory.taskName.AuthorizePayment);
         }
-        const errorByTask = (_a = task.executionResults.shift()) === null || _a === void 0 ? void 0 : _a.error;
+        const errorByTask = task.executionResults.shift()?.error;
         let defaultActionError;
         if (typeof errorByTask === 'string') {
             defaultActionError = { message: errorByTask };
         }
-        else if (typeof (errorByTask === null || errorByTask === void 0 ? void 0 : errorByTask.message) === 'string') {
+        else if (typeof errorByTask?.message === 'string') {
             defaultActionError = { message: errorByTask.message, name: errorByTask.name };
         }
-        let action = Object.assign({ actionStatus: factory.actionStatusType.PotentialActionStatus }, (defaultActionError !== undefined) ? { error: defaultActionError } : undefined);
+        let action = {
+            actionStatus: factory.actionStatusType.PotentialActionStatus,
+            ...(defaultActionError !== undefined) ? { error: defaultActionError } : undefined
+        };
         switch (task.status) {
             case factory.taskStatus.Ready:
                 break;
             default:
                 // タスクがReadyでなければアクション検索
-                const authorizeAction = (yield repos.action.searchBySameAs({
+                const authorizeAction = (await repos.action.searchBySameAs({
                     sameAs: { id: { $eq: task.id } },
                     typeOf: { $eq: factory.actionType.AuthorizeAction }
                     // purpose: { id: { $eq: String(params.purpose.id) } }
                 })).shift();
                 if (authorizeAction !== undefined) {
                     // purpose検証
-                    if (((_b = authorizeAction.purpose) === null || _b === void 0 ? void 0 : _b.id) !== params.purpose.id) {
+                    if (authorizeAction.purpose?.id !== params.purpose.id) {
                         throw new factory.errors.NotFound('Action');
                     }
-                    action = Object.assign({ id: authorizeAction.id, actionStatus: authorizeAction.actionStatus }, (authorizeAction.error !== undefined)
-                        ? {
-                            error: (Array.isArray(authorizeAction.error))
-                                ? authorizeAction.error[0]
-                                : authorizeAction.error
-                        }
-                        : undefined);
+                    action = {
+                        id: authorizeAction.id,
+                        actionStatus: authorizeAction.actionStatus,
+                        ...(authorizeAction.error !== undefined)
+                            ? {
+                                error: (Array.isArray(authorizeAction.error))
+                                    ? authorizeAction.error[0]
+                                    : authorizeAction.error
+                            }
+                            : undefined
+                    };
                 }
         }
         return action;
-    });
+    };
 }
 function findCheckAction(params) {
-    return (repos) => __awaiter(this, void 0, void 0, function* () {
-        var _a, _b;
+    return async (repos) => {
         // タスク検索
-        const task = (yield repos.task.projectFields({
+        const task = (await repos.task.projectFields({
             limit: 1,
             page: 1,
             id: { $eq: params.sameAs.id },
@@ -697,52 +726,59 @@ function findCheckAction(params) {
         if (task === undefined) {
             throw new factory.errors.NotFound(factory.taskName.CheckMovieTicket);
         }
-        const errorByTask = (_a = task.executionResults.shift()) === null || _a === void 0 ? void 0 : _a.error;
+        const errorByTask = task.executionResults.shift()?.error;
         let defaultActionError;
         if (typeof errorByTask === 'string') {
             defaultActionError = { message: errorByTask };
         }
-        else if (typeof (errorByTask === null || errorByTask === void 0 ? void 0 : errorByTask.message) === 'string') {
+        else if (typeof errorByTask?.message === 'string') {
             defaultActionError = { message: errorByTask.message, name: errorByTask.name };
         }
-        let action = Object.assign({ actionStatus: factory.actionStatusType.PotentialActionStatus }, (defaultActionError !== undefined) ? { error: defaultActionError } : undefined);
+        let action = {
+            actionStatus: factory.actionStatusType.PotentialActionStatus,
+            ...(defaultActionError !== undefined) ? { error: defaultActionError } : undefined
+        };
         switch (task.status) {
             case factory.taskStatus.Ready:
                 break;
             default:
                 // タスクがReadyでなければアクション検索
-                const authorizeAction = (yield repos.action.searchBySameAs({
+                const authorizeAction = (await repos.action.searchBySameAs({
                     sameAs: { id: { $eq: task.id } },
                     typeOf: { $eq: factory.actionType.CheckAction }
                     // purpose: { id: { $eq: String(params.purpose.id) } }
                 })).shift();
                 if (authorizeAction !== undefined) {
                     // purpose検証
-                    if (((_b = authorizeAction.purpose) === null || _b === void 0 ? void 0 : _b.id) !== params.purpose.id) {
+                    if (authorizeAction.purpose?.id !== params.purpose.id) {
                         throw new factory.errors.NotFound('Action');
                     }
                     // result from recipe(2024-06-10~)
-                    const purchaseNumberAuthResult = yield repos.action.findIMinimizedPurchaseNumberAuthResultByCheckMovieTicketRecipe({
+                    const purchaseNumberAuthResult = await repos.action.findIMinimizedPurchaseNumberAuthResultByCheckMovieTicketRecipe({
                         project: { id: params.project.id },
                         recipeFor: { id: authorizeAction.id }
                     });
-                    action = Object.assign(Object.assign({ id: authorizeAction.id, actionStatus: authorizeAction.actionStatus }, (authorizeAction.error !== undefined)
-                        ? {
-                            error: (Array.isArray(authorizeAction.error))
-                                ? authorizeAction.error[0]
-                                : authorizeAction.error
-                        }
-                        : undefined), (purchaseNumberAuthResult !== undefined) ? { result: { purchaseNumberAuthResult } } : undefined);
+                    action = {
+                        id: authorizeAction.id,
+                        actionStatus: authorizeAction.actionStatus,
+                        ...(authorizeAction.error !== undefined)
+                            ? {
+                                error: (Array.isArray(authorizeAction.error))
+                                    ? authorizeAction.error[0]
+                                    : authorizeAction.error
+                            }
+                            : undefined,
+                        ...(purchaseNumberAuthResult !== undefined) ? { result: { purchaseNumberAuthResult } } : undefined
+                    };
                 }
         }
         return action;
-    });
+    };
 }
 function findAcceptAction(params) {
-    return (repos) => __awaiter(this, void 0, void 0, function* () {
-        var _a, _b;
+    return async (repos) => {
         // タスク検索
-        const task = (yield repos.task.projectFields({
+        const task = (await repos.task.projectFields({
             limit: 1,
             page: 1,
             id: { $eq: params.sameAs.id },
@@ -752,49 +788,57 @@ function findAcceptAction(params) {
         if (task === undefined) {
             throw new factory.errors.NotFound(factory.taskName.PublishPaymentUrl);
         }
-        const errorByTask = (_a = task.executionResults.shift()) === null || _a === void 0 ? void 0 : _a.error;
+        const errorByTask = task.executionResults.shift()?.error;
         let defaultActionError;
         if (typeof errorByTask === 'string') {
             defaultActionError = { message: errorByTask };
         }
-        else if (typeof (errorByTask === null || errorByTask === void 0 ? void 0 : errorByTask.message) === 'string') {
+        else if (typeof errorByTask?.message === 'string') {
             defaultActionError = { message: errorByTask.message, name: errorByTask.name };
         }
-        let action = Object.assign({ actionStatus: factory.actionStatusType.PotentialActionStatus }, (defaultActionError !== undefined) ? { error: defaultActionError } : undefined);
+        let action = {
+            actionStatus: factory.actionStatusType.PotentialActionStatus,
+            ...(defaultActionError !== undefined) ? { error: defaultActionError } : undefined
+        };
         switch (task.status) {
             case factory.taskStatus.Ready:
                 break;
             default:
                 // タスクがReadyでなければアクション検索
-                const acceptAction = (yield repos.action.searchBySameAs({
+                const acceptAction = (await repos.action.searchBySameAs({
                     sameAs: { id: { $eq: task.id } },
                     typeOf: { $eq: factory.actionType.AcceptAction }
                     // purpose: { id: { $eq: String(params.purpose.id) } }
                 })).shift();
                 if (acceptAction !== undefined) {
                     // purpose検証
-                    if (((_b = acceptAction.purpose) === null || _b === void 0 ? void 0 : _b.id) !== params.purpose.id) {
+                    if (acceptAction.purpose?.id !== params.purpose.id) {
                         throw new factory.errors.NotFound('Action');
                     }
-                    const acceptActionWithResult = yield repos.action.findById({ id: acceptAction.id, typeOf: factory.actionType.AcceptAction }, ['result', 'object'], []);
-                    action = Object.assign(Object.assign({ id: acceptAction.id, actionStatus: acceptAction.actionStatus, 
+                    const acceptActionWithResult = await repos.action.findById({ id: acceptAction.id, typeOf: factory.actionType.AcceptAction }, ['result', 'object'], []);
+                    action = {
+                        id: acceptAction.id,
+                        actionStatus: acceptAction.actionStatus,
                         // add object.transactionNumber(2025-08-26~)
-                        object: { transactionNumber: acceptActionWithResult.object.transactionNumber } }, (acceptAction.error !== undefined)
-                        ? {
-                            error: (Array.isArray(acceptAction.error))
-                                ? acceptAction.error[0]
-                                : acceptAction.error
-                        }
-                        : undefined), ((acceptActionWithResult === null || acceptActionWithResult === void 0 ? void 0 : acceptActionWithResult.result) !== undefined)
-                        ? {
-                            result: {
-                                paymentMethodId: acceptActionWithResult.result.paymentMethodId,
-                                paymentUrl: acceptActionWithResult.result.paymentUrl
+                        object: { transactionNumber: acceptActionWithResult.object.transactionNumber },
+                        ...(acceptAction.error !== undefined)
+                            ? {
+                                error: (Array.isArray(acceptAction.error))
+                                    ? acceptAction.error[0]
+                                    : acceptAction.error
                             }
-                        }
-                        : undefined);
+                            : undefined,
+                        ...(acceptActionWithResult?.result !== undefined)
+                            ? {
+                                result: {
+                                    paymentMethodId: acceptActionWithResult.result.paymentMethodId,
+                                    paymentUrl: acceptActionWithResult.result.paymentUrl
+                                }
+                            }
+                            : undefined
+                    };
                 }
         }
         return action;
-    });
+    };
 }