@chevre/domain 26.0.0-alpha.3 → 26.0.0-alpha.30

package/lib/chevre/service/payment/any/findAcceptAction.d.ts

@@ -1,7 +1,6 @@
 import { factory } from '../../../factory';
 import type { AcceptPayActionRepo } from '../../../repo/action/acceptPay';
 import type { AsyncActionRepo } from '../../../repo/asyncAction';
-import type { TaskRepo } from '../../../repo/task';
 interface IFindAcceptActionResult {
     /**
      * アクションID
@@ -39,11 +38,8 @@ declare function findAcceptAction(params: {
          */
         id: string;
     };
-}, options: {
-    useAsyncAction: boolean;
 }): (repos: {
     acceptPayAction: AcceptPayActionRepo;
     asyncAction: AsyncActionRepo;
-    task: TaskRepo;
 }) => Promise<IFindAcceptActionResult>;
 export { findAcceptAction, };

package/lib/chevre/service/payment/any/findAcceptAction.js

@@ -2,27 +2,27 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.findAcceptAction = findAcceptAction;
 const factory_1 = require("../../../factory");
-function findAcceptAction(params, options) {
+function findAcceptAction(params) {
     return async (repos) => {
         // 非同期アクションに対応(2026-07-28~)
-        const { useAsyncAction } = options;
-        let task;
-        if (useAsyncAction) {
-            // まず非同期アクションを参照
-            task = await repos.asyncAction.findAsyncActionById({
-                id: { $eq: params.sameAs.id },
-                project: { id: { $eq: params.project.id } },
-                name: factory_1.factory.taskName.PublishPaymentUrl
-            }, ['status', 'executionResults']);
-        }
-        // 非同期アクションが存在しなければタスクを参照
-        if (task === undefined) {
-            task = await repos.task.findTaskById({
-                id: { $eq: params.sameAs.id },
-                project: { id: { $eq: params.project.id } },
-                name: factory_1.factory.taskName.PublishPaymentUrl
-            }, ['status', 'executionResults']);
-        }
+        // let task: Pick<factory.task.publishPaymentUrl.ITask, 'id' | 'status' | 'executionResults'> | undefined;
+        // まず非同期アクションを参照
+        const task = await repos.asyncAction.findAsyncActionById({
+            id: { $eq: params.sameAs.id },
+            project: { id: { $eq: params.project.id } },
+            name: factory_1.factory.taskName.PublishPaymentUrl
+        }, ['status', 'executionResults']);
+        // // 非同期アクションが存在しなければタスクを参照
+        // if (task === undefined) {
+        //     task = await repos.task.findTaskById(
+        //         {
+        //             id: { $eq: params.sameAs.id },
+        //             project: { id: { $eq: params.project.id } },
+        //             name: factory.taskName.PublishPaymentUrl
+        //         },
+        //         ['status', 'executionResults']
+        //     );
+        // }
         if (task === undefined) {
             throw new factory_1.factory.errors.NotFound(factory_1.factory.taskName.PublishPaymentUrl);
         }

package/lib/chevre/service/payment/any/findAuthorizeAction.d.ts

@@ -1,7 +1,6 @@
 import { factory } from '../../../factory';
 import type { AuthorizePaymentMethodActionRepo } from '../../../repo/action/authorizePaymentMethod';
 import type { AsyncActionRepo } from '../../../repo/asyncAction';
-import type { TaskRepo } from '../../../repo/task';
 interface IFindAuthorizeActionResult {
     /**
      * アクションID
@@ -22,7 +21,6 @@ interface IFindAuthorizeActionResult {
 interface IFindAuthorizeActionRepos {
     authorizePaymentMethodAction: AuthorizePaymentMethodActionRepo;
     asyncAction: AsyncActionRepo;
-    task: TaskRepo;
 }
 declare function findAuthorizeAction(params: {
     project: {
@@ -40,7 +38,5 @@ declare function findAuthorizeAction(params: {
          */
         id: string;
     };
-}, options: {
-    useAsyncAction: boolean;
 }): (repos: IFindAuthorizeActionRepos) => Promise<IFindAuthorizeActionResult>;
 export { IFindAuthorizeActionRepos, findAuthorizeAction, };

package/lib/chevre/service/payment/any/findAuthorizeAction.js

@@ -2,27 +2,27 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.findAuthorizeAction = findAuthorizeAction;
 const factory_1 = require("../../../factory");
-function findAuthorizeAction(params, options) {
+function findAuthorizeAction(params) {
     return async (repos) => {
         // 非同期アクションに対応(2026-07-28~)
-        const { useAsyncAction } = options;
-        let task;
-        if (useAsyncAction) {
-            // まず非同期アクションを参照
-            task = await repos.asyncAction.findAsyncActionById({
-                id: { $eq: params.sameAs.id },
-                project: { id: { $eq: params.project.id } },
-                name: factory_1.factory.taskName.AuthorizePayment
-            }, ['status', 'executionResults']);
-        }
-        // 非同期アクションが存在しなければタスクを参照
-        if (task === undefined) {
-            task = await repos.task.findTaskById({
-                id: { $eq: params.sameAs.id },
-                project: { id: { $eq: params.project.id } },
-                name: factory_1.factory.taskName.AuthorizePayment
-            }, ['status', 'executionResults']);
-        }
+        // let task: Pick<factory.task.authorizePayment.ITask, 'id' | 'status' | 'executionResults'> | undefined;
+        // まず非同期アクションを参照
+        const task = await repos.asyncAction.findAsyncActionById({
+            id: { $eq: params.sameAs.id },
+            project: { id: { $eq: params.project.id } },
+            name: factory_1.factory.taskName.AuthorizePayment
+        }, ['status', 'executionResults']);
+        // // 非同期アクションが存在しなければタスクを参照
+        // if (task === undefined) {
+        //     task = await repos.task.findTaskById(
+        //         {
+        //             id: { $eq: params.sameAs.id },
+        //             project: { id: { $eq: params.project.id } },
+        //             name: factory.taskName.AuthorizePayment
+        //         },
+        //         ['status', 'executionResults']
+        //     );
+        // }
         if (task === undefined) {
             throw new factory_1.factory.errors.NotFound(factory_1.factory.taskName.AuthorizePayment);
         }

package/lib/chevre/service/payment/any/findCheckAction.d.ts

@@ -1,11 +1,9 @@
 import { factory } from '../../../factory';
 import type { CheckMovieTicketActionRepo, IMinimizedPurchaseNumberAuthResult } from '../../../repo/action/checkMovieTicket';
 import type { AsyncActionRepo } from '../../../repo/asyncAction';
-import type { TaskRepo } from '../../../repo/task';
 interface IFindCheckActionRepos {
     checkMovieTicketAction: CheckMovieTicketActionRepo;
     asyncAction: AsyncActionRepo;
-    task: TaskRepo;
 }
 interface IFindCheckActionResult {
     /**
@@ -43,7 +41,5 @@ declare function findCheckAction(params: {
          */
         id: string;
     };
-}, options: {
-    useAsyncAction: boolean;
 }): (repos: IFindCheckActionRepos) => Promise<IFindCheckActionResult>;
 export { IFindCheckActionRepos, findCheckAction, };

package/lib/chevre/service/payment/any/findCheckAction.js

@@ -2,27 +2,27 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.findCheckAction = findCheckAction;
 const factory_1 = require("../../../factory");
-function findCheckAction(params, options) {
+function findCheckAction(params) {
     return async (repos) => {
         // 非同期アクションに対応(2026-07-28~)
-        const { useAsyncAction } = options;
-        let task;
-        if (useAsyncAction) {
-            // まず非同期アクションを参照
-            task = await repos.asyncAction.findAsyncActionById({
-                id: { $eq: params.sameAs.id },
-                project: { id: { $eq: params.project.id } },
-                name: factory_1.factory.taskName.CheckMovieTicket
-            }, ['status', 'executionResults']);
-        }
-        // 非同期アクションが存在しなければタスクを参照
-        if (task === undefined) {
-            task = await repos.task.findTaskById({
-                id: { $eq: params.sameAs.id },
-                project: { id: { $eq: params.project.id } },
-                name: factory_1.factory.taskName.CheckMovieTicket
-            }, ['status', 'executionResults']);
-        }
+        // let task: Pick<factory.task.checkMovieTicket.ITask, 'id' | 'status' | 'executionResults'> | undefined;
+        // まず非同期アクションを参照
+        const task = await repos.asyncAction.findAsyncActionById({
+            id: { $eq: params.sameAs.id },
+            project: { id: { $eq: params.project.id } },
+            name: factory_1.factory.taskName.CheckMovieTicket
+        }, ['status', 'executionResults']);
+        // // 非同期アクションが存在しなければタスクを参照
+        // if (task === undefined) {
+        //     task = await repos.task.findTaskById(
+        //         {
+        //             id: { $eq: params.sameAs.id },
+        //             project: { id: { $eq: params.project.id } },
+        //             name: factory.taskName.CheckMovieTicket
+        //         },
+        //         ['status', 'executionResults']
+        //     );
+        // }
         if (task === undefined) {
             throw new factory_1.factory.errors.NotFound(factory_1.factory.taskName.CheckMovieTicket);
         }

package/lib/chevre/service/payment/any/processVoidPayTransaction.js

@@ -109,7 +109,7 @@ function processVoidPayTransaction(params) {
                 // 取引が存在すれば中止
                 const transactionNumber = action.object.paymentMethodId;
                 if (typeof transactionNumber === 'string' && transactionNumber.length > 0) {
-                    const payTransaction = (await repos.assetTransaction.search({
+                    const payTransaction = (await repos.assetTransaction.findAssetTransactionsByTypeOf({
                         limit: 1,
                         page: 1,
                         project: { id: { $eq: action.project.id } },

package/lib/chevre/service/payment/any/publishPaymentUrl.d.ts

@@ -60,7 +60,5 @@ declare function publishPaymentUrl(params: {
      */
     identifier?: string;
     instrument: factory.action.trade.pay.IAcceptedPaymentMethodOfferAsInstrument[];
-}, options: {
-    savePaymentMethodIdInTransaction: boolean;
 }): IPublishPaymentUrlOperation<Pick<PayTransactionService.IPublishPaymentUrlResult, 'paymentMethodId' | 'paymentUrl'>>;
 export { IPublishPaymentUrlRepos, publishPaymentUrl };

package/lib/chevre/service/payment/any/publishPaymentUrl.js

@@ -41,7 +41,7 @@ const factory_2 = require("./factory");
 /**
  * 外部決済ロケーションを発行する
  */
-function publishPaymentUrl(params, options) {
+function publishPaymentUrl(params) {
     return async (repos, settings) => {
         const { paymentServiceType, purpose, project } = params;
         if (purpose.typeOf !== factory_1.factory.transactionType.PlaceOrder) {
@@ -107,7 +107,7 @@ function publishPaymentUrl(params, options) {
             await repos.orderInTransaction.savePaymentMethodId({
                 id: transaction.id,
                 paymentMethod: { paymentMethodId: result.paymentMethodId }
-            }, options);
+            });
             return {
                 paymentMethodId: result.paymentMethodId,
                 paymentUrl: result.paymentUrl

package/lib/chevre/service/project.d.ts

@@ -18,7 +18,6 @@ import type { ProductRepo } from '../repo/product';
 import type { ProjectRepo } from '../repo/project';
 import type { ReservationRepo } from '../repo/reservation';
 import type { SellerRepo } from '../repo/seller';
-import type { TaskRepo } from '../repo/task';
 export declare function deleteProject(params: {
     id: string;
 }): (repos: {
@@ -38,7 +37,6 @@ export declare function deleteProject(params: {
     movieTheater: MovieTheaterRepo;
     screeningRoom: ScreeningRoomRepo;
     seller: SellerRepo;
-    task: TaskRepo;
     assetTransaction: AssetTransactionRepo;
 }) => Promise<void>;
 export declare function cleanUpDatabaseByProject(params: {
@@ -59,5 +57,4 @@ export declare function cleanUpDatabaseByProject(params: {
     movieTheater: MovieTheaterRepo;
     screeningRoom: ScreeningRoomRepo;
     seller: SellerRepo;
-    task: TaskRepo;
 }) => Promise<void>;

package/lib/chevre/service/project.js

@@ -26,6 +26,5 @@ function cleanUpDatabaseByProject(params) {
         await repos.product.deleteByProject({ project: { id: params.id } });
         await repos.reservation.deleteByProject({ project: { id: params.id } });
         await repos.seller.deleteByProject({ project: { id: params.id } });
-        await repos.task.deleteByProject({ project: { id: params.id } });
     };
 }

package/lib/chevre/service/reserve/cancelReservation.js

@@ -39,7 +39,7 @@ function cancelPengindIfNotYet(params) {
     return async (repos) => {
         const reserveTransactionId = params.purpose.id;
         // 予約取引を検索
-        const reserveTransactions = await repos.assetTransaction.search({
+        const reserveTransactions = await repos.assetTransaction.findAssetTransactionsByTypeOf({
             limit: 1,
             page: 1,
             typeOf: factory_1.factory.assetTransactionType.Reserve,
@@ -169,7 +169,7 @@ function cancelReservation(actionAttributesList) {
                 try {
                     if (actionAttributes.object.typeOf === factory_1.factory.reservationType.ReservationPackage) {
                         // 予約取引を検索
-                        const reserveTransactions = await repos.assetTransaction.search({
+                        const reserveTransactions = await repos.assetTransaction.findAssetTransactionsByTypeOf({
                             limit: 1,
                             page: 1,
                             typeOf: factory_1.factory.assetTransactionType.Reserve,
@@ -226,7 +226,7 @@ function cancelReservation(actionAttributesList) {
                             inclusion: ['reservationNumber', 'reservationStatus', 'project', 'reservedTicket', 'subReservation', 'reservationFor']
                         });
                         // 予約取引を検索
-                        const reserveTransactions = await repos.assetTransaction.search({
+                        const reserveTransactions = await repos.assetTransaction.findAssetTransactionsByTypeOf({
                             limit: 1,
                             page: 1,
                             typeOf: factory_1.factory.assetTransactionType.Reserve,

package/lib/chevre/service/reserve/checkInReservation.js

@@ -90,7 +90,7 @@ function reserveIfNotYet(params) {
     ) => {
         let reserveTransactions = [];
         if (Array.isArray(params.object.ids) && params.object.ids.length > 0) {
-            reserveTransactions = await repos.assetTransaction.search({
+            reserveTransactions = await repos.assetTransaction.findAssetTransactionsByTypeOf({
                 typeOf: factory_1.factory.assetTransactionType.Reserve,
                 object: {
                     reservations: { id: { $in: params.object.ids } }
@@ -100,7 +100,7 @@ function reserveIfNotYet(params) {
             debug(reserveTransactions.length, 'reserveTransactions found in reserveIfNotYet. ids:', params.object.ids, 'reserveTransactions:', JSON.stringify(reserveTransactions));
         }
         if (Array.isArray(params.object.reservationNumbers) && params.object.reservationNumbers.length > 0) {
-            reserveTransactions = await repos.assetTransaction.search({
+            reserveTransactions = await repos.assetTransaction.findAssetTransactionsByTypeOf({
                 typeOf: factory_1.factory.assetTransactionType.Reserve,
                 object: {
                     reservationNumber: { $in: params.object.reservationNumbers }

package/lib/chevre/service/reserve/confirmReservation.js

@@ -140,7 +140,7 @@ function reserveIfNotYet(
 params, options) {
     return async (repos) => {
         const reservationPackage = params.object;
-        const reserveTransaction = (await repos.assetTransaction.search({
+        const reserveTransaction = (await repos.assetTransaction.findAssetTransactionsByTypeOf({
             limit: 1,
             page: 1,
             typeOf: factory_1.factory.assetTransactionType.Reserve,

package/lib/chevre/service/reserve/potentialActions/onReservationConfirmed.js

@@ -42,7 +42,7 @@ function onReservationConfirmed(confirmedReservations, reserveAction) {
                     // );
                     const taskIdentifier = `${project.id}:${factory_1.factory.taskName.OnAuthorizationCreated}:${factory_1.factory.assetTransactionType.Reserve}:${reservationNumber}:onReservationConfirmed`;
                     onAuthorizationCreatedTask = {
-                        alternateName: taskIdentifier,
+                        // alternateName: taskIdentifier,
                         identifier: taskIdentifier,
                         name: factory_1.factory.taskName.OnAuthorizationCreated,
                         status: factory_1.factory.taskStatus.Ready,
@@ -137,7 +137,7 @@ function onReservationConfirmed(confirmedReservations, reserveAction) {
                 await repos.task.saveMany(taskAttributes);
             }
             if (onAuthorizationCreatedTask !== undefined) {
-                await repos.task.createIfNotExistByAlternateName(onAuthorizationCreatedTask);
+                await repos.task.runTaskByIdentifier(onAuthorizationCreatedTask);
             }
         }
     };

package/lib/chevre/service/reserve/useReservation.js

@@ -112,7 +112,7 @@ function reserveIfNotYet(params) {
     ) => {
         let reserveTransactions = [];
         if (typeof params.object.id === 'string' && params.object.id.length > 0) {
-            reserveTransactions = await repos.assetTransaction.search({
+            reserveTransactions = await repos.assetTransaction.findAssetTransactionsByTypeOf({
                 typeOf: factory_1.factory.assetTransactionType.Reserve,
                 object: {
                     reservations: { id: { $in: [params.object.id] } }

package/lib/chevre/service/scheduledTask.d.ts

@@ -1,8 +1,5 @@
 import type { IExecuteSettings as IMinimumExecuteSettings, IRunningTask } from '../eventEmitter/task';
-import type { AggregationSettings } from '../taskSettings';
-interface IExecuteSettings extends IMinimumExecuteSettings {
-    aggregationSettings?: AggregationSettings;
-}
+type IExecuteSettings = IMinimumExecuteSettings;
 type IOperation<T> = (settings: IExecuteSettings) => Promise<T>;
 /**
  * Runningの予定タスクを実行する

package/lib/chevre/service/scheduledTask.js

@@ -19,22 +19,15 @@ function executeScheduledTaskById(params) {
         const { id } = params;
         let task = null;
         try {
-            task = await scheduledTaskRepo.findRunningScheduledTaskById({
-                id,
-                // status,
-                // executor: { name: executor.name }
-            });
+            task = await scheduledTaskRepo.findRunningScheduledTaskById({ id });
         }
         catch (error) {
             /* istanbul ignore next */
-            debug('service.task.executeById error:', error);
+            debug('scheduledTaskRepo.findRunningScheduledTaskById error:', error);
         }
         // タスクがなければ終了
         if (task !== null) {
-            await (0, scheduledTaskHandler_1.executeScheduledTask)(task)(settings, {
-                executeById: true,
-                executeByName: false
-            });
+            await (0, scheduledTaskHandler_1.executeScheduledTask)(task)(settings, {});
         }
     };
 }

package/lib/chevre/service/scheduledTaskHandler/onOperationFailed.js

@@ -13,7 +13,7 @@ function onOperationFailed(params) {
             error = { message: String(error) };
         }
         const endDate = new Date();
-        // remainingNumberOfTries<=0ならAborted(2025-08-04~)
+        // remainingNumberOfTries<=0ならAborted
         const isRetryable = task.remainingNumberOfTries > 0;
         if (isRetryable) {
             const result = {
@@ -35,7 +35,6 @@ function onOperationFailed(params) {
         }
         else {
             // 予定タスクは分析連携不要
-            // await informTaskIfNeeded({ task, executionEndDate: endDate })(repos);
             const result = {
                 executedAt: now,
                 endDate,

package/lib/chevre/service/scheduledTaskHandler.js

@@ -1,14 +1,9 @@
 "use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.taskLoader = void 0;
 exports.executeScheduledTask = executeScheduledTask;
-const debug_1 = __importDefault(require("debug"));
 const factory_1 = require("../factory");
 const onOperationFailed_1 = require("./scheduledTaskHandler/onOperationFailed");
-const debug = (0, debug_1.default)('chevre-domain:service:scheduledTaskHandler');
 exports.taskLoader = {
     load: (taskName) => {
         return import(`./task/${taskName}.js`);
@@ -19,18 +14,10 @@ exports.taskLoader = {
  */
 function executeScheduledTask(task) {
     const now = new Date();
-    debug('executing an executableTask...', task, now);
     return async (settings, options) => {
         const scheduledTaskRepo = new (await import('../repo/scheduledTask.js')).ScheduledTaskRepo(settings.connection);
         try {
             // 予定タスクのexpiresはDBのttl基準なので期限検証はしない
-            // if (task.expires instanceof Date) {
-            //     const taskExpired: boolean = moment(now)
-            //         .isAfter(task.expires);
-            //     if (taskExpired) {
-            //         throw new factory.errors.Internal(`task expired [expires:${task.expires}]`);
-            //     }
-            // }
             // remainingNumberOfTries<0ならcallを実行しない(2025-08-04~)
             // リトライを繰り返した後、不明の原因でRunningのまま残ってしまったタスクがリトライされたケース
             const { remainingNumberOfTries } = task;

package/lib/chevre/service/task/acceptCOAOffer.js

@@ -7,9 +7,6 @@ const acceptCOAOffer_1 = require("../../repo/action/acceptCOAOffer");
 const authorizeOffer_1 = require("../../repo/action/authorizeOffer");
 const credentials_1 = require("../../repo/credentials");
 const event_1 = require("../../repo/event");
-// import { OrderInTransactionRepo } from '../../repo/orderInTransaction';
-// import { OrderNumberRepo } from '../../repo/orderNumber';
-// import { ProjectRepo } from '../../repo/project';
 const reserveInterface_1 = require("../../repo/reserveInterface");
 const integration_1 = require("../../repo/setting/integration");
 const placeOrder_1 = require("../../repo/transaction/placeOrder");
@@ -19,14 +16,10 @@ let coaAuthClient;
  * タスク実行関数
  */
 function call(params) {
-    return async ({ connection, redisClient }, options) => {
+    return async ({ connection, redisClient }) => {
         if (redisClient === undefined) {
             throw new factory_1.factory.errors.Argument('settings', 'redisClient required');
         }
-        // 遅延実行(executeByName)には対応しない
-        if (!options.executeById) {
-            return;
-        }
         const settings = new integration_1.IntegrationSettingRepo({ connection });
         const reserveInterfaceRepo = new reserveInterface_1.ReserveInterfaceRepo(connection);
         const coaAPI = await reserveInterfaceRepo.findOne({ project: { id: { $eq: params.project.id } } });
@@ -57,7 +50,6 @@ function call(params) {
             });
         }
         const actionRepo = new acceptCOAOffer_1.AcceptCOAOfferActionRepo(connection);
-        // const transactionProcessRepo = new TransactionProcessRepo(redisClient, { lockExpiresInSeconds: 120 });
         try {
             const coaIntegrationSettings = await settings.getByKey('coa');
             const reserveService = new coa_service_1.COA.service.Reserve({
@@ -86,8 +78,6 @@ function call(params) {
                     action: actionRepo,
                     authorizeOfferAction: new authorizeOffer_1.AuthorizeOfferActionRepo(connection),
                     event: new event_1.EventRepo(connection),
-                    // orderNumber: new OrderNumberRepo({ connection }),
-                    // project: new ProjectRepo(connection),
                     placeOrder: new placeOrder_1.PlaceOrderRepo(connection),
                     reserveService,
                     masterService
@@ -104,9 +94,6 @@ function call(params) {
                 })({
                     action: actionRepo,
                     event: new event_1.EventRepo(connection),
-                    // orderInTransaction: new OrderInTransactionRepo(connection),
-                    // orderNumber: new OrderNumberRepo({ connection }),
-                    // project: new ProjectRepo(connection),
                     placeOrder: new placeOrder_1.PlaceOrderRepo(connection),
                     reserveService,
                     masterService

package/lib/chevre/service/task/authorizePayment.js

@@ -34,19 +34,13 @@ const any_1 = require("../payment/any");
  * タスク実行関数
  */
 function call(params) {
-    return async ({ connection, redisClient }, options) => {
+    return async ({ connection, redisClient }) => {
         if (redisClient === undefined) {
             throw new factory_1.factory.errors.Argument('settings', 'redisClient required');
         }
-        // 遅延実行(executeByName)には対応しない
-        if (!options.executeById) {
-            return;
-        }
         let callResult;
         const settings = new integration_1.IntegrationSettingRepo({ connection });
-        // const actionRepo = new ActionRepo(connection);
         const authorizePaymentMethodActionRepo = new authorizePaymentMethod_1.AuthorizePaymentMethodActionRepo(connection);
-        // const transactionProcessRepo = new TransactionProcessRepo(redisClient, { lockExpiresInSeconds: 120 });
         const paymentServiceId = params.data.object.issuedThrough.id;
         const credentialsExpireInSeconds = (await settings.getByKey('movieticketReserve')).credentialsExpireInSeconds;
         const useCredentialsRepo = typeof paymentServiceId === 'string' && paymentServiceId !== ''

package/lib/chevre/service/task/checkMovieTicket.js

@@ -9,23 +9,17 @@ const paymentService_1 = require("../../repo/paymentService");
 const paymentServiceProvider_1 = require("../../repo/paymentServiceProvider");
 const sellerPaymentAccepted_1 = require("../../repo/sellerPaymentAccepted");
 const integration_1 = require("../../repo/setting/integration");
-// import { TransactionProcessRepo } from '../../repo/transactionProcess';
 const pay_1 = require("../assetTransaction/pay");
 /**
  * タスク実行関数
  */
 function call(params) {
-    return async ({ connection, redisClient }, options) => {
+    return async ({ connection, redisClient }) => {
         if (redisClient === undefined) {
             throw new factory_1.factory.errors.Argument('settings', 'redisClient required');
         }
-        // 遅延実行(executeByName)には対応しない
-        if (!options.executeById) {
-            return;
-        }
         const settings = new integration_1.IntegrationSettingRepo({ connection });
         const actionRepo = new checkMovieTicket_1.CheckMovieTicketActionRepo(connection);
-        // const transactionProcessRepo = new TransactionProcessRepo(redisClient, { lockExpiresInSeconds: 120 });
         const paymentServiceId = params.data.object[0]?.id;
         const credentialsExpireInSeconds = (await settings.getByKey('movieticketReserve')).credentialsExpireInSeconds;
         const useCredentialsRepo = typeof paymentServiceId === 'string' && paymentServiceId !== ''

package/lib/chevre/service/task/confirmReserveTransaction.js

@@ -247,7 +247,9 @@ function onConfirmed(params, options) {
                 },
                 useOnOrderStatusChanged: options.useOnOrderStatusChanged === true
             };
+            const taskIdentifier = (0, util_1.format)('%s:%s:%s:%s', params.project.id, factory_1.factory.taskName.OnAssetTransactionStatusChanged, onAssetTransactionStatusChangedTaskData.purpose.orderNumber, onAssetTransactionStatusChangedTaskData.object.transactionNumber);
             const onAssetTransactionStatusChangedTask = {
+                identifier: taskIdentifier,
                 project: { id: params.project.id, typeOf: factory_1.factory.organizationType.Project },
                 name: factory_1.factory.taskName.OnAssetTransactionStatusChanged,
                 status: factory_1.factory.taskStatus.Ready,
@@ -257,7 +259,7 @@ function onConfirmed(params, options) {
                 executionResults: [],
                 data: onAssetTransactionStatusChangedTaskData
             };
-            await repos.task.createOnAssetTransactionStatusChangedTaskIfNotExist(onAssetTransactionStatusChangedTask);
+            await repos.task.runTaskByIdentifier(onAssetTransactionStatusChangedTask);
         }
     };
 }