@chevre/domain 26.0.0-alpha.2 → 26.0.0-alpha.21

package/lib/chevre/service/asyncActionHandler.js

@@ -5,11 +5,9 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.taskLoader = void 0;
 exports.executeAsyncAction = executeAsyncAction;
-const debug_1 = __importDefault(require("debug"));
 const moment_1 = __importDefault(require("moment"));
 const factory_1 = require("../factory");
 const onOperationFailed_1 = require("./asyncActionHandler/onOperationFailed");
-const debug = (0, debug_1.default)('chevre-domain:service:asyncActionHandler');
 exports.taskLoader = {
     load: (taskName) => {
         return import(`./task/${taskName}.js`);
@@ -20,10 +18,9 @@ exports.taskLoader = {
  */
 function executeAsyncAction(task, next) {
     const now = new Date();
-    debug('executing an executableTask...', task, now);
     return async (settings, options) => {
         const asyncActionRepo = new (await import('../repo/asyncAction.js')).AsyncActionRepo(settings.connection);
-        let executedTask;
+        let taskAsNextFunctionParam;
         try {
             // 期限検証(2024-04-23~)
             if (task.expires instanceof Date) {
@@ -57,32 +54,33 @@ function executeAsyncAction(task, next) {
                 status: factory_1.factory.taskStatus.Executed,
                 executionResult: result
             });
-            executedTask = {
+            taskAsNextFunctionParam = {
                 id: task.id,
-                remainingNumberOfTries: 0, // one timeの前提なのでひとまず固定で0
                 name: task.name,
                 status: factory_1.factory.taskStatus.Executed,
-                executionResult: result
             };
         }
         catch (error) {
             const onOperationFailedResult = await (0, onOperationFailed_1.onOperationFailed)({
                 task, now, error,
             })({ asyncAction: asyncActionRepo });
-            executedTask = onOperationFailedResult.executedTask;
+            taskAsNextFunctionParam = {
+                id: onOperationFailedResult.executedTask.id,
+                name: onOperationFailedResult.executedTask.name,
+                status: onOperationFailedResult.executedTask.status
+            };
+            ;
         }
         finally {
             if (typeof next === 'function') {
-                if (executedTask === undefined) {
-                    executedTask = {
+                if (taskAsNextFunctionParam === undefined) {
+                    taskAsNextFunctionParam = {
                         id: task.id,
-                        remainingNumberOfTries: 0, // one timeの前提なのでひとまず固定で0
                         name: task.name,
                         status: factory_1.factory.taskStatus.Aborted,
-                        executionResult: {} // eslint-disable-line @typescript-eslint/no-explicit-any
                     };
                 }
-                await next(executedTask)(settings);
+                await next(taskAsNextFunctionParam)(settings);
             }
         }
     };

package/lib/chevre/service/offer/eventServiceByCOA/authorize/factory.js

@@ -100,7 +100,7 @@ function responseBody2acceptedOffers4result(params) {
             name: event.superEvent.name,
             alternativeHeadline: event.superEvent.alternativeHeadline,
             location: event.superEvent.location,
-            soundFormat: event.superEvent.soundFormat,
+            // soundFormat: event.superEvent.soundFormat, // discontinue(2026-08-01~)
             workPerformed: workPerformed,
             duration: event.superEvent.duration,
             coaInfo: event.superEvent.coaInfo

package/lib/chevre/service/offer/eventServiceByCOA/findAcceptAction.d.ts

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

package/lib/chevre/service/offer/eventServiceByCOA/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-27~)
-        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.AcceptCOAOffer
-            }, ['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.AcceptCOAOffer
-            }, ['status', 'executionResults']);
-        }
+        // let task: Pick<factory.task.acceptCOAOffer.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.AcceptCOAOffer
+        }, ['status', 'executionResults']);
+        // // 非同期アクションが存在しなければタスクを参照
+        // if (task === undefined) {
+        //     task = await repos.task.findTaskById(
+        //         {
+        //             id: { $eq: params.sameAs.id },
+        //             project: { id: { $eq: params.project.id } },
+        //             name: factory.taskName.AcceptCOAOffer
+        //         },
+        //         ['status', 'executionResults']
+        //     );
+        // }
         if (task === undefined) {
             throw new factory_1.factory.errors.NotFound(factory_1.factory.taskName.AcceptCOAOffer);
         }

package/lib/chevre/service/order/confirmPayTransaction.js

@@ -34,6 +34,7 @@ var __importStar = (this && this.__importStar) || (function () {
 })();
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.confirmPayTransaction = confirmPayTransaction;
+const util_1 = require("util");
 const factory_1 = require("../../factory");
 // import type { TransactionRepo } from '../../repo/transaction';
 const PayTransactionService = __importStar(require("../assetTransaction/pay"));
@@ -112,7 +113,9 @@ function onConfirmed(params) {
                     },
                     useOnOrderStatusChanged: params.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,
@@ -122,7 +125,7 @@ function onConfirmed(params) {
                     executionResults: [],
                     data: onAssetTransactionStatusChangedTaskData
                 };
-                await repos.task.createOnAssetTransactionStatusChangedTaskIfNotExist(onAssetTransactionStatusChangedTask);
+                await repos.task.runTaskByIdentifier(onAssetTransactionStatusChangedTask);
             }
         }
     };

