From cef9b5c8fc439e6ddbbfb907b48954fb280e264b Mon Sep 17 00:00:00 2001
From: orangecoding <weakmap@gmail.com>
Date: Wed, 10 Dec 2025 09:24:44 +0100
Subject: [PATCH] fixing default configs

---
 lib/defaultConfig.js                              | 5 -----
 lib/services/storage/migrations/sql/6.settings.js | 6 ++++++
 lib/services/storage/settingsStorage.js           | 2 +-
 package.json                                      | 2 +-
 4 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/lib/defaultConfig.js b/lib/defaultConfig.js
index c1464f6..e4a7ac0 100644
--- a/lib/defaultConfig.js
+++ b/lib/defaultConfig.js
@@ -1,9 +1,4 @@
 export const DEFAULT_CONFIG = {
-  interval: '60',
-  port: 9998,
-  workingHours: { from: '', to: '' },
-  demoMode: false,
-  analyticsEnabled: true,
   // Default path for sqlite storage directory. Interpreted relative to project root.
   sqlitepath: '/db',
 };
diff --git a/lib/services/storage/migrations/sql/6.settings.js b/lib/services/storage/migrations/sql/6.settings.js
index e562530..d1c4a01 100644
--- a/lib/services/storage/migrations/sql/6.settings.js
+++ b/lib/services/storage/migrations/sql/6.settings.js
@@ -3,6 +3,8 @@ import fs from 'fs';
 import path from 'path';
 import { nanoid } from 'nanoid';
 import logger from '../../../logger.js';
+import { DEFAULT_CONFIG } from '../../../../defaultConfig.js';
+import { getDirName } from '../../../../utils.js';
 
 export function up(db) {
   db.exec(`
@@ -67,6 +69,10 @@ export function up(db) {
       'analyticsEnabled',
       config.analyticsEnabled != null ? config.analyticsEnabled : defaults.analyticsEnabled,
     );
+
+    //now making sure only sqlite path remains in the config
+    const sqlitepath = config.sqlitepath || DEFAULT_CONFIG.sqlitepath;
+    fs.writeFileSync(`${getDirName()}/../conf/config.json`, JSON.stringify({ sqlitepath }));
   } catch (e) {
     logger.error(e);
   }
diff --git a/lib/services/storage/settingsStorage.js b/lib/services/storage/settingsStorage.js
index be081e7..1fba219 100644
--- a/lib/services/storage/settingsStorage.js
+++ b/lib/services/storage/settingsStorage.js
@@ -22,8 +22,8 @@ function compileSettings(rows, configValues) {
     config[r.name] = parsed && typeof parsed === 'object' && 'value' in parsed ? parsed.value : parsed;
   }
   return {
-    ...config,
     ...configValues,
+    ...config,
   };
 }
 
diff --git a/package.json b/package.json
index 35bd03b..05e5e78 100755
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "fredy",
-  "version": "15.0.1",
+  "version": "15.1.0",
   "description": "[F]ind [R]eal [E]states [d]amn eas[y].",
   "scripts": {
     "prepare": "husky",