Refactored api calls to REST. Clients endpoint is now services without self. repository view is the same as get all services.

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

@@ -8,7 +8,7 @@ from . import schemas, sql_models
 
 #########################
 #                       #
-#       service        #
+#       service         #
 #                       #
 #########################
 
@@ -46,101 +46,25 @@ def delete_service_by_entity_did(db: Session, entity_did: str) -> None:
     db.commit()
 
 
-#########################
-#                       #
-#       client        #
-#                       #
-#########################
-
-
-def create_client(db: Session, client: schemas.ClientCreate) -> sql_models.Client:
-    db_client = sql_models.Client(**client.dict())
-    db.add(db_client)
-    db.commit()
-    db.refresh(db_client)
-    return db_client
-
-
-def get_clients(
-    db: Session, skip: int = 0, limit: int = 100
-) -> List[sql_models.Client]:
-    return db.query(sql_models.Client).offset(skip).limit(limit).all()
-
-
-def get_client_by_entity_did(
+def get_services_without_entity_id(
     db: Session, entity_did: str, skip: int = 0, limit: int = 100
-) -> List[sql_models.Client]:
+) -> List[sql_models.Service]:
     return (
-        db.query(sql_models.Client)
-        .filter(sql_models.Client.entity_did == entity_did)
+        db.query(sql_models.Service)
+        .filter(sql_models.Service.entity_did != entity_did)
         .offset(skip)
         .limit(limit)
         .all()
     )
 
 
-def delete_client_by_entity_did(db: Session, entity_did: str) -> None:
-    db.query(sql_models.Client).filter(
-        sql_models.Client.entity_did == entity_did
-    ).delete()
-    db.commit()
-
-
-#########################
-#                       #
-#       REPOSITORY      #
-#                       #
-#########################
-def create_repository(
-    db: Session, repository: schemas.RepositoryCreate
-) -> sql_models.Repository:
-    db_repository = sql_models.Repository(**repository.dict())
-    db.add(db_repository)
-    db.commit()
-    db.refresh(db_repository)
-    return db_repository
-
-
-def get_repositories(
-    db: Session, skip: int = 0, limit: int = 100
-) -> List[sql_models.Repository]:
-    return db.query(sql_models.Repository).offset(skip).limit(limit).all()
-
-
-def get_repository_by_uuid(db: Session, uuid: str) -> Optional[sql_models.Repository]:
-    return (
-        db.query(sql_models.Repository)
-        .filter(sql_models.Repository.uuid == uuid)
-        .first()
-    )
-
-
-def get_repository_by_entity_did(
-    db: Session, did: str, skip: int = 0, limit: int = 100
-) -> List[sql_models.Repository]:
-    return (
-        db.query(sql_models.Repository)
-        .filter(sql_models.Repository.entity_did == did)
-        .offset(skip)
-        .limit(limit)
-        .all()
-    )
-
-
-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         #
 #                       #
 #########################
 def create_entity(db: Session, entity: schemas.EntityCreate) -> sql_models.Entity:
-    db_entity = sql_models.Entity(**entity.dict())
+    db_entity = sql_models.Entity(**entity.dict(), attached=False)
     db.add(db_entity)
     db.commit()
     db.refresh(db_entity)
@@ -195,46 +119,4 @@ def delete_entity_by_did(db: Session, did: str) -> None:
 
 def delete_entity_by_did_recursive(db: Session, did: str) -> None:
     delete_service_by_entity_did(db, did)
-    delete_client_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()