Remove DB settings from settings service

server/db/models/AppSettings.js

@@ -2,44 +2,9 @@ import mongoose from "mongoose";
 
 const AppSettingsSchema = mongoose.Schema(
 	{
-		apiBaseUrl: {
+		language: {
 			type: String,
-			required: true,
-			default: "http://localhost:5000/api/v1",
-		},
-		logLevel: {
-			type: String,
-			default: "debug",
-			enum: ["debug", "none", "error", "warn"],
-		},
-		clientHost: {
-			type: String,
-			required: true,
-			default: "http://localhost:5173",
-		},
-		jwtSecret: {
-			type: String,
-			required: true,
-			default: "my_secret",
-		},
-		dbType: {
-			type: String,
-			required: true,
-			default: "MongoDB",
-		},
-		dbConnectionString: {
-			type: String,
-			required: true,
-			default: "mongodb://localhost:27017/uptime_db",
-		},
-		redisUrl: {
-			type: String,
-			default: "redis://127.0.0.1:6379",
-		},
-		jwtTTL: {
-			type: String,
-			required: true,
-			default: "2h",
+			default: "gb",
 		},
 		pagespeedApiKey: {
 			type: String,
@@ -47,19 +12,15 @@ const AppSettingsSchema = mongoose.Schema(
 		},
 		systemEmailHost: {
 			type: String,
-			default: "smtp.gmail.com",
 		},
 		systemEmailPort: {
 			type: Number,
-			default: 465,
 		},
 		systemEmailAddress: {
 			type: String,
-			default: "",
 		},
 		systemEmailPassword: {
 			type: String,
-			default: "",
 		},
 		singleton: {
 			type: Boolean,
@@ -73,4 +34,4 @@ const AppSettingsSchema = mongoose.Schema(
 	}
 );
 
-export default mongoose.model("AppSettings", AppSettingsSchema);
+export default mongoose.model("AppSettings", AppSettingsSchema);

server/db/mongo/MongoDB.js

@@ -76,7 +76,8 @@ import * as diagnosticModule from "./modules/diagnosticModule.js";
 class MongoDB {
 	static SERVICE_NAME = "MongoDB";
 
-	constructor() {
+	constructor({ appSettings }) {
+		this.appSettings = appSettings;
 		Object.assign(this, userModule);
 		Object.assign(this, inviteModule);
 		Object.assign(this, recoveryModule);
@@ -95,8 +96,7 @@ class MongoDB {
 	connect = async () => {
 		try {
 			const connectionString =
-				process.env.DB_CONNECTION_STRING || "mongodb://localhost:27017/uptime_db";
-			console.log("Connecting to MongoDB with connection string:", connectionString);
+				this.appSettings.dbConnectionString || "mongodb://localhost:27017/uptime_db";
 			await mongoose.connect(connectionString);
 			// If there are no AppSettings, create one
 			await AppSettings.findOneAndUpdate(

server/db/mongo/modules/settingsModule.js

@@ -14,10 +14,11 @@ const getAppSettings = async () => {
 
 const updateAppSettings = async (newSettings) => {
 	try {
+		console.log(newSettings);
 		const settings = await AppSettings.findOneAndUpdate(
 			{},
 			{ $set: newSettings },
-			{ new: true }
+			{ new: true, upsert: true }
 		);
 		return settings;
 	} catch (error) {