Merge pull request #14 from mcanoy/get-allowed-user-roles

add ability to query for participant role key / values

Author: mcanoy

pom.xml

@@ -16,7 +16,7 @@
 		<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
 		<quarkus.platform.artifact-id>quarkus-universe-bom</quarkus.platform.artifact-id>
 		<quarkus.platform.group-id>io.quarkus</quarkus.platform.group-id>
-		<quarkus.platform.version>2.1.3.Final</quarkus.platform.version>
+		<quarkus.platform.version>2.9.2.Final</quarkus.platform.version>
 		<surefire-plugin.version>3.0.0-M5</surefire-plugin.version>
 		<lombok.version>1.18.20</lombok.version>
 		<sonar.host.url>https://sonarcloud.io</sonar.host.url>

src/main/java/com/redhat/labs/lodestar/resource/RuntimeConfigResource.java

@@ -44,6 +44,12 @@ public Map<String, String> getEngagementOptions() {
     public Map<String, String> getRegionOptions() {
         return configService.getEngagementRegionOptions();
     }
+
+    @GET
+    @Path("participant/options")
+    public Map<Object, Object> getParticipantOptions(@QueryParam("engagementType") String type) {
+        return configService.getParticipantRoleOptions(type);
+    }
 
     @GET
     @Path("rbac")

src/main/java/com/redhat/labs/lodestar/service/RuntimeConfigService.java

@@ -72,6 +72,17 @@ void createRuntimeConfigurations() {
 
     }
 
+    @SuppressWarnings("unchecked")
+    public Map<Object, Object> getParticipantRoleOptions(String engagementType) {
+        Map<String, Object> runtime = mapRuntimeConfigurationTypeRequired(engagementType);
+        List<Map<String, Object>> typesList = Optional.of(runtime)
+                .map(m -> (Map<String, Object>) m.get("user_options"))
+                .map(m -> (Map<String, Object>) m.get("user_roles"))
+                .map(m -> (List<Map<String, Object>>) m.get("options")).orElse(new ArrayList<>());
+
+        return typesList.stream().collect(Collectors.toMap(s -> s.get("value"), s -> s.get("label")));
+    }
+
     @SuppressWarnings("unchecked")
     public Map<Object, Object> getArtifactOptions() {
         Map<String, Object> configuration = baseConfiguration.getConfiguration();
@@ -136,12 +147,22 @@ void createOverrideConfig(String engagementType) {
      */
     public Map<String, Object> mapRuntimeConfiguration(Optional<String> engagementType) {
 
+        if (engagementType.isPresent()) {
+            return mapRuntimeConfigurationTypeRequired(engagementType.get());
+        }
+
+        return baseConfiguration.getConfiguration();
+
+    }
+
+    public Map<String, Object> mapRuntimeConfigurationTypeRequired(String engagementType) {
+
         // get map for base configuration
         Map<String, Object> base = baseConfiguration.getConfiguration();
 
-        if (engagementType.isPresent() && overrideConfigurations.containsKey(engagementType.get())) {
+        if (overrideConfigurations.containsKey(engagementType)) {
 
-            Map<String, Object> override = overrideConfigurations.get(engagementType.get()).getConfiguration();
+            Map<String, Object> override = overrideConfigurations.get(engagementType).getConfiguration();
             base = MarshalUtils.merge(base, override);
 
         }

src/test/java/com/redhat/labs/lodestar/resource/RuntimeConfigResourceTest.java

@@ -9,10 +9,6 @@
 import java.util.List;
 import java.util.Map;
 
-import com.fasterxml.jackson.databind.JsonNode;
-import com.fasterxml.jackson.databind.ObjectMapper;
-import io.restassured.path.json.JsonPath;
-import org.junit.jupiter.api.Assertions;
 import org.junit.jupiter.api.Test;
 
 import com.redhat.labs.lodestar.utils.ResourceLoader;
@@ -51,7 +47,7 @@ void testGetRuntimeConfigurationNoType() {
         String response = given().when().contentType(ContentType.JSON).get()
                 .then().statusCode(200).extract().asString();
 
-        Assertions.assertEquals(expectedResponse, response);
+        assertEquals(expectedResponse, response);
 
     }
 
@@ -61,7 +57,7 @@ void testGetRuntimeConfigurationTypeOne() throws Exception {
         String response = given().when().contentType(ContentType.JSON).queryParam("type", "TypeOne").get()
                 .then().statusCode(200).extract().asString();
 
-        Assertions.assertEquals(expectedResponse, response);
+        assertEquals(expectedResponse, response);
 
     }
 
@@ -71,7 +67,7 @@ void testGetRuntimeConfigurationTypeTwo() {
         String response = given().when().contentType(ContentType.JSON).queryParam("type", "TypeTwo").get()
                 .then().statusCode(200).extract().asString();
 
-        Assertions.assertEquals(expectedResponse, response);
+        assertEquals(expectedResponse, response);
 
     }
 
@@ -106,4 +102,20 @@ void testGetEngagementOptions() {
 
     }
 
+    @Test
+    void testGetParticipantOptions() {
+        given().when().contentType(ContentType.JSON).get("participant/options")
+                .then().statusCode(200).body("size()", equalTo(2))
+                .body("jurist", equalTo("Jurist")).body("judge", equalTo("Judge"));
+
+    }
+
+    @Test
+    void testGetParticipantOptionsTyped() {
+        given().queryParam("engagementType", "TypeTwo").when().contentType(ContentType.JSON).get("participant/options")
+                .then().statusCode(200).body("size()", equalTo(2))
+                .body("plaintiff", equalTo("Plaintiff")).body("defendant", equalTo("Defendant"));
+
+    }
+
 }

src/test/resources/expected/service-base-config.json

@@ -67,5 +67,19 @@
                 }
             ]
         }
+    },
+    "user_options": {
+        "user_roles": {
+            "options": [
+                {
+                    "value": "jurist",
+                    "label": "Jurist"
+                },
+                {
+                    "value": "judge",
+                    "label": "Judge"
+                }
+            ]
+        }
     }
 }

