Added resolution endpoint. Added delete endpoints. Added tests for new endpoints

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

@@ -17,6 +17,8 @@ from ..schemas import (
     ProducerCreate,
     Repository,
     RepositoryCreate,
+    Resolution,
+    ResolutionCreate,
 )
 from ..tags import Tags
 
@@ -61,6 +63,15 @@ def get_producer(
     return producer
 
 
+@router.delete("/api/v1/delete_producer", tags=[Tags.producers])
+def delete_producer(
+    entity_did: str = "did:sov:test:1234",
+    db: Session = Depends(sql_db.get_db),
+) -> dict[str, str]:
+    sql_crud.delete_producer_by_entity_did(db, entity_did)
+    return {"message": "Producer deleted"}
+
+
 #########################
 #                       #
 #       Consumer        #
@@ -97,6 +108,15 @@ def get_consumer(
     return consumer
 
 
+@router.delete("/api/v1/delete_consumer", tags=[Tags.consumers])
+def delete_consumer(
+    entity_did: str = "did:sov:test:1234",
+    db: Session = Depends(sql_db.get_db),
+) -> dict[str, str]:
+    sql_crud.delete_consumer_by_entity_did(db, entity_did)
+    return {"message": "Consumer deleted"}
+
+
 #########################
 #                       #
 #       REPOSITORY      #
@@ -133,10 +153,19 @@ def get_repository(
     limit: int = 100,
     db: Session = Depends(sql_db.get_db),
 ) -> List[sql_models.Repository]:
-    repository = sql_crud.get_repository_by_did(db, did=entity_did)
+    repository = sql_crud.get_repository_by_entity_did(db, did=entity_did)
     return repository
 
 
+@router.delete("/api/v1/delete_repository", tags=[Tags.repositories])
+def delete_repository(
+    entity_did: str = "did:sov:test:1234",
+    db: Session = Depends(sql_db.get_db),
+) -> dict[str, str]:
+    sql_crud.delete_repository_by_entity_did(db, did=entity_did)
+    return {"message": "Repository deleted"}
+
+
 #########################
 #                       #
 #        Entity         #
@@ -185,7 +214,7 @@ async def detach(
     skip: int = 0,
     limit: int = 100,
     db: Session = Depends(sql_db.get_db),
-) -> dict[str, str]:
+) -> sql_models.Entity:
     entity = sql_crud.set_attached_by_entity_did(db, entity_did, False)
     return entity
 
@@ -223,3 +252,61 @@ def attach_entity(db: Session, entity_did: str) -> None:
         log.warning(f"Entity {entity_did} not reachable. Setting attached to false")
 
         db_entity = sql_crud.set_attached_by_entity_did(db, entity_did, False)
+
+
+@router.delete("/api/v1/delete_entity_recursive", tags=[Tags.entities])
+def delete_entity(
+    entity_did: str = "did:sov:test:1234",
+    db: Session = Depends(sql_db.get_db),
+) -> dict[str, str]:
+    sql_crud.delete_entity_by_did_recursive(db, did=entity_did)
+    return {"message": "Entity deleted and all relations to that entity"}
+
+
+#########################
+#                       #
+#      Resolution       #
+#                       #
+#########################
+@router.post(
+    "/api/v1/create_resolution", response_model=Resolution, tags=[Tags.resolutions]
+)
+def create_resolution(
+    resolution: ResolutionCreate,
+    db: Session = Depends(sql_db.get_db),
+) -> sql_models.Resolution:
+    return sql_crud.create_resolution(db, resolution)
+
+
+@router.get(
+    "/api/v1/get_resolutions", response_model=List[Resolution], tags=[Tags.resolutions]
+)
+def get_resolutions(
+    skip: int = 0, limit: int = 100, db: Session = Depends(sql_db.get_db)
+) -> List[sql_models.Resolution]:
+    resolutions = sql_crud.get_resolutions(db, skip=skip, limit=limit)
+    return resolutions
+
+
+@router.get(
+    "/api/v1/get_resolution", response_model=List[Resolution], tags=[Tags.resolutions]
+)
+def get_resolution(
+    requester_did: str = "did:sov:test:1122",
+    skip: int = 0,
+    limit: int = 100,
+    db: Session = Depends(sql_db.get_db),
+) -> List[sql_models.Resolution]:
+    resolution = sql_crud.get_resolution_by_requester_did(
+        db, requester_did=requester_did
+    )
+    return resolution
+
+
+@router.delete("/api/v1/delete_resolution", tags=[Tags.resolutions])
+def delete_resolution(
+    requester_did: str = "did:sov:test:1122",
+    db: Session = Depends(sql_db.get_db),
+) -> dict[str, str]:
+    sql_crud.delete_resolution_by_requester_did(db, requester_did=requester_did)
+    return {"message": "Resolution deleted"}

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

@@ -109,3 +109,29 @@ class Entity(EntityCreate):
 
     class Config:
         orm_mode = True
+
+
+#########################
+#                       #
+#      Resolution       #
+#                       #
+#########################
+
+
+class ResolutionBase(BaseModel):
+    requester_name: str = "C1"
+    requester_did: str = "did:sov:test:1122"
+    resolved_did: str = "did:sov:test:1234"
+    other: dict = {"test": "test"}
+
+
+class ResolutionCreate(ResolutionBase):
+    pass
+
+
+class Resolution(ResolutionCreate):
+    timestamp: datetime
+    id: int
+
+    class Config:
+        orm_mode = True

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

@@ -41,6 +41,13 @@ def get_producers_by_entity_did(
     )
 
 
+def delete_producer_by_entity_did(db: Session, entity_did: str) -> None:
+    db.query(sql_models.Producer).filter(
+        sql_models.Producer.entity_did == entity_did
+    ).delete()
+    db.commit()
+
+
 #########################
 #                       #
 #       Consumer        #
@@ -76,6 +83,13 @@ def get_consumers_by_entity_did(
     )
 
 
+def delete_consumer_by_entity_did(db: Session, entity_did: str) -> None:
+    db.query(sql_models.Consumer).filter(
+        sql_models.Consumer.entity_did == entity_did
+    ).delete()
+    db.commit()
+
+
 #########################
 #                       #
 #       REPOSITORY      #
@@ -105,7 +119,7 @@ def get_repository_by_uuid(db: Session, uuid: str) -> Optional[sql_models.Reposi
     )
 
 
-def get_repository_by_did(
+def get_repository_by_entity_did(
     db: Session, did: str, skip: int = 0, limit: int = 100
 ) -> List[sql_models.Repository]:
     return (
@@ -117,6 +131,13 @@ def get_repository_by_did(
     )
 
 
+def delete_repository_by_entity_did(db: Session, did: str) -> None:
+    db.query(sql_models.Repository).filter(
+        sql_models.Repository.entity_did == did
+    ).delete()
+    db.commit()
+
+
 #########################
 #                       #
 #        Entity         #
@@ -169,3 +190,55 @@ def set_attached_by_entity_did(
     db.commit()
     db.refresh(db_entity)
     return db_entity
+
+
+def delete_entity_by_did(db: Session, did: str) -> None:
+    db.query(sql_models.Entity).filter(sql_models.Entity.did == did).delete()
+    db.commit()
+
+
+def delete_entity_by_did_recursive(db: Session, did: str) -> None:
+    delete_producer_by_entity_did(db, did)
+    delete_consumer_by_entity_did(db, did)
+    delete_repository_by_entity_did(db, did)
+    delete_entity_by_did(db, did)
+
+
+#########################
+#                       #
+#      Resolution       #
+#                       #
+#########################
+def create_resolution(
+    db: Session, resolution: schemas.ResolutionCreate
+) -> sql_models.Resolution:
+    db_resolution = sql_models.Resolution(**resolution.dict())
+    db.add(db_resolution)
+    db.commit()
+    db.refresh(db_resolution)
+    return db_resolution
+
+
+def get_resolutions(
+    db: Session, skip: int = 0, limit: int = 100
+) -> List[sql_models.Resolution]:
+    return db.query(sql_models.Resolution).offset(skip).limit(limit).all()
+
+
+def get_resolution_by_requester_did(
+    db: Session, requester_did: str, skip: int = 0, limit: int = 100
+) -> List[sql_models.Resolution]:
+    return (
+        db.query(sql_models.Resolution)
+        .filter(sql_models.Resolution.requester_did == requester_did)
+        .offset(skip)
+        .limit(limit)
+        .all()
+    )
+
+
+def delete_resolution_by_requester_did(db: Session, requester_did: str) -> None:
+    db.query(sql_models.Resolution).filter(
+        sql_models.Resolution.requester_did == requester_did
+    ).delete()
+    db.commit()

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

@@ -107,4 +107,5 @@ class Resolution(Base):
     requester_name = Column(String, index=True)
     requester_did = Column(String, index=True)
     resolved_did = Column(String, index=True)
-    timestamp = Column(DateTime, index=True)
+    other = Column(JSON)
+    timestamp = Column(DateTime(timezone=True), server_default=func.now())

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

@@ -7,6 +7,7 @@ class Tags(Enum):
     consumers = "consumers"
     entities = "entities"
     repositories = "repositories"
+    resolutions = "resolution"
 
     def __str__(self) -> str:
         return self.value
@@ -29,4 +30,8 @@ tags_metadata: List[Dict[str, Any]] = [
         "name": str(Tags.repositories),
         "description": "Operations on a repository.",
     },
+    {
+        "name": str(Tags.resolutions),
+        "description": "Operations on a resolution.",
+    },
 ]

pkgs/clan-cli/tests/test_db_api.py

@@ -38,8 +38,11 @@ def make_test_post_and_get(
         headers={"Content-Type": "application/json"},
     )
     assert response.status_code == 200
+
     if paramter == "repository":
         assert_extra_info(["time_created"], request_body, response.json())
+    elif paramter == "resolution":
+        assert_extra_info(["timestamp", "id"], request_body, response.json())
     elif paramter == "consumer":
         assert_extra_info(["id"], request_body, response.json())
     elif paramter == "entity":
@@ -55,6 +58,8 @@ def make_test_post_and_get(
     assert response.status_code == 200
     if paramter == "repository":
         assert_extra_info(["time_created"], request_body, response.json()[0])
+    elif paramter == "resolution":
+        assert_extra_info(["timestamp", "id"], request_body, response.json()[0])
     elif paramter == "consumer":
         assert_extra_info(["id"], request_body, response.json()[0])
     elif paramter == "entity":
@@ -289,3 +294,44 @@ def test_entity2(api: TestClient) -> None:
     paramter = "entity"
     get_request = "entity_did=" + url.quote(default_entity_did2)
     make_test_post_and_get(api, request_body, paramter, get_request)
+
+
+#########################
+#                       #
+#      Resolution       #
+#                       #
+#########################
+def test_resolution(api: TestClient) -> None:
+    request_body = {
+        "requester_did": default_entity_did2,
+        "requester_name": "C2",
+        "resolved_did": default_entity_did,
+        "other": {"test": "test"},
+    }
+    paramter = "resolution"
+    get_request = "requester_did=" + url.quote(default_entity_did2)
+    make_test_post_and_get(api, request_body, paramter, get_request)
+
+
+def test_resolution2(api: TestClient) -> None:
+    request_body = {
+        "requester_did": default_entity_did3,
+        "requester_name": "C3",
+        "resolved_did": default_entity_did,
+        "other": {"test": "test"},
+    }
+    paramter = "resolution"
+    get_request = "requester_did=" + url.quote(default_entity_did3)
+    make_test_post_and_get(api, request_body, paramter, get_request)
+
+
+def test_resolution3(api: TestClient) -> None:
+    request_body = {
+        "requester_did": default_entity_did4,
+        "requester_name": "C4",
+        "resolved_did": default_entity_did,
+        "other": {"test": "test"},
+    }
+    paramter = "resolution"
+    get_request = "requester_did=" + url.quote(default_entity_did4)
+    make_test_post_and_get(api, request_body, paramter, get_request)