Merge pull request #734 from ELIXIR-NO/fix/camel-and-upper-snake-case

fix(proxy): [ExportRequestType] support camelCase and upper SNAKE_CASE

Author: yasinmiran

services/localega-tsd-proxy/build.gradle.kts

@@ -39,7 +39,7 @@ dependencies {
     testImplementation("org.springframework.security:spring-security-test")
     testImplementation("org.springframework.amqp:spring-rabbit-test")
     testImplementation("org.springframework.boot:spring-boot-starter-test")
-    testImplementation("org.junit.jupiter:junit-jupiter-api")
+    testImplementation("org.junit.jupiter:junit-jupiter")
     testImplementation("org.junit.jupiter:junit-jupiter-engine")
     testRuntimeOnly("org.junit.platform:junit-platform-launcher")
     runtimeOnly("org.postgresql:postgresql")

services/localega-tsd-proxy/src/main/java/no/elixir/fega/ltp/dto/ExportRequestType.java

@@ -1,26 +1,50 @@
 package no.elixir.fega.ltp.dto;
 
 import com.fasterxml.jackson.annotation.JsonCreator;
-import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.annotation.JsonValue;
 import lombok.Getter;
 import lombok.ToString;
 
+/**
+ * Represents the type of identifier used in an export request.
+ *
+ * <p>Supports deserialization from both camelCase ({@code "fileId"}, {@code "datasetId"}) and upper
+ * snake case ({@code "FILE_ID"}, {@code "DATASET_ID"}) formats.
+ */
 @Getter
 @ToString
 public enum ExportRequestType {
+
+  /** Indicates the export request targets a specific file. */
   FILE_ID("fileId"),
+
+  /** Indicates the export request targets an entire dataset. */
   DATASET_ID("datasetId");
+
+  /** The camelCase JSON representation of this type. */
   @JsonValue private final String value;
 
+  /**
+   * @param value the camelCase string used for JSON serialization
+   */
   ExportRequestType(String value) {
     this.value = value;
   }
 
+  /**
+   * Deserializes a string into an {@link ExportRequestType}.
+   *
+   * <p>Accepts both camelCase values ({@code "fileId"}, {@code "datasetId"}) and enum constant
+   * names ({@code "FILE_ID"}, {@code "DATASET_ID"}).
+   *
+   * @param value the string to deserialize
+   * @return the matching {@link ExportRequestType}
+   * @throws IllegalArgumentException if the value does not match any known type
+   */
   @JsonCreator
-  public static ExportRequestType fromValue(@JsonProperty String value) {
+  public static ExportRequestType fromValue(String value) {
     for (ExportRequestType type : ExportRequestType.values()) {
-      if (type.value.equals(value)) {
+      if (type.value.equals(value) || type.name().equals(value)) {
         return type;
       }
     }

services/localega-tsd-proxy/src/test/java/no/elixir/fega/ltp/dto/ExportRequestTypeTest.java

@@ -0,0 +1,42 @@
+package no.elixir.fega.ltp.dto;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+
+import org.junit.jupiter.api.Test;
+
+class ExportRequestTypeTest {
+
+  @Test
+  void fromValueWithCamelCaseFileId() {
+    assertEquals(ExportRequestType.FILE_ID, ExportRequestType.fromValue("fileId"));
+  }
+
+  @Test
+  void fromValueWithCamelCaseDatasetId() {
+    assertEquals(ExportRequestType.DATASET_ID, ExportRequestType.fromValue("datasetId"));
+  }
+
+  @Test
+  void fromValueWithUpperSnakeCaseFileId() {
+    assertEquals(ExportRequestType.FILE_ID, ExportRequestType.fromValue("FILE_ID"));
+  }
+
+  @Test
+  void fromValueWithUpperSnakeCaseDatasetId() {
+    assertEquals(ExportRequestType.DATASET_ID, ExportRequestType.fromValue("DATASET_ID"));
+  }
+
+  @Test
+  void fromValueWithUnknownValueThrowsException() {
+    IllegalArgumentException ex =
+        assertThrows(IllegalArgumentException.class, () -> ExportRequestType.fromValue("unknown"));
+    assertEquals("Unknown ExportType: unknown", ex.getMessage());
+  }
+
+  @Test
+  void jsonValueReturnsCamelCase() {
+    assertEquals("fileId", ExportRequestType.FILE_ID.getValue());
+    assertEquals("datasetId", ExportRequestType.DATASET_ID.getValue());
+  }
+}