Path signature '/api/config/datastore/{}' MUST be unique

Signed-off-by: Andrea Lamparelli <a.lamparelli95@gmail.com>

Author: lampajr

docs/site/content/en/openapi/openapi.yaml

@@ -30,6 +30,27 @@ tags:
   x-smallrye-profile-external: ""
 paths:
   /api/config/datastore:
+    get:
+      tags:
+      - Config
+      description: Obtain list of configured datastores for particular team
+      operationId: getDatastoresByTeam
+      parameters:
+      - name: team
+        in: query
+        description: name of the team to search for defined datastores
+        schema:
+          type: string
+        example: perf-team
+      responses:
+        "200":
+          description: OK
+          content:
+            application/json:
+              schema:
+                type: array
+                items:
+                  $ref: "#/components/schemas/Datastore"
     put:
       tags:
       - Config
@@ -117,29 +138,6 @@ paths:
             application/json:
               schema:
                 $ref: "#/components/schemas/DatastoreTestResponse"
-  /api/config/datastore/{team}:
-    get:
-      tags:
-      - Config
-      description: Obtain list of configured datastores for particular team
-      operationId: datastores
-      parameters:
-      - name: team
-        in: path
-        description: name of the team to search for defined datastores
-        required: true
-        schema:
-          type: string
-        example: perf-team
-      responses:
-        "200":
-          description: OK
-          content:
-            application/json:
-              schema:
-                type: array
-                items:
-                  $ref: "#/components/schemas/Datastore"
   /api/config/keycloak:
     get:
       tags:

horreum-api/src/main/java/io/hyperfoil/tools/horreum/api/services/ConfigService.java

@@ -43,12 +43,12 @@ public interface ConfigService {
     VersionInfo version();
 
     @GET
-    @Path("datastore/{team}")
+    @Path("datastore")
     @Operation(description = "Obtain list of configured datastores for particular team")
     @Parameters(value = {
             @Parameter(name = "team", description = "name of the team to search for defined datastores", example = "perf-team")
     })
-    List<Datastore> datastores(@PathParam("team") String team);
+    List<Datastore> getDatastoresByTeam(@QueryParam("team") String team);
 
     @GET
     @Path("datastore/types")

horreum-backend/src/main/java/io/hyperfoil/tools/horreum/svc/ConfigServiceImpl.java

@@ -67,15 +67,19 @@ public VersionInfo version() {
     @Override
     @PermitAll
     @Transactional
-    public List<Datastore> datastores(String team) {
+    public List<Datastore> getDatastoresByTeam(String team) {
+        if (team == null || team.isBlank()) {
+            throw ServiceException.badRequest("Team cannot be null or blank");
+        }
+
         String queryWhere = "where access = 0";
         Set<String> roles = identity.getRoles();
         long rolesCount = roles.stream().filter(role -> role.endsWith("-team")).count();
         if (rolesCount != 0) { //user has access to team, retrieve the team datastore as well
             queryWhere = queryWhere.concat(" or owner in ('" + team + "')");
         }
         List<DatastoreConfigDAO> backends = DatastoreConfigDAO.list(queryWhere);
-        if (backends.size() != 0) {
+        if (!backends.isEmpty()) {
             return backends.stream().map(DatasourceMapper::from).collect(Collectors.toList());
         } else {
             return Collections.emptyList();

horreum-backend/src/test/java/io/hyperfoil/tools/horreum/svc/DatasourceTest.java

@@ -216,13 +216,13 @@ DatastoreConfigDAO.<DatastoreConfigDAO> list("owner = ?1 and type = ?2", TESTER_
         DatastoreConfigDAO newDatastore = DatastoreConfigDAO.findById(testConfig.datastore.id);
         assertNotNull(newDatastore);
 
-        List<Object> datastores = unauthenticatedJsonRequest().get("/api/config/datastore/".concat(TESTER_ROLES[0]))
+        List<Object> datastores = unauthenticatedJsonRequest().get("/api/config/datastore?team=".concat(TESTER_ROLES[0]))
                 .then().statusCode(200).extract().body().as(List.class);
 
         assertNotNull(datastores);
         assertSame(1, datastores.size());
 
-        datastores = jsonRequest().get("/api/config/datastore/".concat(TESTER_ROLES[0]))
+        datastores = jsonRequest().get("/api/config/datastore?team=".concat(TESTER_ROLES[0]))
                 .then().statusCode(200).extract().body().as(List.class);
 
         assertNotNull(datastores);

horreum-web/src/domain/admin/Datastores.tsx

@@ -164,7 +164,7 @@ export default function Datastores() {
     };
 
     const fetchDataStores = (): Promise<void> => {
-        return apiCall(configApi.datastores(curTeam.key), alerting, "FETCH_DATASTORES", "Cannot fetch datastores")
+        return apiCall(configApi.getDatastoresByTeam(curTeam.key), alerting, "FETCH_DATASTORES", "Cannot fetch datastores")
             .then(setDatastores)
     }
 

horreum-web/src/domain/tests/TestSettings.tsx

@@ -64,7 +64,7 @@ export default function TestSettings({ test, onTestIdChange, onModified, funcsRe
     const [access, setAccess] = useState<Access>(test?.access || Access.Public)
 
     useEffect( () => {
-        apiCall(configApi.datastores(owner), alerting, "DATASTORE", "Error occurred fetching datastores")
+        apiCall(configApi.getDatastoresByTeam(owner), alerting, "DATASTORE", "Error occurred fetching datastores")
             .then(ds => setDatastores(ds))
     }, [test, owner])