merged cron enums, now only one file dependency

Signed-off-by: Ijlal Ahmad <[email protected]>
Thre4dripper · Oct 16, 2024 · a396937 · a396937
1 parent 73b1390
commit a396937
Show file tree

Hide file tree

Showing 14 changed files with 33 additions and 65 deletions.
diff --git a/src-javascript/app/crons/demo.cron.js b/src-javascript/app/crons/demo.cron.js
@@ -1,6 +1,6 @@
 const MasterController = require('../utils/MasterController');
 const CronBuilder = require('../utils/CronBuilder');
-const { CronWeekday } = require('../enums/CronWeekday');
+const { CronWeekday } = require('../enums/CronJob');
 
 class DemoCron extends MasterController {
     cronController() {

diff --git a/src-javascript/app/enums/CronMonth.js → src-javascript/app/enums/CronJob.js b/src-javascript/app/enums/CronMonth.js → src-javascript/app/enums/CronJob.js
@@ -13,4 +13,15 @@ const CronMonth = {
     December: 'dec',
 };
 
+const CronWeekday = {
+    Sunday: 'sun',
+    Monday: 'mon',
+    Tuesday: 'tue',
+    Wednesday: 'wed',
+    Thursday: 'thu',
+    Friday: 'fri',
+    Saturday: 'sat',
+};
+
 module.exports.CronMonth = CronMonth;
+module.exports.CronWeekday = CronWeekday;
diff --git a/src-javascript/app/enums/CronWeekday.js b/src-javascript/app/enums/CronWeekday.js
diff --git a/src-javascript/app/utils/CronBuilder.js b/src-javascript/app/utils/CronBuilder.js
@@ -1,5 +1,4 @@
-const { CronMonth } = require('../enums/CronMonth');
-const { CronWeekday } = require('../enums/CronWeekday');
+const { CronMonth, CronWeekday } = require('../enums/CronJob');
 
 class CronBuilder {
     constructor() {

diff --git a/src-javascript/app/utils/MasterController.js b/src-javascript/app/utils/MasterController.js
@@ -26,7 +26,7 @@ class MasterController {
 
     // end socket requests snippet
 
-    // start cron job snippet
+    // start cron jobs snippet
     static cronRequests = [];
 
     /**
@@ -39,7 +39,7 @@ class MasterController {
         return this.cronRequests;
     }
 
-    // end cron job snippet
+    // end cron jobs snippet
 
     /**
      * @method MasterController.doc

diff --git a/src-javascript/server.js b/src-javascript/server.js
@@ -74,11 +74,11 @@ const port = process.env.PORT || 3000;
     });
     // End Initialize Socket.IO
 
-    // Initialize the cron jobs
+    // Initialize Cron Jobs
     await CronConfig.InitCronJobs(path.join(__dirname, 'app/crons'));
     CronConfig.startCronJobs();
 
-    // End Initialize the cron jobs
+    // End Initialize Cron Jobs
 
     // Start listening for HTTP requests
     httpServer.listen(port, () => {

diff --git a/src-typescript/app/apis/user/repositories/mongoose.user.repository.ts b/src-typescript/app/apis/user/repositories/mongoose.user.repository.ts
diff --git a/src-typescript/app/crons/demo.cron.ts b/src-typescript/app/crons/demo.cron.ts
@@ -1,6 +1,6 @@
 import MasterController from '../utils/MasterController';
 import CronBuilder from '../utils/CronBuilder';
-import { CronWeekday } from '../enums/CronWeekday';
+import { CronWeekday } from '../enums/CronJob';
 
 class DemoCron extends MasterController<null, null, null> {
     cronController() {

diff --git a/src-typescript/app/enums/CronMonth.ts → src-typescript/app/enums/CronJob.ts b/src-typescript/app/enums/CronMonth.ts → src-typescript/app/enums/CronJob.ts
@@ -12,3 +12,13 @@ export enum CronMonth {
     November = 'nov',
     December = 'dec',
 }
+
+export enum CronWeekday {
+    Sunday = 'sun',
+    Monday = 'mon',
+    Tuesday = 'tue',
+    Wednesday = 'wed',
+    Thursday = 'thu',
+    Friday = 'fri',
+    Saturday = 'sat',
+}
diff --git a/src-typescript/app/enums/CronWeekday.ts b/src-typescript/app/enums/CronWeekday.ts
diff --git a/src-typescript/app/models/mongoose.user.model.ts b/src-typescript/app/models/mongoose.user.model.ts
diff --git a/src-typescript/app/utils/CronBuilder.ts b/src-typescript/app/utils/CronBuilder.ts
@@ -1,5 +1,4 @@
-import { CronMonth } from '../enums/CronMonth';
-import { CronWeekday } from '../enums/CronWeekday';
+import { CronMonth, CronWeekday } from '../enums/CronJob';
 
 class CronBuilder {
     private readonly fields: { [key: string]: string };

diff --git a/src-typescript/app/utils/MasterController.ts b/src-typescript/app/utils/MasterController.ts
@@ -44,7 +44,7 @@ class MasterController<P, Q, B> {
 
     // end socket requests snippet
 
-    // start cron job snippet
+    // start cron jobs snippet
     private static cronRequests: ICronJob[] = [];
 
     /**
@@ -57,7 +57,7 @@ class MasterController<P, Q, B> {
         return this.cronRequests;
     }
 
-    // end cron job snippet
+    // end cron jobs snippet
 
     /**
      * @method MasterController.doc

diff --git a/src-typescript/server.ts b/src-typescript/server.ts
@@ -72,7 +72,7 @@ const port = process.env.PORT || 3000;
     });
     // End Initialize Socket.IO
 
-    // Initialize the cron jobs
+    // Initialize Cron Jobs
     await CronConfig.InitCronJobs(path.join(__dirname, 'app/crons'), (pathToCron: string) => {
         // configurable import statement to load all the cron jobs before starting server
         // This lambda function is called for each cron job file found
@@ -81,7 +81,7 @@ const port = process.env.PORT || 3000;
     });
     CronConfig.startCronJobs();
 
-    // End Initialize the cron jobs
+    // End Initialize Cron Jobs
 
     // Start listening for HTTP requests
     httpServer.listen(port, () => {