Get entity by did or name

pkgs/clan-cli/clan_cli/webui/routers/endpoints.py

@@ -94,18 +94,6 @@ def create_entity(
     return sql_crud.create_entity(db, entity)
 
 
-@router.get(
-    "/api/v1/entity_by_name_or_did",
-    response_model=Optional[Entity],
-    tags=[Tags.entities],
-)
-def get_entity_by_name_or_did(
-    entity_name_or_did: str = "C1", db: Session = Depends(sql_db.get_db)
-) -> Optional[sql_models.Entity]:
-    entity = sql_crud.get_entity_by_name_or_did(db, name=entity_name_or_did)
-    return entity
-
-
 @router.get(
     "/api/v1/entity_by_roles", response_model=List[Entity], tags=[Tags.entities]
 )
@@ -129,7 +117,7 @@ def get_entity_by_did(
     entity_did: str = "did:sov:test:120",
     db: Session = Depends(sql_db.get_db),
 ) -> Optional[sql_models.Entity]:
-    entity = sql_crud.get_entity_by_did(db, did=entity_did)
+    entity = sql_crud.get_entity_by_name_or_did(db, name=entity_did)
     return entity
 
 

pkgs/clan-cli/clan_cli/webui/schemas.py

@@ -72,8 +72,11 @@ class Entity(EntityBase):
 
     # define a custom getter function for roles
     @validator("roles", pre=True)
-    def get_roles(cls, v: List[EntityRoles]) -> List[Role]:
-        return [x.role for x in v]
+    def get_roles(cls, v: List[EntityRoles | Role]) -> List[Role]:
+        if isinstance(v, list) and len(v) > 0 and isinstance(v[0], EntityRoles):
+            return [x.role for x in v]  # type: ignore
+        else:
+            return v  # type: ignore
 
 
 #########################