moved some more models out of individual classes

database/db_adapter.py

@@ -8,7 +8,7 @@ import sqlparse
 
 from models.DatabaseConfig import DatabaseConfig
 from models.DatabaseType import  DatabaseType
-from keepass.keepass import KeePass
+from keepass.Keepass import KeePass
 from models.ExportType import ExportType
 from models.Municipality import Municipality
 

keepass/Keepass.py

@@ -1,25 +1,10 @@
 import getpass
 import logging
-from dataclasses import dataclass
 
 from pykeepass import PyKeePass
 
 from models.KeePassConfig import KeePassConfig
-
+from models.KeePassEntry import KeePassEntry
-
-@dataclass
-class KeePassEntry:
-    def __init__(self, name: str, password: str):
-        self._name = name
-        self._password = password
-
-    @property
-    def password(self) -> str:
-        return self._password
-
-    @property
-    def name(self) -> str:
-        return self._name
 
 
 class KeePass:

main.py

@@ -1,6 +1,6 @@
 from config.Config import Config
 from database.db_adapter import DBAdapter
-from keepass.keepass import KeePass
+from keepass.Keepass import KeePass
 from logger.logger import init_logger
 from models.Municipality import Municipality
 

models/KeePassEntry.py

@@ -0,0 +1,16 @@
+from dataclasses import dataclass
+
+
+@dataclass
+class KeePassEntry:
+    def __init__(self, name: str, password: str):
+        self._name = name
+        self._password = password
+
+    @property
+    def password(self) -> str:
+        return self._password
+
+    @property
+    def name(self) -> str:
+        return self._name