package/lib/chevre/service/order/onOrderStatusChanged/onOrderInTransit.js

@@ -62,7 +62,7 @@ function createSendOrderTaskIfNotExist(params) {
         };
         const taskIdentifier = `${sendOrderTaskData.project.id}:${factory_1.factory.taskName.SendOrder}:${sendOrderTaskData.object.typeOf}:${sendOrderTaskData.object.orderNumber}`;
         const sendOrderTask = {
-            alternateName: taskIdentifier,
+            // alternateName: taskIdentifier,
             identifier: taskIdentifier,
             project: params.order.project,
             name: factory_1.factory.taskName.SendOrder,
@@ -75,7 +75,7 @@ function createSendOrderTaskIfNotExist(params) {
         };
         debug('processing createSendOrderTaskIfNotExist...', sendOrderTask);
         // await repos.task.createSendOrderTaskIfNotExist(sendOrderTask);
-        await repos.task.createIfNotExistByAlternateName(sendOrderTask);
+        await repos.task.runTaskByIdentifier(sendOrderTask);
     };
 }
 function createOnAuthorizationCreatedTask(order) {
@@ -92,7 +92,7 @@ function createOnAuthorizationCreatedTask(order) {
             const taskRunsAt = new Date();
             const taskIdentifier = `${order.project.id}:${factory_1.factory.taskName.OnAuthorizationCreated}:${factory_1.factory.transactionType.PlaceOrder}:${placeOrderTransaction?.id}`;
             const task = {
-                alternateName: taskIdentifier,
+                // alternateName: taskIdentifier,
                 identifier: taskIdentifier,
                 name: factory_1.factory.taskName.OnAuthorizationCreated,
                 status: factory_1.factory.taskStatus.Ready,
@@ -107,7 +107,7 @@ function createOnAuthorizationCreatedTask(order) {
                 },
                 project: { id: order.project.id, typeOf: factory_1.factory.organizationType.Project }
             };
-            await repos.task.createIfNotExistByAlternateName(task);
+            await repos.task.runTaskByIdentifier(task);
         }
     };
 }

package/lib/chevre/service/order/onOrderStatusChanged/onOrderPaymentDue.js

@@ -53,7 +53,7 @@ function createConfirmPayTransactionTasks(order, simpleOrder) {
             };
             const taskIdentifier = (0, util_1.format)('%s:%s:%s:%s:%s:%s', order.project.id, factory_1.factory.taskName.ConfirmPayTransaction, data.purpose.typeOf, data.purpose.orderNumber, factory_1.factory.assetTransactionType.Pay, invoice.paymentMethodId);
             const confirmPayTransactionTask = {
-                alternateName: taskIdentifier,
+                // alternateName: taskIdentifier,
                 identifier: taskIdentifier,
                 project: order.project,
                 name: factory_1.factory.taskName.ConfirmPayTransaction,
@@ -64,7 +64,7 @@ function createConfirmPayTransactionTasks(order, simpleOrder) {
                 executionResults: [],
                 data
             };
-            await repos.task.createIfNotExistByAlternateName(confirmPayTransactionTask);
+            await repos.task.runTaskByIdentifier(confirmPayTransactionTask);
             // 冗長なタスク作成を回避
             // const existingTasks = await repos.task.projectFields(
             //     {

package/lib/chevre/service/order/onOrderStatusChanged/onOrderProcessing/createSendEmailMessageTaskIfNotExist.js

@@ -48,7 +48,7 @@ function createSendEmailMessageTaskIfNotExist(params) {
                 purpose: simpleOrder
             };
             const sendEmailMessageTask = {
-                alternateName: taskIdentifier,
+                // alternateName: taskIdentifier,
                 identifier: taskIdentifier,
                 project: params.order.project,
                 name: factory_1.factory.taskName.SendEmailMessage,
@@ -59,7 +59,7 @@ function createSendEmailMessageTaskIfNotExist(params) {
                 executionResults: [],
                 data: { actionAttributes }
             };
-            await repos.task.createIfNotExistByAlternateName(sendEmailMessageTask);
+            await repos.task.runTaskByIdentifier(sendEmailMessageTask);
         }
     };
 }

