From 7045f945c897eda8f20db17ac2fe1d964a23c281 Mon Sep 17 00:00:00 2001
From: Luis-Hebendanz <consulting@qube.email>
Date: Sun, 14 Jan 2024 15:57:30 +0100
Subject: [PATCH] Fixed bug in validate schema

---
 pkgs/clan-cli/clan_cli/webui/db_types.py      | 13 ++++++++++
 .../clan_cli/webui/routers/endpoints.py       |  3 ++-
 pkgs/clan-cli/clan_cli/webui/schemas.py       | 24 +++++++------------
 pkgs/clan-cli/clan_cli/webui/sql_models.py    |  2 +-
 4 files changed, 25 insertions(+), 17 deletions(-)
 create mode 100644 pkgs/clan-cli/clan_cli/webui/db_types.py

diff --git a/pkgs/clan-cli/clan_cli/webui/db_types.py b/pkgs/clan-cli/clan_cli/webui/db_types.py
new file mode 100644
index 0000000..1e3386c
--- /dev/null
+++ b/pkgs/clan-cli/clan_cli/webui/db_types.py
@@ -0,0 +1,13 @@
+from enum import Enum
+
+
+class Status(Enum):
+    ONLINE = "online"
+    OFFLINE = "offline"
+    UNKNOWN = "unknown"
+
+
+class Role(Enum):
+    PROSUMER = "service_prosumer"
+    AP = "AP"
+    DLG = "DLG"
diff --git a/pkgs/clan-cli/clan_cli/webui/routers/endpoints.py b/pkgs/clan-cli/clan_cli/webui/routers/endpoints.py
index 1b92978..2465b69 100644
--- a/pkgs/clan-cli/clan_cli/webui/routers/endpoints.py
+++ b/pkgs/clan-cli/clan_cli/webui/routers/endpoints.py
@@ -231,6 +231,8 @@ def get_rpc_by_role(db: Session, role: Role, path: str) -> Any:
         raise ClanError(f"No {role} found")
     if len(matching_entities) > 1:
         raise ClanError(f"More than one {role} found")
+    if len(matching_entities) == 0:
+        raise ClanError(f"No {role} found")
     dlg = matching_entities[0]
 
     url = f"http://{dlg.ip}/{path}"
@@ -305,7 +307,6 @@ def get_all_eventmessages(
 #                            #
 ##############################
 @router.get("/emulate", response_class=HTMLResponse)
-@router.get("/emu", response_class=HTMLResponse)
 def get_emulated_enpoints() -> HTMLResponse:
     from clan_cli.config import ap_url, c1_url, c2_url, dlg_url
 
diff --git a/pkgs/clan-cli/clan_cli/webui/schemas.py b/pkgs/clan-cli/clan_cli/webui/schemas.py
index 033d168..fbe0e73 100644
--- a/pkgs/clan-cli/clan_cli/webui/schemas.py
+++ b/pkgs/clan-cli/clan_cli/webui/schemas.py
@@ -1,25 +1,15 @@
 import logging
 from datetime import datetime
-from enum import Enum
 from typing import List
 
 from pydantic import BaseModel, Field, validator
 
+from . import sql_models
+from .db_types import Role, Status
+
 log = logging.getLogger(__name__)
 
 
-class Status(Enum):
-    ONLINE = "online"
-    OFFLINE = "offline"
-    UNKNOWN = "unknown"
-
-
-class Role(Enum):
-    PROSUMER = "service_prosumer"
-    AP = "AP"
-    DLG = "DLG"
-
-
 class Machine(BaseModel):
     name: str
     status: Status
@@ -72,8 +62,12 @@ class Entity(EntityBase):
 
     # define a custom getter function for roles
     @validator("roles", pre=True)
-    def get_roles(cls, v: List[EntityRoles | Role]) -> List[Role]:
-        if isinstance(v, list) and len(v) > 0 and isinstance(v[0], EntityRoles):
+    def get_roles(cls, v: List[sql_models.EntityRoles | Role]) -> List[Role]:
+        if (
+            isinstance(v, list)
+            and len(v) > 0
+            and isinstance(v[0], sql_models.EntityRoles)
+        ):
             return [x.role for x in v]  # type: ignore
         else:
             return v  # type: ignore
diff --git a/pkgs/clan-cli/clan_cli/webui/sql_models.py b/pkgs/clan-cli/clan_cli/webui/sql_models.py
index d83918d..b8d09ef 100644
--- a/pkgs/clan-cli/clan_cli/webui/sql_models.py
+++ b/pkgs/clan-cli/clan_cli/webui/sql_models.py
@@ -1,7 +1,7 @@
 from sqlalchemy import JSON, Boolean, Column, Enum, ForeignKey, Integer, String, Text
 from sqlalchemy.orm import relationship
 
-from .schemas import Role
+from .db_types import Role
 from .sql_db import Base
 
 # Relationsship example