fix: quota set to 0 and quota limit bad calc (#39)

Author: msterhuj

.dockerignore

@@ -15,3 +15,4 @@ Makefile
 adminrc
 README.md
 .headscale
+.sass-cache/

fob_api/config.py

@@ -6,14 +6,13 @@ def parse_bool(value: str) -> bool:
     :param value: The value to parse
     :return: The boolean value or None if the value is not recognized
     """
-    if not value:
-        return None
     list_of_true = ["true", "yes", "1"]
     list_of_false = ["false", "no", "0"]
     if value.lower() in list_of_true:
         return True
     if value.lower() in list_of_false:
         return False
+    raise ValueError(f"Value {value} is not recognized as a boolean use one of {list_of_true + list_of_false}")
 
 class SingletonMeta(type):
 

fob_api/routes/openstack.py

@@ -242,7 +242,7 @@ def remove_user_from_project(
     # try to sync quotas with openstack without user quotas if it fails rollback quotas
     try:
         openstack_tasks.sync_project_quota(os_project)
-    except (nova_exceptions.ClientException, cinder_exceptions.ClientException) as e:
+    except (nova_exceptions.ClientException, cinder_exceptions.ClientException):
         # rollback quotas when quota sync fails (when quota is lower than current usage)
         for project_quota in project_quotas:
             session.refresh(project_quota)

fob_api/routes/quota.py

@@ -36,7 +36,7 @@ def calculate_user_quota(user: db_models.User) -> List[api_models.AdjustUserQuot
         user_max_quota_dict = {k: 0 for k in db_models.QuotaType}
         for q in session.exec(select(db_models.UserQuota).where(db_models.UserQuota.user_id == user.id)).all():
             user_max_quota_dict[db_models.QuotaType.from_str(q.type)] += q.quantity
-        
+
         return [api_models.AdjustUserQuota(
             username=user.username,
             type=k,
@@ -49,7 +49,7 @@ def calculate_project_quota(project: db_models.Project) -> List[api_models.Adjus
         project_max_quota_dict = {k: 0 for k in db_models.QuotaType}
         for q in session.exec(select(db_models.UserQuotaShare).where(db_models.UserQuotaShare.project_id == project.id)).all():
             project_max_quota_dict[db_models.QuotaType.from_str(q.type)] += q.quantity
-        
+
         return [api_models.AdjustProjectQuota(
             username="",
             project_name=project.name,
@@ -82,7 +82,7 @@ def get_user_left_quota_by_type(user: db_models.User, quota_type: db_models.Quot
         user_quota_own = 0
         for q in session.exec(select(db_models.UserQuota).where(db_models.UserQuota.user_id == user.id).where(db_models.UserQuota.type == quota_type)).all():
             user_quota_own += q.quantity
-        
+
         user_quota_used = 0
         for q in session.exec(select(db_models.UserQuotaShare).where(db_models.UserQuotaShare.user_id == user.id).where(db_models.UserQuotaShare.type == quota_type)).all():
             user_quota_used += q.quantity
@@ -188,11 +188,6 @@ def set_quota_to_project(
     if not project_membership and project_find.owner_id != user_find.id:
         raise HTTPException(status_code=400, detail="User not in project")
 
-    # check if user has enough quota to share
-    if get_user_left_quota_by_type(user_find, db_models.QuotaType.from_str(create_quota.type)) < create_quota.quantity:
-        raise HTTPException(status_code=400, detail="User do not have enough quota to share")
-    
-    # check if user has already shared quota
     quota = session.exec(
         select(db_models.UserQuotaShare)
         .where(
@@ -202,6 +197,14 @@ def set_quota_to_project(
         )
     ).first()
     previous_quantity = 0
+    if quota:
+        previous_quantity = quota.quantity
+
+    # check if user has enough quota to share
+    if get_user_left_quota_by_type(user_find, db_models.QuotaType.from_str(create_quota.type)) + previous_quantity < create_quota.quantity:
+        raise HTTPException(status_code=400, detail="User do not have enough quota to share")
+
+    # check if user has already shared quota
     if quota:
         previous_quantity = quota.quantity
         quota.quantity = create_quota.quantity
@@ -215,10 +218,12 @@ def set_quota_to_project(
             type=create_quota.type
         )
         session.add(quota)
+    if create_quota.quantity == 0:
+        session.delete(quota)
     session.commit()
     try:
         sync_project_quota(project_find)
-    except (nova_exceptions.ClientException, cinder_exceptions.ClientException) as e:
+    except (nova_exceptions.ClientException, cinder_exceptions.ClientException):
         session.refresh(quota)
         quota.quantity = previous_quantity
         session.commit()
@@ -254,7 +259,7 @@ def show_project_adjustements(
         raise HTTPException(status_code=400, detail="Project not found")
     if not user.is_admin and not session.exec(select(db_models.ProjectUserMembership).where(db_models.ProjectUserMembership.project_id == project_find.id, db_models.ProjectUserMembership.user_id == user.id)).first() and project_find.owner_id != user.id:
         raise HTTPException(status_code=403, detail="Not allowed to see Adjustements for this project")
-    
+
     shared_quotas = []
     for q in session.exec(select(db_models.UserQuotaShare).where(db_models.UserQuotaShare.project_id == project_find.id)).all():
         user = session.exec(select(db_models.User).where(db_models.User.id == q.user_id)).first()

fob_api/serializer.py

@@ -2,22 +2,21 @@
 from pydantic import BaseModel
 from fob_api.models import api as api_models
 
-class PydanticSerializer(JSONEncoder):   
+class PydanticSerializer(JSONEncoder):
     def default(self, obj):
         if isinstance(obj, BaseModel):
             return obj.model_dump() | {'__type__': type(obj).__name__}
         else:
             return JSONEncoder.default(self, obj)
 
 def pydantic_decoder(obj):
-    if '__type__' in obj:
-        if obj['__type__'] in dir(api_models):
-            cls = getattr(api_models, obj['__type__'])
-            return cls.parse_obj(obj)
+    if '__type__' in obj and obj['__type__'] in dir(api_models):
+        cls = getattr(api_models, obj['__type__'])
+        return cls.parse_obj(obj)
     return obj
 
 
-# Encoder function      
+# Encoder function
 def pydantic_dumps(obj):
     return dumps(obj, cls=PydanticSerializer)