Added usage field to service

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

@@ -18,6 +18,7 @@ from ..schemas import (
     Role,
     Service,
     ServiceCreate,
+    ServiceUsageCreate,
 )
 from ..tags import Tags
 
@@ -35,8 +36,16 @@ log = logging.getLogger(__name__)
 def create_service(
     service: ServiceCreate, db: Session = Depends(sql_db.get_db)
 ) -> Service:
-    # todo checken ob schon da ...
-    return sql_crud.create_service(db=db, service=service)
+    services = sql_crud.create_service(db=db, service=service)
+    return services
+
+
+@router.post("/api/v1/service_usage", response_model=Service, tags=[Tags.services])
+def add_service_usage(
+    usage: ServiceUsageCreate, service_uuid: str, db: Session = Depends(sql_db.get_db)
+) -> Service:
+    service = sql_crud.add_service_usage(db, service_uuid, usage)
+    return service
 
 
 @router.get("/api/v1/services", response_model=List[Service], tags=[Tags.services])
@@ -141,9 +150,6 @@ def detach_entity(
     limit: int = 100,
     db: Session = Depends(sql_db.get_db),
 ) -> dict[str, str]:
-    entity = sql_crud.get_entity_by_did(db, did=entity_did)
-    if entity is None:
-        raise ClanError(f"Entity with did '{entity_did}' not found")
     sql_crud.set_stop_health_task(db, entity_did, True)
     return {"message": f"Detached {entity_did} successfully"}
 

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

@@ -78,6 +78,19 @@ class Entity(EntityBase):
 #        Service        #
 #                       #
 #########################
+class ServiceUsageBase(BaseModel):
+    times_consumed: int = Field(..., example=2)
+
+
+class ServiceUsageCreate(ServiceUsageBase):
+    consumer_entity_did: str = Field(..., example="did:sov:test:120")
+
+
+class ServiceUsage(ServiceUsageCreate):
+    class Config:
+        orm_mode = True
+
+
 class ServiceBase(BaseModel):
     uuid: str = Field(..., example="8e285c0c-4e40-430a-a477-26b3b81e30df")
     service_name: str = Field(..., example="Carlos Printing")
@@ -91,10 +104,12 @@ class ServiceBase(BaseModel):
 
 class ServiceCreate(ServiceBase):
     entity_did: str = Field(..., example="did:sov:test:120")
+    usage: List[ServiceUsageCreate]
 
 
-class Service(ServiceCreate):
+class Service(ServiceBase):
     entity: Entity
+    usage: List[ServiceUsage]
 
     class Config:
         orm_mode = True

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

@@ -7,21 +7,101 @@ from sqlalchemy.sql.expression import true
 from ..errors import ClanError
 from . import schemas, sql_models
 
+
 #########################
 #                       #
 #       service         #
 #                       #
 #########################
-
-
 def create_service(db: Session, service: schemas.ServiceCreate) -> sql_models.Service:
-    db_service = sql_models.Service(**service.dict())
+    if get_entity_by_did(db, service.entity_did) is None:
+        raise ClanError(f"Entity with did '{service.entity_did}' not found")
+    if get_service_by_uuid(db, service.uuid) is not None:
+        raise ClanError(f"Service with uuid '{service.uuid}' already exists")
+    db_service = sql_models.Service(
+        uuid=service.uuid,
+        service_name=service.service_name,
+        service_type=service.service_type,
+        endpoint_url=service.endpoint_url,
+        status=service.status,
+        other=service.other,
+        entity_did=service.entity_did,
+    )
+    db_usage = []
+    for usage in service.usage:
+        db_usage.append(
+            sql_models.ServiceUsage(
+                times_consumed=usage.times_consumed,
+                consumer_entity_did=usage.consumer_entity_did,
+            )
+        )
+    db_service.usage = db_usage
     db.add(db_service)
     db.commit()
     db.refresh(db_service)
     return db_service
 
 
