fix: Changed search endpoint

Author: Robin VAN DE MERGHEL

diracx-client/src/diracx/client/_generated/operations/_operations.py

@@ -693,7 +693,7 @@ def build_pilots_search_request(*, page: int = 1, per_page: int = 100, **kwargs:
     accept = _headers.pop("Accept", "application/json")
 
     # Construct URL
-    _url = "/api/pilots/management/search"
+    _url = "/api/pilots/search"
 
     # Construct parameters
     if page is not None:

diracx-routers/src/diracx/routers/pilots/management.py

@@ -3,7 +3,7 @@
 from http import HTTPStatus
 from typing import Annotated
 
-from fastapi import Body, Depends, HTTPException, Query, status
+from fastapi import Body, HTTPException, Query, status
 
 from diracx.core.exceptions import (
     PilotAlreadyAssociatedWithJobError,
@@ -28,7 +28,6 @@
 
 from ..dependencies import PilotAgentsDB
 from ..fastapi_classes import DiracxRouter
-from ..utils.users import AuthorizedUserInfo, verify_dirac_access_token
 from .access_policies import (
     ActionType,
     CheckPilotManagementPolicyCallable,

diracx-routers/src/diracx/routers/pilots/query.py

@@ -104,7 +104,7 @@
 }
 
 
-@router.post("/management/search", responses=EXAMPLE_RESPONSES)
+@router.post("/search", responses=EXAMPLE_RESPONSES)
 async def search(
     pilot_db: PilotAgentsDB,
     check_permissions: CheckPilotManagementPolicyCallable,

diracx-routers/tests/pilots/test_pilot_creation.py

@@ -172,7 +172,7 @@ async def test_create_pilot_and_modify_it(normal_test_client):
         "distinct": True,
     }
 
-    r = normal_test_client.post("/api/pilots/management/search", json=body)
+    r = normal_test_client.post("/api/pilots/search", json=body)
     assert r.status_code == 200, r.json()
     pilot1 = r.json()[0]
     pilot2 = r.json()[1]
@@ -279,7 +279,7 @@ async def test_associate_job_with_pilot_and_get_it(normal_test_client: TestClien
     )
 
     r = normal_test_client.post(
-        "/api/pilots/management/search",
+        "/api/pilots/search",
         json={"parameters": [], "search": [condition], "sorts": []},
     )
 
@@ -335,7 +335,7 @@ async def test_delete_pilots_by_age_and_stamp(normal_test_client):
 
     # -------------- Verify all 100 pilots exist --------------
     search_body = {"parameters": [], "search": [], "sort": [], "distinct": True}
-    r = normal_test_client.post("/api/pilots/management/search", json=search_body)
+    r = normal_test_client.post("/api/pilots/search", json=search_body)
     assert r.status_code == 200, r.json()
     assert len(r.json()) == 100
 
@@ -347,7 +347,7 @@ async def test_delete_pilots_by_age_and_stamp(normal_test_client):
     )
     assert r.status_code == 204
     # Expect 75 remaining
-    r = normal_test_client.post("/api/pilots/management/search", json=search_body)
+    r = normal_test_client.post("/api/pilots/search", json=search_body)
     assert len(r.json()) == 75
 
     # -------------- 2) Delete all old pilots (remaining 25 old) --------------
@@ -358,15 +358,15 @@ async def test_delete_pilots_by_age_and_stamp(normal_test_client):
     assert r.status_code == 204
 
     # Expect 50 remaining
-    r = normal_test_client.post("/api/pilots/management/search", json=search_body)
+    r = normal_test_client.post("/api/pilots/search", json=search_body)
     assert len(r.json()) == 50
 
     # -------------- 3) Delete one recent pilot by stamp --------------
     one_stamp = pilot_stamps[10]
     r = normal_test_client.delete("/api/pilots/", params={"pilot_stamps": [one_stamp]})
     assert r.status_code == 204
     # Expect 49 remaining
-    r = normal_test_client.post("/api/pilots/management/search", json=search_body)
+    r = normal_test_client.post("/api/pilots/search", json=search_body)
     assert len(r.json()) == 49
 
     # -------------- 4) Delete all remaining pilots --------------
@@ -375,7 +375,7 @@ async def test_delete_pilots_by_age_and_stamp(normal_test_client):
     r = normal_test_client.delete("/api/pilots/", params={"pilot_stamps": remaining})
     assert r.status_code == 204
     # Expect none remaining
-    r = normal_test_client.post("/api/pilots/management/search", json=search_body)
+    r = normal_test_client.post("/api/pilots/search", json=search_body)
     assert r.status_code == 200
     assert len(r.json()) == 0
 

diracx-routers/tests/pilots/test_query.py

@@ -96,9 +96,7 @@ async def _search(
 
         params = {"per_page": per_page, "page": page}
 
-        r = populated_pilot_client.post(
-            "/api/pilots/management/search", json=body, params=params
-        )
+        r = populated_pilot_client.post("/api/pilots/search", json=body, params=params)
 
         if r.status_code == 400:
             # If we have a status_code 400, that means that the query failed

extensions/gubbins/gubbins-client/src/gubbins/client/_generated/operations/_operations.py

@@ -742,7 +742,7 @@ def build_pilots_search_request(*, page: int = 1, per_page: int = 100, **kwargs:
     accept = _headers.pop("Accept", "application/json")
 
     # Construct URL
-    _url = "/api/pilots/management/search"
+    _url = "/api/pilots/search"
 
     # Construct parameters
     if page is not None: