From cc0c5233eb2014728b4fa922467c294a1cbc51b1 Mon Sep 17 00:00:00 2001
From: Syco21 <davhv12@gmail.com>
Date: Fri, 15 May 2026 21:34:40 +0200
Subject: [PATCH] Structural cleanup

- Delete empty placeholder files: utils/dbHelpers.js, utils/logger.js, scripts/seedSets.js
- Merge newVersionController into importController (importFullDatabase belongs with import logic)
- Delete newVersionController.js
- Update importRoutes.js to import from importController
---
 scripts/seedSets.js                     |  0
 src/controllers/importController.js     | 36 ++++++++++++++++++---
 src/controllers/newVersionController.js | 42 -------------------------
 src/routes/importRoutes.js              |  3 +-
 src/utils/dbHelpers.js                  |  0
 src/utils/logger.js                     |  0
 6 files changed, 33 insertions(+), 48 deletions(-)
 delete mode 100644 scripts/seedSets.js
 delete mode 100644 src/controllers/newVersionController.js
 delete mode 100644 src/utils/dbHelpers.js
 delete mode 100644 src/utils/logger.js

diff --git a/scripts/seedSets.js b/scripts/seedSets.js
deleted file mode 100644
index e69de29..0000000
diff --git a/src/controllers/importController.js b/src/controllers/importController.js
index de2b718..63f1c72 100644
--- a/src/controllers/importController.js
+++ b/src/controllers/importController.js
@@ -1,9 +1,10 @@
-const {upsertCard} = require('../models/cardModel');
-const {upsertRarity,getRarityId} = require('../models/rarityModel');
+const { upsertCard } = require('../models/cardModel');
+const { upsertRarity } = require('../models/rarityModel');
 const { upsertSet } = require('../models/setModel');
 const { insertCardSetRarity } = require('../models/cardSetRarityModel');
 const { insertCardImage } = require('../models/cardImageModel');
-const { fetchAllCards, fetchAllSets } = require('../services/ygoproService');
+const { getLocalDBVersion, setLocalDBVersion } = require('../models/dbVersionModel');
+const { fetchAllCards, fetchAllSets, fetchDatabaseVersion } = require('../services/ygoproService');
 const db = require('../config/db');
 
 const BATCH_SIZE = 50;
@@ -161,4 +162,31 @@ async function importCards(req, res) {
 }
 
 
-module.exports = { importCards, importCardsInternal, importSets, importSetsInternal };
\ No newline at end of file
+async function importFullDatabase(req, res) {
+  const startTime = Date.now();
+  try {
+    const remoteVersion = await fetchDatabaseVersion();
+    const localVersion = await getLocalDBVersion();
+
+    if (localVersion && localVersion.database_version === remoteVersion.database_version) {
+      return res.json({ message: 'Database is already up to date.', version: remoteVersion.database_version });
+    }
+
+    const setsStats = await importSetsInternal();
+    const cardsStats = await importCardsInternal();
+    await setLocalDBVersion(remoteVersion.database_version, remoteVersion.last_update);
+
+    res.json({
+      message: 'Database import completed successfully.',
+      version: remoteVersion.database_version,
+      sets: setsStats,
+      cards: cardsStats,
+      duration_seconds: parseFloat(((Date.now() - startTime) / 1000).toFixed(2)),
+    });
+  } catch (err) {
+    console.error('Error in full database import:', err);
+    res.status(500).json({ error: 'Failed to import database' });
+  }
+}
+
+module.exports = { importCards, importCardsInternal, importSets, importSetsInternal, importFullDatabase };
\ No newline at end of file
diff --git a/src/controllers/newVersionController.js b/src/controllers/newVersionController.js
deleted file mode 100644
index 87a8c0d..0000000
--- a/src/controllers/newVersionController.js
+++ /dev/null
@@ -1,42 +0,0 @@
-const { fetchDatabaseVersion } = require('../services/ygoproService');
-const { getLocalDBVersion, setLocalDBVersion } = require('../models/dbVersionModel');
-const { importSetsInternal } = require('./importController');
-const { importCardsInternal } = require('./importController');
-
-async function importFullDatabase(req, res) {
-  const startTime = Date.now();
-
-  try {
-    const remoteVersion = await fetchDatabaseVersion();
-    const localVersion = await getLocalDBVersion();
-
-    if (localVersion && localVersion.database_version === remoteVersion.database_version) {
-      return res.json({
-        message: 'Database is already up to date.',
-        version: remoteVersion.database_version
-      });
-    }
-
-    const setsStats = await importSetsInternal();
-
-    const cardsStats = await importCardsInternal();
-
-    await setLocalDBVersion(remoteVersion.database_version, remoteVersion.last_update);
-
-    const totalDuration = ((Date.now() - startTime) / 1000).toFixed(2);
-
-    res.json({
-      message: 'Database import completed successfully.',
-      version: remoteVersion.database_version,
-      sets: setsStats,
-      cards: cardsStats,
-      duration_seconds: parseFloat(totalDuration)
-    });
-
-  } catch (err) {
-    console.error('Error in full database import:', err);
-    res.status(500).json({ error: 'Failed to import database' });
-  }
-}
-
-module.exports = { importFullDatabase };
\ No newline at end of file
diff --git a/src/routes/importRoutes.js b/src/routes/importRoutes.js
index 602d341..75f24f1 100644
--- a/src/routes/importRoutes.js
+++ b/src/routes/importRoutes.js
@@ -1,7 +1,6 @@
 const express = require('express');
 const router = express.Router();
-const { importSets, importCards} = require('../controllers/importController');
-const { importFullDatabase } = require('../controllers/newVersionController');
+const { importSets, importCards, importFullDatabase } = require('../controllers/importController');
 
 router.post('/sets', importSets);
 router.post('/cards', importCards);
diff --git a/src/utils/dbHelpers.js b/src/utils/dbHelpers.js
deleted file mode 100644
index e69de29..0000000
diff --git a/src/utils/logger.js b/src/utils/logger.js
deleted file mode 100644
index e69de29..0000000