From 01343472df9d6bfa15a25818f14af819e382c046 Mon Sep 17 00:00:00 2001
From: Daniel Dolezal <d.dolezal97@protonmail.com>
Date: Mon, 6 Apr 2026 16:24:28 +0200
Subject: [PATCH] move all Databases into the database folder to not have
 storeage and Database when they are all Databases

---
 server/Server.py                             | 8 ++++----
 server/blueprints/battlesnake.py             | 2 +-
 server/{storage => database}/EdgeDB.py       | 0
 server/{storage => database}/LocalStorage.py | 0
 server/database/__init__.py                  | 9 +++++++++
 server/storage/__init__.py                   | 9 ---------
 6 files changed, 14 insertions(+), 14 deletions(-)
 rename server/{storage => database}/EdgeDB.py (100%)
 rename server/{storage => database}/LocalStorage.py (100%)
 delete mode 100644 server/storage/__init__.py

diff --git a/server/Server.py b/server/Server.py
index dda9f79..308d4ff 100644
--- a/server/Server.py
+++ b/server/Server.py
@@ -3,12 +3,12 @@ from quart_common.web.env import env_bool, env_int
 from server.Files import read_file
 
 from server.game_state_store import GameStateStoreBuilder
-
 from snakes import SnakeBuilder
 
-from server.storage import StorageLoader
-from server.database import GameplayDatabase
-
+from server.database import (
+  GameplayDatabase,
+  StorageLoader,
+)
 from server.metrics import (
   MetricsStoreBuilder,
   MetricsCollector,
diff --git a/server/blueprints/battlesnake.py b/server/blueprints/battlesnake.py
index b39d579..a63dac4 100644
--- a/server/blueprints/battlesnake.py
+++ b/server/blueprints/battlesnake.py
@@ -4,7 +4,7 @@ import json, time, os
 from quart import Blueprint, request, jsonify
 
 from quart_common.web.logger import await_log
-from server.storage import StorageLoader
+from server.database import StorageLoader
 from server.GameBoard import GameBoard
 
 if TYPE_CHECKING:
diff --git a/server/storage/EdgeDB.py b/server/database/EdgeDB.py
similarity index 100%
rename from server/storage/EdgeDB.py
rename to server/database/EdgeDB.py
diff --git a/server/storage/LocalStorage.py b/server/database/LocalStorage.py
similarity index 100%
rename from server/storage/LocalStorage.py
rename to server/database/LocalStorage.py
diff --git a/server/database/__init__.py b/server/database/__init__.py
index 9dd9a60..194c019 100644
--- a/server/database/__init__.py
+++ b/server/database/__init__.py
@@ -1 +1,10 @@
 from .GameplayDatabase import GameplayDatabase
+from .LocalStorage import LocalStorage
+from .EdgeDB import EdgeDB
+
+class StorageLoader:
+  @classmethod
+  def build(self, selected_storage:str) -> LocalStorage|EdgeDB:
+    storage_module = __import__(f"server.storage.{selected_storage}", fromlist=[selected_storage])
+    storage_class = getattr(storage_module, selected_storage)
+    return storage_class
diff --git a/server/storage/__init__.py b/server/storage/__init__.py
deleted file mode 100644
index fc6ce3d..0000000
--- a/server/storage/__init__.py
+++ /dev/null
@@ -1,9 +0,0 @@
-from .LocalStorage import LocalStorage
-from .EdgeDB import EdgeDB
-
-class StorageLoader:
-  @classmethod
-  def build(self, selected_storage:str) -> LocalStorage|EdgeDB:
-    storage_module = __import__(f"server.storage.{selected_storage}", fromlist=[selected_storage])
-    storage_class = getattr(storage_module, selected_storage)
-    return storage_class