package/lib/chevre/service/order/onOrderStatusChanged/onOrderProcessing/factory.d.ts

@@ -5,8 +5,8 @@ type IProcessingOrder = Pick<factory.order.IOrder, 'id' | 'orderNumber' | 'broke
     numAcceptedOffers: number;
     orderStatus: factory.orderStatus.OrderProcessing;
 };
-type ICreatingCheckResourceTask = Pick<factory.task.checkResource.IAttributes, 'alternateName' | 'data' | 'executionResults' | 'identifier' | 'name' | 'numberOfTried' | 'project' | 'remainingNumberOfTries' | 'runsAt' | 'status'> & {
-    alternateName: string;
+type ICreatingCheckResourceTask = Pick<factory.task.checkResource.IAttributes, 'data' | 'executionResults' | 'identifier' | 'name' | 'numberOfTried' | 'project' | 'remainingNumberOfTries' | 'runsAt' | 'status'> & {
+    alternateName?: never;
     identifier: string;
 };
 type ICreatingInformProcessingOrderTask = Pick<factory.task.IAttributes<factory.taskName.TriggerWebhook>, 'data' | 'executionResults' | 'name' | 'numberOfTried' | 'project' | 'remainingNumberOfTries' | 'runsAt' | 'status'>;

package/lib/chevre/service/order/onOrderStatusChanged/onOrderProcessing/factory.js

@@ -142,7 +142,7 @@ function createCheckResourceTask(order) {
     };
     const taskIdentifier = (0, util_1.format)('%s:%s:%s:%s', order.project.id, factory_1.factory.taskName.CheckResource, order.typeOf, order.orderNumber);
     return {
-        alternateName: taskIdentifier, // add identifier(2025-03-29~)
+        // alternateName: taskIdentifier, // add identifier(2025-03-29~)
         identifier: taskIdentifier, // add identifier(2025-03-29~)
         project: order.project,
         name: factory_1.factory.taskName.CheckResource,

package/lib/chevre/service/order/onOrderStatusChanged/onOrderProcessing/processOrder.js

@@ -50,7 +50,7 @@ function createConfirmReserveTransactionTasksIfNotExist(order, simpleOrder, opti
             };
             const taskIdentifier = (0, util_1.format)('%s:%s:%s:%s:%s:%s', order.project.id, factory_1.factory.taskName.ConfirmReserveTransaction, data.purpose.typeOf, data.purpose.orderNumber, data.object.typeOf, data.object.transactionNumber);
             const confirmReserveTransactionTask = {
-                alternateName: taskIdentifier,
+                // alternateName: taskIdentifier,
                 identifier: taskIdentifier,
                 project: order.project,
                 name: factory_1.factory.taskName.ConfirmReserveTransaction,
@@ -61,7 +61,7 @@ function createConfirmReserveTransactionTasksIfNotExist(order, simpleOrder, opti
                 executionResults: [],
                 data
             };
-            await repos.task.createIfNotExistByAlternateName(confirmReserveTransactionTask);
+            await repos.task.runTaskByIdentifier(confirmReserveTransactionTask);
             if (options.force === true) {
                 const existingTask = await repos.task.findByIdentifier({
                     identifier: taskIdentifier,

package/lib/chevre/service/order/onOrderStatusChanged/onOrderProcessing.js

@@ -37,7 +37,7 @@ function onOrderProcessing(params) {
         await repos.task.saveMany(tasks);
         // uniqueness of CheckResource task(2025-03-29~)
         if (creatingCheckResourceTask !== undefined) {
-            await repos.task.createIfNotExistByAlternateName(creatingCheckResourceTask);
+            await repos.task.runTaskByIdentifier(creatingCheckResourceTask);
         }
         switch (params.order.orderStatus) {
             case factory_1.factory.orderStatus.OrderProcessing:

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/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/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/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, {});
         }
     };
 }