Vorbereitung Release 0.2.0

kontor-scripts/export.py

@@ -2,17 +2,13 @@
 import data from json file to MariaDB
 """
 from argparse import ArgumentParser, ArgumentDefaultsHelpFormatter
-
-import yaml
+import json
+import os
 from sqlalchemy import create_engine
 from sqlalchemy.orm import sessionmaker
-from platformdirs import PlatformDirs
-from pathlib import Path
-
-from schema.base import Base 
-from schema.database import KontorDB
+from db.models import registry
+from db.models.base import Base
 from config import get_logger
-from schema.database import ExportType
 
 parser = ArgumentParser(formatter_class=ArgumentDefaultsHelpFormatter)
 parser.add_argument('--verbose', '-v', action='count', default=0)
@@ -20,24 +16,40 @@ parser.add_argument('--config', '-c', default='kontor-docker')
 parser.add_argument('--file', '-f', default='data.json')
 args = parser.parse_args()
 
+DB_USER: str = os.getenv("DB_USER", "kontor")
+DB_PASSWORD: str = os.getenv("DB_PASSWORD", "kontor")
+DB_SERVER: str = os.getenv("DB_SERVER", "127.0.0.1")
+DB_PORT: int = int(os.getenv("DB_PORT", 5432))
+DB_DBNAME: str = os.getenv("DB_DBNAME", "kontor")
+DATABASE_URL: str = f"postgresql://{DB_USER}:{DB_PASSWORD}@{DB_SERVER}:{DB_PORT}/{DB_DBNAME}"
 
 if __name__ == '__main__':
     logger = get_logger(args.verbose, args.config)
     logger.info('kontor.export started')
-    dirs = PlatformDirs(args.config)
-    database_config = Path(dirs.user_config_dir, 'database-config.yaml')
-    with open(database_config, 'rt') as f:
-        db_config = yaml.safe_load(f.read())
-    connect_string = ('mariadb+mariadbconnector://{}:{}@{}:{}/{}'.format(
-        db_config['mariadb']['user'],
-        db_config['mariadb']['password'],
-        db_config['mariadb']['host'],
-        db_config['mariadb']['port'],
-        db_config['mariadb']['database']
-    ))
-    engine = create_engine(connect_string)
+    engine = create_engine(DATABASE_URL)
     Base.metadata.create_all(bind=engine, checkfirst=True)
-    __session__ = sessionmaker(bind=engine)
-    kontor_db = KontorDB(engine, logger)
-    kontor_db.export_db(ExportType.JSON, args.file)
+    SessionLocal = sessionmaker(bind=engine)
+    with SessionLocal() as db:
+        data = {}
+        tables = registry.keys()
+        for table in tables:
+            # logger.info(f"Table {table.name} with {table.id}")
+            model = registry[table]
+            rows = db.query(model).all()
+            entries = []
+            for row in rows:
+                entry = row.export_dict()
+                entries.append(entry)
+            data[table] = entries
+            logger.info(f"{table}: {len(entries)} exported")
+        try:
+            json_dump = json.dumps(data, indent=4)
+            with open(args.file, "w") as dump_file:
+                dump_file.write(json_dump)
+        except TypeError as error:
+            logger.info(f"{error}")
+        logger.info(f"{len(data)} tables exported")
+    #kontor_db = KontorDB(engine, logger)
+    #kontor_db.export_db(ExportType.JSON, args.file)
     logger.info('kontor.export finished')
+