Feat/po 96: Add string variation for feature flags (#60)

hmcts · Nov 30, 2023 · ccdc117 · ccdc117
1 parent 0cb8f6d
commit ccdc117
Show file tree

Hide file tree

Showing 6 changed files with 46 additions and 4 deletions.
diff --git a/src/main/java/uk/gov/hmcts/opal/controllers/TestingSupportController.java b/src/main/java/uk/gov/hmcts/opal/controllers/TestingSupportController.java
@@ -33,8 +33,13 @@ public ResponseEntity<AppMode> updateMode(@RequestBody AppMode mode) {
         return ResponseEntity.accepted().body(this.dynamicConfigService.updateAppMode(mode));
     }
 
-    @GetMapping("/launchdarkly/{featureKey}")
-    public ResponseEntity<Boolean> getFeatureFlagValue(@PathVariable String featureKey) {
+    @GetMapping("/launchdarkly/bool/{featureKey}")
+    public ResponseEntity<Boolean> isFeatureEnabled(@PathVariable String featureKey) {
         return ResponseEntity.ok(this.featureToggleService.isFeatureEnabled(featureKey));
     }
+
+    @GetMapping("/launchdarkly/string/{featureKey}")
+    public ResponseEntity<String> getFeatureValue(@PathVariable String featureKey) {
+        return ResponseEntity.ok(this.featureToggleService.getFeatureValue(featureKey));
+    }
 }
diff --git a/src/main/java/uk/gov/hmcts/opal/launchdarkly/FeatureToggleApi.java b/src/main/java/uk/gov/hmcts/opal/launchdarkly/FeatureToggleApi.java
@@ -35,10 +35,15 @@ public boolean isFeatureEnabled(String feature, LDUser user) {
         return internalClient.boolVariation(feature, user, false);
     }
 
+
     public boolean isFeatureEnabled(String feature, LDUser user, boolean defaultValue) {
         return internalClient.boolVariation(feature, user, defaultValue);
     }
 
+    public String getFeatureValue(String feature, String defaultValue) {
+        return internalClient.stringVariation(feature, createLDUser().build(), defaultValue);
+    }
+
     public LDUser.Builder createLDUser() {
         return new LDUser.Builder("opal")
             .custom("timestamp", String.valueOf(System.currentTimeMillis()))

diff --git a/src/main/java/uk/gov/hmcts/opal/launchdarkly/FeatureToggleService.java b/src/main/java/uk/gov/hmcts/opal/launchdarkly/FeatureToggleService.java
@@ -15,4 +15,7 @@ public boolean isFeatureEnabled(String feature) {
         return this.featureToggleApi.isFeatureEnabled(feature);
     }
 
+    public String getFeatureValue(String feature) {
+        return this.featureToggleApi.getFeatureValue(feature, "");
+    }
 }
diff --git a/src/test/java/uk/gov/hmcts/opal/controllers/TestingSupportControllerTest.java b/src/test/java/uk/gov/hmcts/opal/controllers/TestingSupportControllerTest.java
@@ -50,13 +50,23 @@ void updateMode() {
     }
 
     @Test
-    void getFeatureFlagValue() {
+    void isFeatureEnabled() {
         when(featureToggleService.isFeatureEnabled("my-feature")).thenReturn(true);
 
-        ResponseEntity<Boolean> response = controller.getFeatureFlagValue("my-feature");
+        ResponseEntity<Boolean> response = controller.isFeatureEnabled("my-feature");
 
         assertEquals(HttpStatus.OK, response.getStatusCode());
         assertEquals(true, response.getBody());
     }
 
+    @Test
+    void getFeatureFlagValue() {
+        when(featureToggleService.getFeatureValue("my-feature")).thenReturn("value");
+
+        ResponseEntity<String> response = controller.getFeatureValue("my-feature");
+
+        assertEquals(HttpStatus.OK, response.getStatusCode());
+        assertEquals("value", response.getBody());
+    }
+
 }
diff --git a/src/test/java/uk/gov/hmcts/opal/launchdarkly/FeatureToggleApiTest.java b/src/test/java/uk/gov/hmcts/opal/launchdarkly/FeatureToggleApiTest.java
@@ -66,6 +66,15 @@ void shouldReturnCorrectState_whenDefaultServiceUser(Boolean toggleState) {
         verifyBoolVariationCalled(FAKE_FEATURE, List.of("timestamp", "environment"));
     }
 
+    @ParameterizedTest
+    @ValueSource(strings = { "opal", "legacy"})
+    void shouldReturnCorrectStringValue_whenDefaultServiceUser(String toggleState) {
+        when(ldClient.stringVariation(eq(FAKE_FEATURE), any(LDUser.class), any()))
+            .thenReturn(toggleState);
+
+        assertThat(featureToggleApi.getFeatureValue(FAKE_FEATURE, null)).isEqualTo(toggleState);
+    }
+
     private void givenToggle(String feature, boolean state) {
         when(ldClient.boolVariation(eq(feature), any(LDUser.class), anyBoolean()))
             .thenReturn(state);

diff --git a/src/test/java/uk/gov/hmcts/opal/launchdarkly/FeatureToggleServiceTest.java b/src/test/java/uk/gov/hmcts/opal/launchdarkly/FeatureToggleServiceTest.java
@@ -8,6 +8,7 @@
 import org.mockito.junit.jupiter.MockitoExtension;
 
 import static org.assertj.core.api.Assertions.assertThat;
+import static org.mockito.ArgumentMatchers.any;
 import static org.mockito.ArgumentMatchers.eq;
 import static org.mockito.Mockito.when;
 
@@ -36,4 +37,13 @@ private void givenToggle(String feature, boolean state) {
         when(featureToggleApi.isFeatureEnabled(eq(feature)))
             .thenReturn(state);
     }
+
+    @ParameterizedTest
+    @ValueSource(strings = { "opal", "legacy"})
+    void shouldReturnCorrectValue_whenMyFeatureValueInvoked(String toggleValue) {
+        when(featureToggleApi.getFeatureValue(eq("myFeature"), any()))
+            .thenReturn(toggleValue);
+
+        assertThat(featureToggleService.getFeatureValue("myFeature")).isEqualTo(toggleValue);
+    }
 }