Superior Courts dont get location transformed

RISDEV-2846
digitalservicebund · Dec 4, 2023 · 36c5510 · 36c5510
1 parent a93811f
commit 36c5510
Show file tree

Hide file tree

Showing 2 changed files with 57 additions and 3 deletions.
diff --git a/...rc/main/java/de/bund/digitalservice/ris/caselaw/adapter/transformer/CourtTransformer.java b/...rc/main/java/de/bund/digitalservice/ris/caselaw/adapter/transformer/CourtTransformer.java
@@ -15,9 +15,7 @@ public static Court transformToDomain(CourtDTO courtDTO) {
 
     String revoked = extractRevoked(courtDTO.getAdditionalInformation());
 
-    if (Boolean.TRUE.equals(courtDTO.isSuperiorCourt())
-        && Boolean.TRUE.equals(!courtDTO.isForeignCourt())) {
-
+    if (Boolean.TRUE.equals(courtDTO.isSuperiorCourt())) {
       return Court.builder()
           .id(courtDTO.getId())
           .type(courtDTO.getType())

diff --git a/backend/src/test/java/de/bund/digitalservice/ris/caselaw/adapter/CourtTransformerTest.java b/backend/src/test/java/de/bund/digitalservice/ris/caselaw/adapter/CourtTransformerTest.java
@@ -0,0 +1,56 @@
+package de.bund.digitalservice.ris.caselaw.adapter;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+import de.bund.digitalservice.ris.caselaw.adapter.database.jpa.CourtDTO;
+import de.bund.digitalservice.ris.caselaw.adapter.transformer.CourtTransformer;
+import de.bund.digitalservice.ris.caselaw.domain.court.Court;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.CsvSource;
+
+class CourtTransformerTest {
+
+  @ParameterizedTest
+  @CsvSource({
+    "Bonn, NonSuperiorNonForeignCourt, false, false",
+    "London, NonSuperiorForeignCourt, false, true"
+  })
+  void shouldTransformLocation(
+      String location, String type, boolean isSuperiorCourt, boolean isForeignCourt) {
+    CourtDTO courtDTO =
+        CourtDTO.builder()
+            .jurisId(1)
+            .type(type)
+            .location(location)
+            .isSuperiorCourt(isSuperiorCourt)
+            .isForeignCourt(isForeignCourt)
+            .build();
+
+    Court court = CourtTransformer.transformToDomain(courtDTO);
+
+    // Assertion
+    assertThat(court)
+        .extracting("type", "location", "label")
+        .containsExactly(type, location, type + " " + location);
+  }
+
+  @ParameterizedTest
+  @CsvSource({
+    "BGH, SuperiorNonForeignCourt, true, false",
+    "DenHaag, SuperiorForeignCourt, true, true"
+  })
+  void shouldNotTransformLocation(
+      String location, String type, boolean isSuperiorCourt, boolean isForeignCourt) {
+    CourtDTO courtDTO =
+        CourtDTO.builder()
+            .jurisId(1)
+            .type(type)
+            .location(location)
+            .isSuperiorCourt(isSuperiorCourt)
+            .isForeignCourt(isForeignCourt)
+            .build();
+
+    Court court = CourtTransformer.transformToDomain(courtDTO);
+    assertThat(court).extracting("type", "location", "label").containsExactly(type, null, type);
+  }
+}