Mit berths klappt es jetzt und so wird's auch passieren

src/server/BreCal/__init__.py

@@ -3,9 +3,7 @@ from flask import Flask
 import os
 import logging
 import secrets
-
-import mysql.connector
-import pydapper
+from . import local_db
 
 from .api import shipcalls
 from .api import verify
@@ -14,9 +12,10 @@ from .api import times
 from .api import notifications
 from .api import berths
 
+sessions = dict()
 
 def create_app(test_config=None):
-    global connection_pool
+
     app = Flask(__name__, instance_relative_config=True)
     app.config.from_mapping(
         SECRET_KEY='dev'
@@ -41,29 +40,11 @@ def create_app(test_config=None):
     app.register_blueprint(berths.bp)
 
     logging.basicConfig(filename='brecal.log', level=logging.DEBUG, format='%(asctime)s | %(name)s | %(levelname)s | %(message)s')
+
+    local_db.initPool()
+
     logging.info('App started')
 
-    try:
-        connection_pool = mysql.connector.connect(
-            host="lager",
-            port=3306,
-            user="ds",
-            password="HalloWach23",
-            pool_name="brecal_pool",
-            pool_size=20,
-            database="bremen_calling"
-        )
-
-        commands = pydapper.using(connection_pool)
-        data = commands.query_single("SELECT id from `user`")
-        print(data)
-
-    except mysql.connector.PoolError as e:
-        logging.error(f"Failed to create connection pool: {e}")
-        print(e)
-
-    sessions = dict()
-
     return app
 
 def create_api_key():

src/server/BreCal/impl/berths.py

@@ -3,7 +3,7 @@ import logging
 import pydapper
 
 from ..schemas import model
-from ..schemas import __init__
+from .. import local_db
 
 def GetBerths(token):
     """
@@ -14,14 +14,20 @@ def GetBerths(token):
 
     try:
 
-        commands = pydapper.using(__init__.connection_pool)
-        data = commands.query("SELECT id, name1, name2 FROM berth ORDER BY name1", model=model.BerthList)
+        commands = pydapper.using(local_db.connection_pool)
+        data = commands.query("SELECT id, name1, name2 FROM berth ORDER BY name1", model=model.Berth)
 
     except Exception as ex:
         logging.error(ex)
+        print(ex)
         return json.dumps("call failed"), 500
 
-    return json.dumps(data), 200
+    print(data)
+
+
+
+    return json.dumps(data, default=model.obj_dict), 200
+
 
 
 

src/server/BreCal/local_db.py

@@ -0,0 +1,26 @@
+import mysql.connector
+import pydapper
+import logging
+
+connection_pool = None
+
+def initPool():
+    try:
+        global connection_pool
+        connection_pool = mysql.connector.connect(
+            host="lager",
+            port=3306,
+            user="ds",
+            password="HalloWach23",
+            pool_name="brecal_pool",
+            pool_size=20,
+            database="bremen_calling"
+        )
+
+        commands = pydapper.using(connection_pool)
+        data = commands.query_single("SELECT id from `user`")
+        print("DB connection successful")
+
+    except mysql.connector.PoolError as e:
+        logging.error(f"Failed to create connection pool: {e}")
+        print(e)

src/server/BreCal/schemas/model.py

@@ -1,12 +1,19 @@
 from marshmallow import Schema, fields
+from dataclasses import dataclass
+import json
 
+def obj_dict(obj):
+    return obj.__dict__
 
+@dataclass
 class Berth(Schema):
+    id: int
+    name1: str
+    name2: str
     id = fields.Int()
     name1 = fields.String()
     name2 = fields.String()
 
-
 class Error(Schema):
     message = fields.String(required=True,)
 
@@ -62,7 +69,7 @@ class Times(Schema):
 class TimesId(Schema):
     pass
 
-
+@dataclass
 class BerthList(Berth):
     pass