howler-api 2.12.0.dev313__py3-none-any.whl → 2.12.0.dev316__py3-none-any.whl

howler/api/v1/view.py

@@ -108,13 +108,13 @@ def create_view(**kwargs):
 
 
 @generate_swagger_docs()
-@view_api.route("/<id>", methods=["DELETE"])
+@view_api.route("/<view_id>", methods=["DELETE"])
 @api_login(required_priv=["W"])
-def delete_view(id: str, user: User, **kwargs):
+def delete_view(view_id: str, user: User, **kwargs):
     """Delete a view
 
     Variables:
-    id => The id of the view to delete
+    view_id => The id of the view to delete
 
     Optional Arguments:
     None
@@ -129,7 +129,7 @@ def delete_view(id: str, user: User, **kwargs):
     """
     storage = datastore()
 
-    existing_view: View = storage.view.get_if_exists(id)
+    existing_view: View = storage.view.get_if_exists(view_id)
     if not existing_view:
         return not_found(err="This view does not exist")
 
@@ -139,7 +139,7 @@ def delete_view(id: str, user: User, **kwargs):
     if existing_view.type == "readonly":
         return forbidden(err="You cannot delete built-in views.")
 
-    success = storage.view.delete(id)
+    success = storage.view.delete(view_id)
 
     storage.view.commit()
 
@@ -147,13 +147,13 @@ def delete_view(id: str, user: User, **kwargs):
 
 
 @generate_swagger_docs()
-@view_api.route("/<id>", methods=["PUT"])
+@view_api.route("/<view_id>", methods=["PUT"])
 @api_login(required_priv=["R", "W"])
-def update_view(id: str, user: User, **kwargs):
+def update_view(view_id: str, user: User, **kwargs):
     """Update a view
 
     Variables:
-    id => The id of the view to modify
+    view_id => The view_id of the view to modify
 
     Optional Arguments:
     None
@@ -178,7 +178,7 @@ def update_view(id: str, user: User, **kwargs):
     if set(new_data.keys()) & {"view_id", "owner"}:
         return bad_request(err="You cannot change the owner or id of a view.")
 
-    existing_view: View = storage.view.get_if_exists(id)
+    existing_view: View = storage.view.get_if_exists(view_id)
     if not existing_view:
         return not_found(err="This view does not exist")
 
@@ -210,13 +210,13 @@ def update_view(id: str, user: User, **kwargs):
 
 
 @generate_swagger_docs()
-@view_api.route("/<id>/favourite", methods=["POST"])
+@view_api.route("/<view_id>/favourite", methods=["POST"])
 @api_login(required_priv=["R", "W"])
-def set_as_favourite(id: str, **kwargs):
+def set_as_favourite(view_id: str, **kwargs):
     """Add a view to a list of the user's favourites
 
     Variables:
-    id => The id of the view to add as a favourite
+    view_id => The id of the view to add as a favourite
 
     Optional Arguments:
     None
@@ -231,7 +231,7 @@ def set_as_favourite(id: str, **kwargs):
     """
     storage = datastore()
 
-    existing_view: View = storage.view.get_if_exists(id)
+    existing_view: View = storage.view.get_if_exists(view_id)
     if not existing_view:
         return not_found(err="This view does not exist")
 
@@ -243,7 +243,7 @@ def set_as_favourite(id: str, **kwargs):
     try:
         current_user = storage.user.get_if_exists(kwargs["user"]["uname"])
 
-        current_user["favourite_views"] = list(set(current_user.get("favourite_views", []) + [id]))
+        current_user["favourite_views"] = list(set(current_user.get("favourite_views", []) + [view_id]))
 
         storage.user.save(current_user["uname"], current_user)
 
@@ -253,9 +253,9 @@ def set_as_favourite(id: str, **kwargs):
 
 
 @generate_swagger_docs()
-@view_api.route("/<id>/favourite", methods=["DELETE"])
+@view_api.route("/<view_id>/favourite", methods=["DELETE"])
 @api_login(required_priv=["R", "W"])
-def remove_as_favourite(id, **kwargs):
+def remove_as_favourite(view_id: str, **kwargs):
     """Remove a view from a list of the user's favourites
 
     Variables:
