Cleanup.

Signed-off-by: Alexander Trauzzi <[email protected]>

Author: atrauzzi

src/implementation/Client/GRPCClient/jobs.ts

@@ -13,6 +13,8 @@ limitations under the License.
 
 import IClientJobs from "../../../interfaces/Client/IClientJobs";
 import GRPCClient from "./GRPCClient";
+import { JobSchedule } from "../../../types/jobs/JobSchedule.type";
+import { Job } from "../../../types/jobs/Job.type";
 
 
 export default class GRPCClientJobs implements IClientJobs {
@@ -23,13 +25,22 @@ export default class GRPCClientJobs implements IClientJobs {
         this.grpcClient = grpcClient;
     }
 
-    schedule(): Promise<unknown> {
+    async schedule(
+        jobName: string,
+        data: object | string,
+        schedule: JobSchedule | null = null,
+        dueTime: string | Date | null = null,
+        repeats: number | null = null,
+        ttl: string | null = null
+    ): Promise<void> {
         throw new Error("Not yet!");
     }
-    get(): Promise<unknown> {
+
+    async get<DataType>(jobName: string): Promise<Job<DataType>> {
         throw new Error("Not yet!");
     }
-    delete(): Promise<unknown> {
+
+    async delete(jobName: string): Promise<void> {
         throw new Error("Not yet!");
     }
 }

src/implementation/Client/HTTPClient/jobs.ts

@@ -19,58 +19,45 @@ import { JobSchedule } from "../../../types/jobs/JobSchedule.type";
 
 export default class HTTPClientJobs implements IClientJobs {
 
-    constructor(private readonly httpClient: HTTPClient) {}
-
-    async schedule(
-        jobName: string,
-        data: object | string,
-        schedule: JobSchedule | null = null,
-        dueTime: string | Date | null = null,
-        repeats: number | null = null,
-        ttl: string | null = null
-    ): Promise<void> {
-
-        await this.httpClient.executeWithApiVersion(
-            "v1.0-alpha1",
-            `/jobs/${jobName}`,
-            {
-                method: "POST",
-                body: {
-                    data,
-                    schedule,
-                    dueTime,
-                    repeats,
-                    ttl,
-                },
-                headers: {
-                    "content-type": "application/json",
-                },
-            } as THTTPExecuteParams
-        );
-    }
-
-    async get(jobName: string): Promise<Job>;
-    async get<DataType>(jobName: string): Promise<Job<DataType>> {
-
-        const result = await this.httpClient.executeWithApiVersion(
-            "v1.0-alpha1",
-            `/jobs/${jobName}`,
-            {
-                method: "GET",
-            }
-        );
-
-        return result as Job<DataType>;
-    }
-
-    async delete(jobName: string): Promise<void> {
-
-        await this.httpClient.executeWithApiVersion(
-            "v1.0-alpha1",
-            `/jobs/${jobName}`,
-            {
-                method: "DELETE"
-            }
-        );
-    }
-}
+  private static ApiVersion = "v1.0-alpha1";
+  private static Path = "jobs";
+
+  constructor(private readonly httpClient: HTTPClient) {}
+
+  async schedule(
+    jobName: string,
+    data: object | string,
+    schedule: JobSchedule | null = null,
+    dueTime: string | Date | null = null,
+    repeats: number | null = null,
+    ttl: string | null = null,
+  ): Promise<void> {
+    await this.httpClient.executeWithApiVersion(HTTPClientJobs.ApiVersion, `/${HTTPClientJobs.Path}/${jobName}`, {
+      method: "POST",
+      body: {
+        data,
+        schedule,
+        dueTime,
+        repeats,
+        ttl,
+      },
+      headers: {
+        "content-type": "application/json",
+      },
+    } as THTTPExecuteParams);
+  }
+
+  async get<DataType>(jobName: string): Promise<Job<DataType>> {
+    const result = await this.httpClient.executeWithApiVersion(HTTPClientJobs.ApiVersion, `/${HTTPClientJobs.Path}/${jobName}`, {
+      method: "GET",
+    });
+
+    return result as Job<DataType>;
+  }
+
+  async delete(jobName: string): Promise<void> {
+    await this.httpClient.executeWithApiVersion(HTTPClientJobs.ApiVersion, `/${HTTPClientJobs.Path}/${jobName}`, {
+      method: "DELETE",
+    });
+  }
+}

src/implementation/Server/HTTPServer/jobs.ts

@@ -16,11 +16,9 @@ import HTTPServer from "./HTTPServer";
 import { TypeDaprJobsCallback } from "../../../types/DaprJobsCallback.type";
 
 export default class HTTPServerJobs implements IServerJobs {
+  constructor(private readonly httpServer: HTTPServer) {}
 
-    constructor(private readonly httpServer: HTTPServer) {}
-
-    listen(jobName: string, callback: TypeDaprJobsCallback) : void;
-    listen<DataType>(jobName: string, callback: TypeDaprJobsCallback<DataType>): void {
-        this.httpServer.getServer().post(`/job/${jobName}`, callback);
-    }
+  listen<DataType>(jobName: string, callback: TypeDaprJobsCallback<DataType>): void {
+    this.httpServer.getServer().post(`/job/${jobName}`, callback);
+  }
 }

src/interfaces/Client/IClientJobs.ts

@@ -15,15 +15,17 @@ import { JobSchedule } from "../../types/jobs/JobSchedule.type";
 import { Job } from "../../types/jobs/Job.type";
 
 export default interface IClientJobs {
+  schedule(
+    jobName: string,
+    data: object | string,
+    schedule: JobSchedule | null,
+    dueTime: string | Date | null,
+    repeats: number | null,
+    ttl: string | null,
+  ): Promise<void>;
 
-    schedule(
-        jobName: string,
-        data: object | string,
-        schedule: JobSchedule | null,
-        dueTime: string | Date | null,
-        repeats: number | null,
-        ttl: string | null
-    ): Promise<void>;
-    get(jobName: string): Promise<Job>;
-    delete(jobName: string): Promise<void>;
+  get(jobName: string): Promise<Job>;
+  get<DataType>(jobName: string): Promise<Job<DataType>>;
+
+  delete(jobName: string): Promise<void>;
 }

src/interfaces/Server/IServerJobs.ts

@@ -14,7 +14,7 @@ limitations under the License.
 import { TypeDaprJobsCallback } from "../../types/DaprJobsCallback.type";
 
 export default interface IServerJobs {
+  listen(jobName: string, callback: TypeDaprJobsCallback): void;
 
-    listen(jobName: string, callback: TypeDaprJobsCallback): void;
-
-}
+  listen<DataType>(jobName: string, callback: TypeDaprJobsCallback<DataType>): void;
+}

src/types/jobs/Job.type.ts

@@ -14,9 +14,9 @@ limitations under the License.
 import { JobSchedule } from "./JobSchedule.type";
 
 export interface Job<DataType = object | string> {
-    name: string;
-    schedule: JobSchedule;
-    data: {
-        value: DataType,
-    };
+  name: string;
+  schedule: JobSchedule;
+  data: {
+    value: DataType;
+  };
 }

src/types/jobs/JobSchedule.type.ts

@@ -12,11 +12,11 @@ limitations under the License.
 */
 
 export enum FixedPeriod {
-    Yearly = "@yearly",
-    Monthly = "@monthly",
-    Weekly = "@weekly",
-    Daily = "@daily",
-    Hourly = "@hourly"
+  Yearly = "@yearly",
+  Monthly = "@monthly",
+  Weekly = "@weekly",
+  Daily = "@daily",
+  Hourly = "@hourly",
 }
 
 type EveryPeriod = `@every ${string}`;