+def set_service_usage(
+    db: Session, service_uuid: str, usages: List[schemas.ServiceUsageCreate]
+) -> sql_models.Service:
+    db_service = get_service_by_uuid(db, service_uuid)
+    if db_service is None:
+        raise ClanError(f"Service with uuid '{service_uuid}' not found")
+    db_usage = []
+    for usage in usages:
+        db_usage.append(
+            sql_models.ServiceUsage(
+                times_consumed=usage.times_consumed,
+                consumer_entity_did=usage.consumer_entity_did,
+            )
+        )
+    db_service.usage = db_usage
+    db.add(db_service)
+    db.commit()
+    db.refresh(db_service)
+    return db_service
+
+
+def add_service_usage(
+    db: Session, service_uuid: str, usage: schemas.ServiceUsageCreate
+) -> sql_models.Service:
+    db_service = get_service_by_uuid(db, service_uuid)
+    if db_service is None:
+        raise ClanError(f"Service with uuid '{service_uuid}' not found")
+    db_service.usage.append(
+        sql_models.ServiceUsage(
+            times_consumed=usage.times_consumed,
+            consumer_entity_did=usage.consumer_entity_did,
+        )
+    )
+    db.add(db_service)
+    db.commit()
+    db.refresh(db_service)
+    return db_service
+
+
+def increment_service_usage(
+    db: Session, service_uuid: str, consumer_entity_did: str
+) -> sql_models.ServiceUsage:
+    db_service = get_service_by_uuid(db, service_uuid)
+    if db_service is None:
+        raise ClanError(f"Service with uuid '{service_uuid}' not found")
+    # TODO: Make a query for this
+    for usage in db_service.usage:
+        if usage.consumer_entity_did == consumer_entity_did:
+            usage.times_consumed += 1
+            break
+    db.add(db_service)
+    db.commit()
+    db.refresh(db_service)
+    return db_service
+
+
+def get_service_by_uuid(db: Session, uuid: str) -> Optional[sql_models.Service]:
+    return db.query(sql_models.Service).filter(sql_models.Service.uuid == uuid).first()
+
+
 def get_services(
     db: Session, skip: int = 0, limit: int = 100
 ) -> List[sql_models.Service]:
@@ -65,6 +145,10 @@ def get_services_without_entity_id(
 #                       #
 #########################
 def create_entity(db: Session, entity: schemas.EntityCreate) -> sql_models.Entity:
+    if get_entity_by_did(db, entity.did) is not None:
+        raise ClanError(f"Entity with did '{entity.did}' already exists")
+    if get_entity_by_name_or_did(db, entity.name) is not None:
+        raise ClanError(f"Entity with name '{entity.name}' already exists")
     db_entity = sql_models.Entity(
         did=entity.did,
         name=entity.name,
@@ -142,7 +226,9 @@ def get_attached_entities(
 
 
 # Returns same entity if setting didnt changed something
-def set_stop_health_task(db: Session, entity_did: str, value: bool) -> None:
+def set_stop_health_task(
+    db: Session, entity_did: str, value: bool
+) -> sql_models.Entity:
     db_entity = get_entity_by_did(db, entity_did)
     if db_entity is None:
         raise ClanError(f"Entity with did '{entity_did}' not found")
@@ -152,9 +238,13 @@ def set_stop_health_task(db: Session, entity_did: str, value: bool) -> None:
     # save changes in db
     db.add(db_entity)
     db.commit()
+    db.refresh(db_entity)
+    return db_entity
 
 
-def set_attached_by_entity_did(db: Session, entity_did: str, attached: bool) -> None:
+def set_attached_by_entity_did(
+    db: Session, entity_did: str, attached: bool
+) -> sql_models.Entity:
     db_entity = get_entity_by_did(db, entity_did)
     if db_entity is None:
         raise ClanError(f"Entity with did '{entity_did}' not found")
@@ -164,6 +254,8 @@ def set_attached_by_entity_did(db: Session, entity_did: str, attached: bool) ->
     # save changes in db
     db.add(db_entity)
     db.commit()
+    db.refresh(db_entity)
+    return db_entity
 
 
 def delete_entity_by_did(db: Session, did: str) -> None:

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

@@ -27,6 +27,7 @@ class Entity(Base):
     ## Relations ##
     services = relationship("Service", back_populates="entity")
     roles = relationship("EntityRoles", back_populates="entity")
+    consumes = relationship("ServiceUsage", back_populates="consumer_entity")
 
 
 class EntityRoles(Base):
@@ -41,6 +42,19 @@ class EntityRoles(Base):
     entity = relationship("Entity", back_populates="roles")
 
 
+class ServiceUsage(Base):
+    __tablename__ = "service_usage"
+
+    ## Queryable body ##
+    id = Column(Integer, primary_key=True, autoincrement=True)
+    consumer_entity_did = Column(String, ForeignKey("entities.did"))
+    consumer_entity = relationship("Entity", back_populates="consumes")
+    times_consumed = Column(Integer, index=True, nullable=False)
+
+    service_uuid = Column(String, ForeignKey("services.uuid"))
+    service = relationship("Service", back_populates="usage")
+
+
 class ServiceAbstract(Base):
     __abstract__ = True
 
@@ -64,6 +78,8 @@ class Service(ServiceAbstract):
     entity = relationship("Entity", back_populates="services")
     entity_did = Column(String, ForeignKey("entities.did"))
 
+    usage = relationship("ServiceUsage", back_populates="service")
+
 
 class Eventmessage(Base):
     __tablename__ = "eventmessages"