fix: Move arguments out of body object (#2351)

redhat-cop · Jan 14, 2025 · 9e54859 · 9e54859
1 parent abe303d
commit 9e54859
Show file tree

Hide file tree

Showing 8 changed files with 38 additions and 22 deletions.
diff --git a/catalog/api/app.py b/catalog/api/app.py
@@ -478,13 +478,12 @@ async def bookmark_post(request):
 @routes.delete("/api/user-manager/bookmarks")
 async def bookmark_delete(request):
     user = await get_proxy_user(request)
-    data = await request.json()
-    data["email"] = user['metadata']['name']
+    asset_uuid = request.query.get("asset_uuid")
+    email = user['metadata']['name']
     return await api_proxy(
-        data=json.dumps(data),
         headers=request.headers,
         method="DELETE",
-        url=f"{ratings_api}/api/user-manager/v1/bookmarks",
+        url=f"{ratings_api}/api/user-manager/v1/bookmarks?asset_uuid={asset_uuid}&email={email}",
     )
 
 @routes.get("/api/ratings/catalogitem/{asset_uuid}/history")

diff --git a/catalog/helm/values.yaml b/catalog/helm/values.yaml
@@ -15,7 +15,7 @@ api:
     threads: 1
   image:
     #override:
-    tag: v1.0.8
+    tag: v1.0.9
     repository: quay.io/redhat-gpte/babylon-catalog-api
     pullPolicy: IfNotPresent
   imagePullSecrets: []

diff --git a/catalog/ui/src/app/Catalog/CatalogItemDetails.tsx b/catalog/ui/src/app/Catalog/CatalogItemDetails.tsx
@@ -228,15 +228,22 @@ const CatalogItemDetails: React.FC<{ catalogItem: CatalogItem; onClose: () => vo
       return null;
     }
     setIsLoadingFavorites(true);
-    const fav = await fetcher(apiPaths.FAVORITES({}), {
-      method: isFavorite ? 'DELETE' : 'POST',
-      body: JSON.stringify({
-        asset_uuid,
-      }),
-      headers: {
-        'Content-Type': 'application/json',
-      },
-    });
+    let fav = null;
+    if (isFavorite) {
+      fav = await fetcher(apiPaths.FAVORITES_DELETE({ asset_uuid }), {
+        method: 'DELETE',
+      });
+    } else {
+      fav = await fetcher(apiPaths.FAVORITES({}), {
+        method: 'POST',
+        body: JSON.stringify({
+          asset_uuid,
+        }),
+        headers: {
+          'Content-Type': 'application/json',
+        },
+      });
+    }
     mutateFavorites(fav);
     setIsLoadingFavorites(false);
     return null;

diff --git a/catalog/ui/src/app/api.ts b/catalog/ui/src/app/api.ts
@@ -1795,5 +1795,6 @@ export const apiPaths: { [key in ResourceType]: (args: any) => string } = {
   SFDC_BY_ACCOUNT: ({ sales_type, account_id }: { sales_type: string; account_id: string }) =>
     `/api/salesforce/accounts/${account_id}?sales_type=${sales_type}`,
   FAVORITES: () => `/api/user-manager/bookmarks`,
+  FAVORITES_DELETE: ({ asset_uuid }: { asset_uuid: string }) => `/api/user-manager/bookmarks?asset_uuid=${asset_uuid}`,
   EXTERNAL_ITEM_REQUEST: ({ asset_uuid }: { asset_uuid: string }) => `/api/external_item/${asset_uuid}/request`,
 };
diff --git a/catalog/ui/src/app/types.ts b/catalog/ui/src/app/types.ts
@@ -644,6 +644,7 @@ export type ResourceType =
   | 'SFDC_ACCOUNTS'
   | 'SFDC_BY_ACCOUNT'
   | 'FAVORITES'
+  | 'FAVORITES_DELETE'
   | 'EXTERNAL_ITEM_REQUEST';
 
 export type ServiceActionActions = 'start' | 'stop' | 'delete' | 'rate' | 'retirement';

diff --git a/helm/values.yaml b/helm/values.yaml
@@ -81,7 +81,7 @@ catalog:
       image:
         pullPolicy: IfNotPresent
         repository: quay.io/redhat-gpte/babylon-catalog-api
-        tag: v1.0.8
+        tag: v1.0.9
       loggingLevel: INFO
       replicaCount: 1
       resources:

diff --git a/ratings/api/routers/bookmarks.py b/ratings/api/routers/bookmarks.py
@@ -61,15 +61,23 @@ async def bookmarks_post(bookmark_obj: BookmarkRequestSchema) -> BookmarkListRes
              response_model=BookmarkListResponseSchema,
              summary="Delete bookmark",
              )
-async def bookmarks_delete(bookmark_obj: BookmarkRequestSchema) -> BookmarkListResponseSchema:
+async def bookmarks_delete() -> BookmarkListResponseSchema:
+    asset_uuid = request.query.get("asset_uuid")
+    email = request.query.get("email")
 
-    logger.info(f"Delete favorite item for user {bookmark_obj.email}")
+    # Validate query parameters
+    if not asset_uuid or not email:
+        return aiohttp.web.json_response(
+            {"error": "Missing required query parameters: asset_uuid and/or email"},
+            status=400,
+        )
+    logger.info(f"Delete favorite item for user {email}")
     try:
-        user = await User.get_by_email(bookmark_obj.email)
+        user = await User.get_by_email(email)
         if user:
-            bookmark = Bookmark.from_dict({"user_id": user.id, "asset_uuid": bookmark_obj.asset_uuid})
+            bookmark = Bookmark.from_dict({"user_id": user.id, "asset_uuid": asset_uuid})
             await bookmark.delete()
-            user = await User.get_by_email(bookmark_obj.email)
+            user = await User.get_by_email(email)
             bookmarks_response = [
                 BookmarkSchema.from_orm(bookmark).dict(exclude={"user_id"}) for bookmark in user.bookmarks
             ]

diff --git a/ratings/helm/Chart.yaml b/ratings/helm/Chart.yaml
@@ -2,5 +2,5 @@ apiVersion: v2
 name: babylon-ratings
 description: A Helm chart for the babylon ratings component.
 type: application
-version: 1.0.9
-appVersion: 1.0.9
+version: 1.0.10
+appVersion: 1.0.10