@chevre/domain 26.0.0-alpha.15 → 26.0.0-alpha.16

package/lib/chevre/eventEmitter/task.d.ts

@@ -16,9 +16,6 @@ interface IReadyTask {
     id: string;
     name?: factory.taskName;
     status: factory.taskStatus.Ready;
-    remainingNumberOfTries?: never;
-    expires?: Date;
-    executionResult?: never;
 }
 /**
  * タスク名不明の遅延実行中タスク
@@ -27,9 +24,6 @@ interface IRunningTask {
     id: string;
     status: factory.taskStatus.Running;
     name?: never;
-    remainingNumberOfTries?: never;
-    expires?: never;
-    executionResult?: never;
 }
 /**
  * タスク名指定での遅延実行中タスク
@@ -38,27 +32,17 @@ interface IRunningTaskByName {
     id: string;
     status: factory.taskStatus.Running;
     name: factory.taskName;
-    remainingNumberOfTries?: never;
-    expires?: never;
-    executionResult?: never;
 }
 /**
- * 実行後タスクイベント
+ * タスクステータス変更イベント発火時パラメータとしてのタスク
  */
-interface IExecutedTask {
+type IChangedTask = IReadyTask | IRunningTask | IRunningTaskByName;
+type IOperationExecute<T> = (settings: IExecuteSettings) => Promise<T>;
+interface ITaskAsNextFunctionParam {
     id: string;
     status: factory.taskStatus.Executed | factory.taskStatus.Running | factory.taskStatus.Aborted;
     name: factory.taskName;
-    executionResult: factory.task.IExecutionResult;
-    /**
-     * 実行されたタスクの残り試行回数
-     */
-    remainingNumberOfTries: number;
-    expires?: never;
 }
-type IChangedTask = IReadyTask | IRunningTask | IRunningTaskByName | IExecutedTask;
-type IOperationExecute<T> = (settings: IExecuteSettings) => Promise<T>;
-type ITaskAsNextFunctionParam = Pick<IExecutedTask, 'id' | 'name' | 'status'>;
 type IAsyncActionNextFunction = (task: ITaskAsNextFunctionParam) => IOperationExecute<void>;
 type IOnTaskStatusChangedListener = (task: IChangedTask) => void;
 type RedisClientType = ReturnType<typeof createClient>;
@@ -70,4 +54,4 @@ declare class TaskEventEmitter extends EventEmitter {
     emitTaskStatusChanged(task: IChangedTask): void;
 }
 declare const taskEventEmitter: TaskEventEmitter;
-export { IChangedTask, IReadyTask, IRunningTask, IRunningTaskByName, IExecutedTask, IExecuteSettings, IOnTaskStatusChangedListener, taskEventEmitter, ITaskAsNextFunctionParam, IAsyncActionNextFunction };
+export { IChangedTask, IReadyTask, IRunningTask, IRunningTaskByName, IExecuteSettings, IOnTaskStatusChangedListener, taskEventEmitter, ITaskAsNextFunctionParam, IAsyncActionNextFunction };

package/lib/chevre/repo/assetTransaction.d.ts

@@ -124,7 +124,7 @@ export declare class AssetTransactionRepo {
             $in: factory.transactionStatusType[];
         };
         limit: number;
-    }): Promise<Pick<import("@chevre/factory/lib/chevre/assetTransaction/cancelReservation").ITransaction | import("@chevre/factory/lib/chevre/assetTransaction/pay").ITransaction | import("@chevre/factory/lib/chevre/assetTransaction/refund").ITransaction | import("@chevre/factory/lib/chevre/assetTransaction/reserve").ITransaction, "id" | "status" | "typeOf">[]>;
+    }): Promise<Pick<import("@chevre/factory/lib/chevre/assetTransaction/cancelReservation").ITransaction | import("@chevre/factory/lib/chevre/assetTransaction/pay").ITransaction | import("@chevre/factory/lib/chevre/assetTransaction/refund").ITransaction | import("@chevre/factory/lib/chevre/assetTransaction/reserve").ITransaction, "id" | "typeOf" | "status">[]>;
     /**
      * set task status exported by transaction id
      * IDでタスクをエクスポート済に変更する

package/lib/chevre/repo/transaction.d.ts

@@ -73,7 +73,7 @@ export declare class TransactionRepo {
             $in: factory.transactionStatusType[];
         };
         limit: number;
-    }): Promise<Pick<import("@chevre/factory/lib/chevre/transaction/placeOrder").ITransaction | import("@chevre/factory/lib/chevre/transaction/returnOrder").ITransaction, "id" | "status" | "typeOf">[]>;
+    }): Promise<Pick<import("@chevre/factory/lib/chevre/transaction/placeOrder").ITransaction | import("@chevre/factory/lib/chevre/transaction/returnOrder").ITransaction, "id" | "typeOf" | "status">[]>;
     /**
      * set task status exported by transaction id
      * IDでタスクをエクスポート済に変更する
@@ -133,16 +133,16 @@ export declare class TransactionRepo {
     getCursor(conditions: any, projection: any, sort?: factory.sortType): import("mongoose").Cursor<import("mongoose").Document<unknown, Record<string, never>, IDocType, import("./mongoose/virtuals").IVirtuals, {}> & (({
         object: import("@chevre/factory/lib/chevre/transaction/placeOrder").IObject;
         error?: any;
-        status: factory.transactionStatusType;
-        expires: Date;
         project: import("@chevre/factory/lib/chevre/transaction").IProject;
         seller: import("@chevre/factory/lib/chevre/transaction/placeOrder").ISeller;
         typeOf: factory.transactionType.PlaceOrder;
+        expires: Date;
         result?: import("@chevre/factory/lib/chevre/transaction/placeOrder").IResult | undefined;
         startDate: Date;
         endDate?: Date | undefined;
         instrument?: import("@chevre/factory/lib/chevre/transaction/placeOrder").IInstrument | undefined;
         agent: import("@chevre/factory/lib/chevre/transaction/placeOrder").IAgent;
+        status: factory.transactionStatusType;
         tasksExportAction?: import("@chevre/factory/lib/chevre/transaction").ITasksExportAction | undefined;
         potentialActions?: undefined;
     } & {
@@ -152,16 +152,16 @@ export declare class TransactionRepo {
     }) | ({
         object: import("@chevre/factory/lib/chevre/transaction/returnOrder").IObject;
         error?: any;
-        status: factory.transactionStatusType;
-        expires: Date;
         project: import("@chevre/factory/lib/chevre/transaction").IProject;
         seller: import("@chevre/factory/lib/chevre/transaction").ISeller;
         typeOf: factory.transactionType.ReturnOrder;
+        expires: Date;
         result?: import("@chevre/factory/lib/chevre/transaction/returnOrder").IResult | undefined;
         startDate: Date;
         endDate?: Date | undefined;
         agent: import("@chevre/factory/lib/chevre/transaction").IAgent;
         recipient?: undefined;
+        status: factory.transactionStatusType;
         tasksExportAction?: import("@chevre/factory/lib/chevre/transaction").ITasksExportAction | undefined;
         potentialActions?: import("@chevre/factory/lib/chevre/transaction/returnOrder").IPotentialActions | undefined;
     } & {
@@ -171,16 +171,16 @@ export declare class TransactionRepo {
     })), import("mongoose").QueryOptions<IDocType>, (import("mongoose").Document<unknown, Record<string, never>, IDocType, import("./mongoose/virtuals").IVirtuals, {}> & (({
         object: import("@chevre/factory/lib/chevre/transaction/placeOrder").IObject;
         error?: any;
-        status: factory.transactionStatusType;
-        expires: Date;
         project: import("@chevre/factory/lib/chevre/transaction").IProject;
         seller: import("@chevre/factory/lib/chevre/transaction/placeOrder").ISeller;
         typeOf: factory.transactionType.PlaceOrder;
+        expires: Date;
         result?: import("@chevre/factory/lib/chevre/transaction/placeOrder").IResult | undefined;
         startDate: Date;
         endDate?: Date | undefined;
         instrument?: import("@chevre/factory/lib/chevre/transaction/placeOrder").IInstrument | undefined;
         agent: import("@chevre/factory/lib/chevre/transaction/placeOrder").IAgent;
+        status: factory.transactionStatusType;
         tasksExportAction?: import("@chevre/factory/lib/chevre/transaction").ITasksExportAction | undefined;
         potentialActions?: undefined;
     } & {
@@ -190,16 +190,16 @@ export declare class TransactionRepo {
     }) | ({
         object: import("@chevre/factory/lib/chevre/transaction/returnOrder").IObject;
         error?: any;
-        status: factory.transactionStatusType;
-        expires: Date;
         project: import("@chevre/factory/lib/chevre/transaction").IProject;
         seller: import("@chevre/factory/lib/chevre/transaction").ISeller;
         typeOf: factory.transactionType.ReturnOrder;
+        expires: Date;
         result?: import("@chevre/factory/lib/chevre/transaction/returnOrder").IResult | undefined;
         startDate: Date;
         endDate?: Date | undefined;
         agent: import("@chevre/factory/lib/chevre/transaction").IAgent;
         recipient?: undefined;
+        status: factory.transactionStatusType;
         tasksExportAction?: import("@chevre/factory/lib/chevre/transaction").ITasksExportAction | undefined;
         potentialActions?: import("@chevre/factory/lib/chevre/transaction/returnOrder").IPotentialActions | undefined;
     } & {

package/lib/chevre/service/asyncActionHandler/onOperationFailed.d.ts

@@ -1,4 +1,4 @@
-import type { IExecutedTask } from '../../eventEmitter/task';
+import type { ITaskAsNextFunctionParam } from '../../eventEmitter/task';
 import type { AsyncActionRepo, IExecutableAsyncAction } from '../../repo/asyncAction';
 /**
  * タスク実行失敗時処理
@@ -10,6 +10,6 @@ declare function onOperationFailed(params: {
 }): (repos: {
     asyncAction: AsyncActionRepo;
 }) => Promise<{
-    executedTask: IExecutedTask;
+    executedTask: ITaskAsNextFunctionParam;
 }>;
 export { onOperationFailed };

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

@@ -32,10 +32,8 @@ function onOperationFailed(params) {
         });
         const executedTask = {
             id: task.id,
-            remainingNumberOfTries: 0,
             name: task.name,
             status: factory_1.factory.taskStatus.Aborted,
-            executionResult: result
         };
         return { executedTask };
     };

package/package.json

@@ -88,5 +88,5 @@
     "postversion": "git push origin --tags",
     "prepublishOnly": "npm run clean && npm run build"
   },
-  "version": "26.0.0-alpha.15"
+  "version": "26.0.0-alpha.16"
 }