src/test/resources/expected/service-get-type-one-config.json

@@ -54,6 +54,20 @@
             ]
         }
     },
+    "user_options": {
+        "user_roles": {
+            "options": [
+                {
+                    "value": "jurist",
+                    "label": "Jurist"
+                },
+                {
+                    "value": "judge",
+                    "label": "Judge"
+                }
+            ]
+        }
+    },
     "other_options": {
         "types": {
             "options": [

src/test/resources/expected/service-get-type-three-config.json

@@ -36,6 +36,20 @@
             ]
         }
     },
+    "user_options": {
+        "user_roles": {
+            "options": [
+                {
+                    "value": "jurist",
+                    "label": "Jurist"
+                },
+                {
+                    "value": "judge",
+                    "label": "Judge"
+                }
+            ]
+        }
+    },
     "other_options": {
         "types": {
             "options": [

src/test/resources/expected/service-get-type-two-config.json

@@ -54,6 +54,20 @@
             ]
         }
     },
+    "user_options": {
+        "user_roles": {
+            "options": [
+                {
+                    "value": "defendant",
+                    "label": "Defendant"
+                },
+                {
+                    "value": "plaintiff",
+                    "label": "Plaintiff"
+                }
+            ]
+        }
+    },
     "other_options": {
         "types": {
             "options": [

src/test/resources/runtime-config-TypeTwo.yaml

@@ -6,4 +6,11 @@ other_options:
   types:
     options:
       - label: OptionTwo
-        value: option2
+        value: option2
+user_options:
+  user_roles:
+    options:
+      - value: defendant
+        label: Defendant
+      - value: plaintiff
+        label: Plaintiff

src/test/resources/runtime-config-base.yaml

@@ -37,3 +37,11 @@ artifact_options:
     options:
       - value: flyer
         label: Flyer
+user_options:
+  user_roles:
+    options:
+      - value: jurist
+        label: Jurist
+      - value: judge
+        label: Judge
+