Browse Source

refactor: Move job options type to job file

Owen Diffey 1 year ago
parent
commit
991819b667

+ 9 - 1
backend/src/Job.ts

@@ -1,7 +1,7 @@
+import { SessionSchema } from "@models/sessions/schema";
 import JobContext from "@/JobContext";
 import JobStatistics, { JobStatisticsType } from "@/JobStatistics";
 import LogBook, { Log } from "@/LogBook";
-import { JobOptions } from "@/types/JobOptions";
 import BaseModule from "./BaseModule";
 import EventsModule from "./modules/EventsModule";
 import { getErrorMessage } from "./utils/getErrorMessage";
@@ -14,6 +14,14 @@ export enum JobStatus {
 	COMPLETED = "COMPLETED"
 }
 
+export type JobOptions = {
+	priority?: number;
+	longJob?: string;
+	session?: SessionSchema;
+	socketId?: string;
+	callbackRef?: string;
+};
+
 export default abstract class Job {
 	protected static _apiEnabled = true;
 

+ 1 - 2
backend/src/JobContext.ts

@@ -1,7 +1,6 @@
 import { SessionSchema } from "@/modules/DataModule/models/sessions/schema";
-import Job from "@/Job";
+import Job, { JobOptions } from "@/Job";
 import { Log } from "@/LogBook";
-import { JobOptions } from "@/types/JobOptions";
 import DataModule from "@/modules/DataModule";
 import { UserModel } from "@/modules/DataModule/models/users/schema";
 

+ 1 - 2
backend/src/JobQueue.ts

@@ -1,5 +1,4 @@
-import Job, { JobStatus } from "@/Job";
-import { JobOptions } from "@/types/JobOptions";
+import Job, { JobStatus, JobOptions } from "@/Job";
 import JobStatistics, { JobStatisticsType } from "./JobStatistics";
 
 export class JobQueue {

+ 1 - 2
backend/src/modules/DataModule/DataModuleJob.ts

@@ -1,7 +1,6 @@
 import { HydratedDocument, Model, isObjectIdOrHexString } from "mongoose";
-import Job from "@/Job";
+import Job, { JobOptions } from "@/Job";
 import DataModule from "../DataModule";
-import { JobOptions } from "@/types/JobOptions";
 import { UserModel } from "./models/users/schema";
 import { forEachIn } from "@/utils/forEachIn";
 

+ 1 - 2
backend/src/modules/EventsModule/jobs/Subscribe.ts

@@ -1,6 +1,5 @@
-import Job from "@/Job";
+import Job, { JobOptions } from "@/Job";
 import EventsModule from "@/modules/EventsModule";
-import { JobOptions } from "@/types/JobOptions";
 
 export default class Subscribe extends Job {
 	public constructor(payload?: unknown, options?: JobOptions) {

+ 1 - 2
backend/src/modules/EventsModule/jobs/SubscribeMany.ts

@@ -1,6 +1,5 @@
-import Job from "@/Job";
+import Job, { JobOptions } from "@/Job";
 import EventsModule from "@/modules/EventsModule";
-import { JobOptions } from "@/types/JobOptions";
 import { forEachIn } from "@/utils/forEachIn";
 
 export default class SubscribeMany extends Job {

+ 1 - 2
backend/src/modules/EventsModule/jobs/Unsubscribe.ts

@@ -1,6 +1,5 @@
-import Job from "@/Job";
+import Job, { JobOptions } from "@/Job";
 import EventsModule from "@/modules/EventsModule";
-import { JobOptions } from "@/types/JobOptions";
 
 export default class Unsubscribe extends Job {
 	public constructor(payload?: unknown, options?: JobOptions) {

+ 1 - 2
backend/src/modules/EventsModule/jobs/UnsubscribeAll.ts

@@ -1,6 +1,5 @@
-import Job from "@/Job";
+import Job, { JobOptions } from "@/Job";
 import EventsModule from "@/modules/EventsModule";
-import { JobOptions } from "@/types/JobOptions";
 
 export default class UnsubscribeAll extends Job {
 	public constructor(payload?: unknown, options?: JobOptions) {

+ 1 - 2
backend/src/modules/EventsModule/jobs/UnsubscribeMany.ts

@@ -1,6 +1,5 @@
-import Job from "@/Job";
+import Job, { JobOptions } from "@/Job";
 import EventsModule from "@/modules/EventsModule";
-import { JobOptions } from "@/types/JobOptions";
 
 export default class UnsubscribeMany extends Job {
 	public constructor(payload?: unknown, options?: JobOptions) {

+ 0 - 9
backend/src/types/JobOptions.ts

@@ -1,9 +0,0 @@
-import { SessionSchema } from "@models/sessions/schema";
-
-export type JobOptions = {
-	priority?: number;
-	longJob?: string;
-	session?: SessionSchema;
-	socketId?: string;
-	callbackRef?: string;
-};