Move db models to db folder

.gitignore

@@ -1,4 +1,5 @@
 .vite
 .vscode
 *.sh
-!uptime.sh
+!uptime.sh
+*.idea

Server/db/FakeDb.js

@@ -20,8 +20,8 @@
 // The rest of the code is the same, as all the `db` methods are standardized.
 // **************************
 
-const Monitor = require("../models/Monitor");
-const UserModel = require("../models/User");
+const Monitor = require("./models/Monitor");
+const UserModel = require("./models/User");
 const bcrypt = require("bcrypt");
 
 let FAKE_MONITOR_DATA = [];

Server/db/models/Check.js

@@ -1,6 +1,6 @@
 const mongoose = require("mongoose");
-const EmailService = require("../service/emailService");
-const Notification = require("../models/Notification");
+const EmailService = require("../../service/emailService");
+const Notification = require("./Notification");
 
 /**
  * Check Schema for MongoDB collection.

Server/db/mongo/MongoDB.js

@@ -1,6 +1,6 @@
 const mongoose = require("mongoose");
-const UserModel = require("../../models/User");
-const AppSettings = require("../../models/AppSettings");
+const UserModel = require("../models/User");
+const AppSettings = require("../models/AppSettings");
 
 //****************************************
 // DB Connection

Server/db/mongo/modules/checkModule.js

@@ -1,6 +1,6 @@
-const Check = require("../../../models/Check");
-const Monitor = require("../../../models/Monitor");
-const User = require("../../../models/User");
+const Check = require("../../models/Check");
+const Monitor = require("../../models/Monitor");
+const User = require("../../models/User");
 const logger = require("../../../utils/logger");
 const SERVICE_NAME = "checkModule";
 const dateRangeLookup = {

Server/db/mongo/modules/inviteModule.js

@@ -1,4 +1,4 @@
-const InviteToken = require("../../../models/InviteToken");
+const InviteToken = require("../../models/InviteToken");
 const crypto = require("crypto");
 const { errorMessages } = require("../../../utils/messages");
 const SERVICE_NAME = "inviteModule";

Server/db/mongo/modules/maintenaceWindowModule.js

@@ -1,4 +1,4 @@
-const MaintenanceWindow = require("../../../models/MaintenanceWindow");
+const MaintenanceWindow = require("../../models/MaintenanceWindow");
 const SERVICE_NAME = "maintenanceWindowModule";
 
 /**

Server/db/mongo/modules/monitorModule.js

@@ -1,8 +1,8 @@
-const Monitor = require("../../../models/Monitor");
-const Check = require("../../../models/Check");
-const PageSpeedCheck = require("../../../models/PageSpeedCheck");
+const Monitor = require("../../models/Monitor");
+const Check = require("../../models/Check");
+const PageSpeedCheck = require("../../models/PageSpeedCheck");
 const { errorMessages } = require("../../../utils/messages");
-const Notification = require("../../../models/Notification");
+const Notification = require("../../models/Notification");
 const { NormalizeData } = require("../../../utils/dataUtils");
 const demoMonitors = require("../../../utils/demoMonitors.json");
 const SERVICE_NAME = "monitorModule";

Server/db/mongo/modules/notificationModule.js

@@ -1,4 +1,4 @@
-const Notification = require("../../../models/Notification");
+const Notification = require("../../models/Notification");
 const SERVICE_NAME = "notificationModule";
 /**
  * Creates a new notification.

Server/db/mongo/modules/pageSpeedCheckModule.js

@@ -1,4 +1,4 @@
-const PageSpeedCheck = require("../../../models/PageSpeedCheck");
+const PageSpeedCheck = require("../../models/PageSpeedCheck");
 const SERVICE_NAME = "pageSpeedCheckModule";
 /**
  * Create a PageSpeed check for a monitor

Server/db/mongo/modules/recoveryModule.js

@@ -1,5 +1,5 @@
-const UserModel = require("../../../models/User");
-const RecoveryToken = require("../../../models/RecoveryToken");
+const UserModel = require("../../models/User");
+const RecoveryToken = require("../../models/RecoveryToken");
 const crypto = require("crypto");
 const { errorMessages } = require("../../../utils/messages");
 const SERVICE_NAME = "recoveryModule";

Server/db/mongo/modules/settingsModule.js

@@ -1,4 +1,4 @@
-const AppSettings = require("../../../models/AppSettings");
+const AppSettings = require("../../models/AppSettings");
 const SERVICE_NAME = "SettingsModule";
 
 const getAppSettings = async () => {

Server/db/mongo/modules/userModule.js

@@ -1,5 +1,5 @@
-const UserModel = require("../../../models/User");
-const TeamModel = require("../../../models/Team");
+const UserModel = require("../../models/User");
+const TeamModel = require("../../models/Team");
 const { errorMessages } = require("../../../utils/messages");
 const { GenerateAvatarImage } = require("../../../utils/imageProcessing");
 

Server/middleware/verifyJWT.js

@@ -4,7 +4,7 @@ const SERVICE_NAME = "verifyJWT";
 const TOKEN_PREFIX = "Bearer ";
 const { errorMessages } = require("../utils/messages");
 const { parse } = require("path");
-const User = require("../models/User");
+const User = require("../db/models/User");
 /**
  * Verifies the JWT token
  * @function

Server/routes/authRoute.js

@@ -4,7 +4,7 @@ const { verifyOwnership } = require("../middleware/verifyOwnership");
 const { isAllowed } = require("../middleware/isAllowed");
 const multer = require("multer");
 const upload = multer();
-const User = require("../models/User");
+const User = require("../db/models/User");
 
 const {
   registerController,

Server/routes/checkRoute.js

@@ -2,7 +2,7 @@ const router = require("express").Router();
 const checkController = require("../controllers/checkController");
 const { verifyOwnership } = require("../middleware/verifyOwnership");
 const { isAllowed } = require("../middleware/isAllowed");
-const Monitor = require("../models/Monitor");
+const Monitor = require("../db/models/Monitor");
 
 router.get("/:monitorId", checkController.getChecks);
 router.post(

Server/routes/maintenanceWindowRoute.js

@@ -1,7 +1,7 @@
 const router = require("express").Router();
 const maintenanceWindowController = require("../controllers/maintenanceWindowController");
 const { verifyOwnership } = require("../middleware/verifyOwnership");
-const Monitor = require("../models/Monitor");
+const Monitor = require("../db/models/Monitor");
 
 router.get(
   "/monitor/:monitorId",

Server/routes/settingsRoute.js

@@ -1,7 +1,7 @@
 const router = require("express").Router();
 const settingsController = require("../controllers/settingsController");
 const { isAllowed } = require("../middleware/isAllowed");
-const Monitor = require("../models/Monitor");
+const Monitor = require("../db/models/Monitor");
 
 router.get("/", settingsController.getAppSettings);
 router.put(

Server/service/pageSpeedService.js

@@ -1,4 +1,4 @@
-const PageSpeedCheck = require("../models/PageSpeedCheck");
+const PageSpeedCheck = require("../db/models/PageSpeedCheck");
 const axios = require("axios");
 const logger = require("../utils/logger");
 

Server/service/settingsService.js

@@ -1,5 +1,5 @@
 const { env } = require("process");
-const AppSettings = require("../models/AppSettings");
+const AppSettings = require("../db/models/AppSettings");
 const SERVICE_NAME = "SettingsService";
 const envConfig = {
   logLevel: undefined,