@chevre/domain 21.2.0-alpha.20 → 21.2.0-alpha.22

package/lib/chevre/repo/mongoose/schemas/task.d.ts

@@ -61,6 +61,7 @@ declare const schema: Schema<any, import("mongoose").Model<any, any, any, any, a
     remainingNumberOfTries?: number | undefined;
     lastTriedAt?: Date | undefined;
     numberOfTried?: number | undefined;
+    executor?: any;
     dateAborted?: Date | undefined;
 }, import("mongoose").Document<unknown, {}, import("mongoose").FlatRecord<{
     executionResults: any[];
@@ -72,6 +73,7 @@ declare const schema: Schema<any, import("mongoose").Model<any, any, any, any, a
     remainingNumberOfTries?: number | undefined;
     lastTriedAt?: Date | undefined;
     numberOfTried?: number | undefined;
+    executor?: any;
     dateAborted?: Date | undefined;
 }>> & Omit<import("mongoose").FlatRecord<{
     executionResults: any[];
@@ -83,6 +85,7 @@ declare const schema: Schema<any, import("mongoose").Model<any, any, any, any, a
     remainingNumberOfTries?: number | undefined;
     lastTriedAt?: Date | undefined;
     numberOfTried?: number | undefined;
+    executor?: any;
     dateAborted?: Date | undefined;
 }> & {
     _id: import("mongoose").Types.ObjectId;

package/lib/chevre/repo/mongoose/schemas/task.js

@@ -17,6 +17,7 @@ const schema = new mongoose_1.Schema({
     lastTriedAt: Date,
     numberOfTried: Number,
     executionResults: [mongoose_1.SchemaTypes.Mixed],
+    executor: mongoose_1.SchemaTypes.Mixed,
     data: mongoose_1.SchemaTypes.Mixed,
     dateAborted: Date
 }, {

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

@@ -33,9 +33,15 @@ export declare class MongoRepository {
     createInformTaskIfNotExist(params: factory.task.IAttributes<factory.taskName.TriggerWebhook>, options: IOptionOnCreate): Promise<void>;
     executeById(params: {
         id: string;
+        executor: {
+            name: string;
+        };
     }): Promise<factory.task.ITask<factory.taskName> | null>;
     executeOneByName<T extends factory.taskName>(params: {
         name: T;
+        executor: {
+            name: string;
+        };
     }): Promise<factory.task.ITask<T> | null>;
     retry(params: {
         intervalInMinutes: number;

package/lib/chevre/repo/task.js

@@ -211,7 +211,8 @@ class MongoRepository {
                 $inc: {
                     remainingNumberOfTries: -1,
                     numberOfTried: 1 // トライ回数増やす
-                }
+                },
+                executor: params.executor
             }, { new: true })
                 .exec();
             if (doc === null) {
@@ -233,7 +234,8 @@ class MongoRepository {
                 $inc: {
                     remainingNumberOfTries: -1,
                     numberOfTried: 1 // トライ回数増やす
-                }
+                },
+                executor: params.executor
             }, { new: true })
                 .sort(sortOrder4executionOfTasks)
                 .exec();

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

@@ -18,12 +18,18 @@ export type TaskOperation<T> = (repos: {
 export type IOperation<T> = (settings: IConnectionSettings) => Promise<T>;
 export declare function executeById(params: {
     id: string;
+    executor?: {
+        name: string;
+    };
 }): IOperation<void>;
 /**
  * タスク名でタスクをひとつ実行する
  */
 export declare function executeByName<T extends factory.taskName>(params: {
     name: T;
+    executor?: {
+        name: string;
+    };
 }): IOperation<void>;
 /**
  * タスクを実行する

package/lib/chevre/service/task.js

@@ -20,14 +20,21 @@ const NotificationService = require("./notification");
 const factory_1 = require("./notification/factory");
 const settings_1 = require("../settings");
 const debug = createDebug('chevre-domain:service:task');
+const DEFAULT_EXECUTOR_NAME = `${process.env.GAE_APPLICATION}:${process.env.GAE_INSTANCE}:${process.env.GAE_SERVICE}:jobs`;
 function executeById(params) {
     return (settings) => __awaiter(this, void 0, void 0, function* () {
+        var _a;
         const taskRepo = new task_1.MongoRepository(settings.connection);
         // 未実行のタスクを取得
         // tslint:disable-next-line:no-null-keyword
         let task = null;
         try {
-            task = yield taskRepo.executeById({ id: params.id });
+            task = yield taskRepo.executeById({
+                id: params.id,
+                executor: {
+                    name: (typeof ((_a = params.executor) === null || _a === void 0 ? void 0 : _a.name) === 'string') ? params.executor.name : DEFAULT_EXECUTOR_NAME
+                }
+            });
         }
         catch (error) {
             // tslint:disable-next-line:no-single-line-block-comment
@@ -46,12 +53,18 @@ exports.executeById = executeById;
  */
 function executeByName(params) {
     return (settings) => __awaiter(this, void 0, void 0, function* () {
+        var _a;
         const taskRepo = new task_1.MongoRepository(settings.connection);
         // 未実行のタスクを取得
         // tslint:disable-next-line:no-null-keyword
         let task = null;
         try {
-            task = yield taskRepo.executeOneByName(params);
+            task = yield taskRepo.executeOneByName({
+                name: params.name,
+                executor: {
+                    name: (typeof ((_a = params.executor) === null || _a === void 0 ? void 0 : _a.name) === 'string') ? params.executor.name : DEFAULT_EXECUTOR_NAME
+                }
+            });
         }
         catch (error) {
             // tslint:disable-next-line:no-single-line-block-comment

package/package.json

@@ -117,5 +117,5 @@
     "postversion": "git push origin --tags",
     "prepublishOnly": "npm run clean && npm run build && npm test && npm run doc"
   },
-  "version": "21.2.0-alpha.20"
+  "version": "21.2.0-alpha.22"
 }