@@ -271,13 +271,15 @@ def remove_as_favourite(id, **kwargs):
     """
     storage = datastore()
 
-    if not storage.view.exists(id):
-        return not_found(err="This view does not exist")
-
     try:
         current_user = storage.user.get_if_exists(kwargs["user"]["uname"])
 
-        current_user["favourite_views"] = list(filter(lambda f: f != id, current_user.get("favourite_views", [])))
+        current_favourites: list[str] = current_user.get("favourite_views", [])
+
+        if view_id not in current_favourites:
+            return not_found(err="View is not favourited.")
+
+        current_user["favourite_views"] = [favourite for favourite in current_favourites if favourite != view_id]
 
         storage.user.save(current_user["uname"], current_user)
 

{howler_api-2.12.0.dev313.dist-info → howler_api-2.12.0.dev316.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: howler-api
-Version: 2.12.0.dev313
+Version: 2.12.0.dev316
 Summary: Howler - API server
 License: MIT
 Keywords: howler,alerting,gc,canada,cse-cst,cse,cst,cyber,cccs

{howler_api-2.12.0.dev313.dist-info → howler_api-2.12.0.dev316.dist-info}/RECORD

@@ -30,7 +30,7 @@ howler/api/v1/tool.py,sha256=6CN5LIXgxaAvxEHE6s4IFtAEhQo_zBLtl6ghbM8whjE,6737
 howler/api/v1/user.py,sha256=YQh6eCAi4bsC_w9eGX0ZgnLoFL4z4efEc1knJsZhj4k,13842
 howler/api/v1/utils/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 howler/api/v1/utils/etag.py,sha256=IGB4WUkecHbBt0KKLQFCxCn0mN3T_aSPG0y45l_zT9I,3431
-howler/api/v1/view.py,sha256=an0OO8Vnmco5gGEzrNGX8pNWJ3sRgTQLGSwyLo3W6rU,8045
+howler/api/v1/view.py,sha256=VyizfGehsuoPyn7iswGPKCLcbSQoO1ipRsbr91nSDKk,8228
 howler/app.py,sha256=AJJ8TGMSi9hJGc7IR7xKsZuVwg-ih85-t0PRO0-ntHw,7063
 howler/common/README.md,sha256=lgnrAdgnOADmmfRplhbfYD7jU627nr3zO-fJ6N4Nbcs,6577
 howler/common/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -194,7 +194,7 @@ howler/utils/path.py,sha256=DfOU4i4zSs4wchHoE8iE7aWVLkTxiC_JRGepF2hBYBk,690
 howler/utils/socket_utils.py,sha256=nz1SklC9xBHUSfHyTJjpq3mbozX1GDf01WzdGxfaUII,2212
 howler/utils/str_utils.py,sha256=HE8Hqh2HlOLaj16w0H9zKOyDJLp-f1LQ50y_WeGZaEk,8389
 howler/utils/uid.py,sha256=p9dsqyvZ-lpiAuzZWCPCeEM99kdk0Ly9czf04HNdSuw,1341
-howler_api-2.12.0.dev313.dist-info/METADATA,sha256=idGxd04XB8llwrLDSUxL8QwD_gvjOW6AUyVxM7RA-98,2815
-howler_api-2.12.0.dev313.dist-info/WHEEL,sha256=zp0Cn7JsFoX2ATtOhtaFYIiE2rmFAD4OcMhtUki8W3U,88
-howler_api-2.12.0.dev313.dist-info/entry_points.txt,sha256=Lu9SBGvwe0wczJHmc-RudC24lmQk7tv3ZBXon9RIihg,259
-howler_api-2.12.0.dev313.dist-info/RECORD,,
+howler_api-2.12.0.dev316.dist-info/METADATA,sha256=QaWRVrzS2LNqHob-DDq7hIv3pxAbMBsbEuA77yba4lo,2815
+howler_api-2.12.0.dev316.dist-info/WHEEL,sha256=zp0Cn7JsFoX2ATtOhtaFYIiE2rmFAD4OcMhtUki8W3U,88
+howler_api-2.12.0.dev316.dist-info/entry_points.txt,sha256=Lu9SBGvwe0wczJHmc-RudC24lmQk7tv3ZBXon9RIihg,259
+howler_api-2.12.0.dev316.dist-info/RECORD,,