diff --git a/src-javascript/app/crons/demo.cron.js b/src-javascript/app/crons/demo.cron.js index 51c836e..1fc82e4 100644 --- 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 b/src-javascript/app/enums/CronJob.js similarity index 58% rename from src-javascript/app/enums/CronMonth.js rename to src-javascript/app/enums/CronJob.js index 1c55586..ec3d94c 100644 --- a/src-javascript/app/enums/CronMonth.js +++ b/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 deleted file mode 100644 index db9b944..0000000 --- a/src-javascript/app/enums/CronWeekday.js +++ /dev/null @@ -1,11 +0,0 @@ -const CronWeekday = { - Sunday: 'sun', - Monday: 'mon', - Tuesday: 'tue', - Wednesday: 'wed', - Thursday: 'thu', - Friday: 'fri', - Saturday: 'sat', -}; - -module.exports.CronWeekday = CronWeekday; diff --git a/src-javascript/app/utils/CronBuilder.js b/src-javascript/app/utils/CronBuilder.js index 3331401..9c08e6e 100644 --- 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 index 3c009e2..2033330 100644 --- 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 index 13e1217..b0c9121 100644 --- 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 deleted file mode 100644 index f6e3667..0000000 --- a/src-typescript/app/apis/user/repositories/mongoose.user.repository.ts +++ /dev/null @@ -1,13 +0,0 @@ -import User from '../../../models/mongoose.user.model'; - -class UserRepository { - async find(filter: {}) { - return User.findOne(filter).exec(); - } - - async create(data: any) { - return User.create(data); - } -} - -export default new UserRepository(); diff --git a/src-typescript/app/crons/demo.cron.ts b/src-typescript/app/crons/demo.cron.ts index 9325ba3..48ea666 100644 --- 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 { cronController() { diff --git a/src-typescript/app/enums/CronMonth.ts b/src-typescript/app/enums/CronJob.ts similarity index 60% rename from src-typescript/app/enums/CronMonth.ts rename to src-typescript/app/enums/CronJob.ts index a3d83b1..1c4208d 100644 --- a/src-typescript/app/enums/CronMonth.ts +++ b/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 deleted file mode 100644 index 5270658..0000000 --- a/src-typescript/app/enums/CronWeekday.ts +++ /dev/null @@ -1,9 +0,0 @@ -export enum CronWeekday { - Sunday = 'sun', - Monday = 'mon', - Tuesday = 'tue', - Wednesday = 'wed', - Thursday = 'thu', - Friday = 'fri', - Saturday = 'sat', -} diff --git a/src-typescript/app/models/mongoose.user.model.ts b/src-typescript/app/models/mongoose.user.model.ts deleted file mode 100644 index a3d117e..0000000 --- a/src-typescript/app/models/mongoose.user.model.ts +++ /dev/null @@ -1,18 +0,0 @@ -import mongoose from 'mongoose'; - -const UserSchema = new mongoose.Schema( - { - name: String, - email: { - type: String, - unique: true, - }, - password: String, - //add more fields - }, - { - timestamps: true, - } -); - -export default mongoose.model('User', UserSchema); diff --git a/src-typescript/app/utils/CronBuilder.ts b/src-typescript/app/utils/CronBuilder.ts index 6e56f5c..424ce94 100644 --- 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 index 39dd827..e19c696 100644 --- a/src-typescript/app/utils/MasterController.ts +++ b/src-typescript/app/utils/MasterController.ts @@ -44,7 +44,7 @@ class MasterController { // end socket requests snippet - // start cron job snippet + // start cron jobs snippet private static cronRequests: ICronJob[] = []; /** @@ -57,7 +57,7 @@ class MasterController { 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 index 28cb09a..fce499b 100644 --- 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, () => {