From b493b5e0e5749b7b8ee528ddefb7991c3db46e73 Mon Sep 17 00:00:00 2001
From: Vishnu Sreekumaran Nair <200557136@student.georgianc.on.ca>
Date: Tue, 6 May 2025 15:57:00 -0400
Subject: [PATCH] modify loadSettings logic to fetch env from DB

---
 server/service/settingsService.js | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/server/service/settingsService.js b/server/service/settingsService.js
index 1443755f9..7a219a89d 100755
--- a/server/service/settingsService.js
+++ b/server/service/settingsService.js
@@ -48,11 +48,14 @@ class SettingsService {
 
 			// If there are any settings that weren't set by environment variables, use user settings from DB
 			for (const key in envConfig) {
-				if (
-					typeof envConfig?.[key] === "undefined" &&
-					typeof dbSettings?.[key] !== "undefined"
-				) {
-					this.settings[key] = dbSettings[key];
+
+				const envValue = envConfig[key];
+				const dbValue = dbSettings?.[key];
+
+				if (envValue === undefined || envValue === "") {
+					if (dbValue !== undefined) {
+						this.settings[key] = dbValue;
+					}
 				}
 			}