Fix some tests

RISDEV-2902
digitalservicebund · Dec 6, 2023 · f4b6fb9 · f4b6fb9
1 parent 1044a47
commit f4b6fb9
Show file tree

Hide file tree

Showing 11 changed files with 24 additions and 41 deletions.
diff --git a/.talismanrc b/.talismanrc
@@ -8,7 +8,7 @@ fileignoreconfig:
 - filename: backend/src/main/kotlin/de/bund/digitalservice/ris/norms/framework/adapter/input/restapi/controller/GetFileController.kt
   checksum: f989b3c9c176b1b985c2f78ca6ca13fa1403cbb69f367ae9b1cb8ea64d5f6747
 - filename: backend/src/test/java/de/bund/digitalservice/ris/caselaw/integration/tests/JurisXmlExporterWrapperIntegrationTest.java
-  checksum: d8750cb58c1bf1206620c0537ac5f355ea4b0372888692784f57beae1316a831
+  checksum: c2bd47d6fd5b51d674e888ad09bf004a84ad0de5b59e151bc0fd62c05a1349bd
 - filename: backend/src/test/java/de/bund/digitalservice/ris/caselaw/integration/tests/DeviatingObjectIntegrationTest.java
   checksum: 120c5e4fd9ec2f1930e7b0b6c0256ebf418c770060f986838521d71725963a24
 - filename: backend/src/test/kotlin/unit/adapter/input/restapi/controller/GenerateNormFileControllerTest.kt

diff --git a/...java/de/bund/digitalservice/ris/caselaw/adapter/database/jpa/RelatedDocumentationDTO.java b/...java/de/bund/digitalservice/ris/caselaw/adapter/database/jpa/RelatedDocumentationDTO.java
@@ -14,6 +14,8 @@
 import java.time.LocalDate;
 import java.util.UUID;
 import lombok.AllArgsConstructor;
+import lombok.EqualsAndHashCode;
+import lombok.EqualsAndHashCode.Include;
 import lombok.Getter;
 import lombok.NoArgsConstructor;
 import lombok.Setter;
@@ -25,11 +27,12 @@
 @NoArgsConstructor
 @SuperBuilder
 @Entity
+@EqualsAndHashCode(onlyExplicitlyIncluded = true)
 @Table(schema = "incremental_migration", name = "related_documentation")
 @Inheritance(strategy = InheritanceType.SINGLE_TABLE)
 public abstract class RelatedDocumentationDTO {
 
-  @Id @GeneratedValue private UUID id;
+  @Include @Id @GeneratedValue private UUID id;
 
   @ManyToOne private CourtDTO court;
 
@@ -55,6 +58,7 @@ public abstract class RelatedDocumentationDTO {
   @JoinColumn(name = "document_number", referencedColumnName = "document_number")
   private DocumentationUnitDTO referencedDocumentationUnit;
 
+  @Include
   @Column(name = "document_number", insertable = false, updatable = false)
   private String documentNumber;
 }
diff --git a/...a/de/bund/digitalservice/ris/caselaw/integration/tests/ActiveCitationIntegrationTest.java b/...a/de/bund/digitalservice/ris/caselaw/integration/tests/ActiveCitationIntegrationTest.java
@@ -200,7 +200,7 @@ void testUpdateDocumentUnit_addNewActiveCitation() {
                                         .build())
                                 .build(),
                             ActiveCitation.builder()
-                                .uuid(UUID.fromString("7da39a1e-78a9-11ee-b962-0242ac120002"))
+                                .uuid(UUID.fromString("7da39a1e-78a9-11ee-b962-0242ac120003"))
                                 .citationType(
                                     CitationType.builder()
                                         .uuid(
@@ -1117,8 +1117,6 @@ void testUpdateDocumentationUnit_addLinkedActiveCitation() {
                             ActiveCitation.builder()
                                 .uuid(UUID.randomUUID())
                                 .documentNumber("documentnr002")
-                                .referencedDocumentationUnitId(
-                                    UUID.fromString("f13e7fe2-78a5-11ee-b962-0242ac120002"))
                                 .build()))
                     .build())
             .build();
@@ -1172,14 +1170,10 @@ void testUpdateDocumentationUnit_shouldNotAddSameLinkedActiveCitationTwice() {
                             ActiveCitation.builder()
                                 .uuid(activeCitationUUID2)
                                 .documentNumber("documentnr002")
-                                .referencedDocumentationUnitId(
-                                    UUID.fromString("f13e7fe2-78a5-11ee-b962-0242ac120002"))
                                 .build(),
                             ActiveCitation.builder()
                                 .uuid(activeCitationUUID2)
                                 .documentNumber("documentnr002")
-                                .referencedDocumentationUnitId(
-                                    UUID.fromString("f13e7fe2-78a5-11ee-b962-0242ac120002"))
                                 .build()))
                     .build())
             .build();

diff --git a/...de/bund/digitalservice/ris/caselaw/integration/tests/EnsuingDecisionsIntegrationTest.java b/...de/bund/digitalservice/ris/caselaw/integration/tests/EnsuingDecisionsIntegrationTest.java
@@ -890,8 +890,6 @@ void testUpdateDocumentationUnit_addLinkedEnsuingDecision() {
                     EnsuingDecision.builder()
                         .uuid(UUID.randomUUID())
                         .documentNumber("documentnr002")
-                        .referencedDocumentationUnitId(
-                            UUID.fromString("f13e7fe2-78a5-11ee-b962-0242ac120002"))
                         .build()))
             .build();
 
@@ -924,14 +922,10 @@ void testUpdateDocumentationUnit_shouldNotAddSameLinkedDecisionTwice() {
                     EnsuingDecision.builder()
                         .uuid(UUID.fromString("f0232240-7416-11ee-b962-0242ac120002"))
                         .documentNumber("documentnr002")
-                        .referencedDocumentationUnitId(
-                            UUID.fromString("f13e7fe2-78a5-11ee-b962-0242ac120002"))
                         .build(),
                     EnsuingDecision.builder()
                         .uuid(UUID.fromString("f0232240-7416-11ee-b962-0242ac120002"))
                         .documentNumber("documentnr002")
-                        .referencedDocumentationUnitId(
-                            UUID.fromString("f13e7fe2-78a5-11ee-b962-0242ac120002"))
                         .build()))
             .build();
 

diff --git a/.../digitalservice/ris/caselaw/integration/tests/JurisXmlExporterWrapperIntegrationTest.java b/.../digitalservice/ris/caselaw/integration/tests/JurisXmlExporterWrapperIntegrationTest.java
@@ -157,7 +157,6 @@ void testDocumentUnitIsSyncedWithModel()
             PreviousDecision.builder()
                 .uuid(UUID.randomUUID())
                 .documentNumber("documentNumber")
-                .referencedDocumentationUnitId(UUID.randomUUID())
                 .uuid(UUID.randomUUID())
                 .court(new Court(UUID.randomUUID(), "courtType", "courtPlace", "courtLabel", null))
                 .decisionDate(LocalDate.parse("2020-04-05"))

diff --git a/...de/bund/digitalservice/ris/caselaw/integration/tests/PreviousDecisionIntegrationTest.java b/...de/bund/digitalservice/ris/caselaw/integration/tests/PreviousDecisionIntegrationTest.java
@@ -227,7 +227,7 @@ void testLinkExistingPreviousDecision() {
             .previousDecisions(
                 List.of(
                     PreviousDecision.builder()
-                        .referencedDocumentationUnitId(childDocumentationUnitUuid)
+                        .uuid(childDocumentationUnitUuid)
                         .documentNumber(childDocumentUnitDTO.getDocumentNumber())
                         .build()))
             .coreData(CoreData.builder().documentationOffice(docOffice).build())
@@ -245,8 +245,8 @@ void testLinkExistingPreviousDecision() {
         .consumeWith(
             response -> {
               assertThat(response.getResponseBody().previousDecisions())
-                  .extracting("referencedDocumentationUnitId")
-                  .containsExactly(childDocumentationUnitUuid);
+                  .extracting("documentNumber")
+                  .containsExactly("abcdefghjikl");
             });
   }
 
@@ -308,12 +308,12 @@ void testLinkTheSameDocumentUnitsTwice() {
             .previousDecisions(
                 List.of(
                     PreviousDecision.builder()
+                        .uuid(childDocumentationUnitUuid)
                         .documentNumber("xxx")
-                        .referencedDocumentationUnitId(childDocumentationUnitUuid)
                         .build(),
                     PreviousDecision.builder()
+                        .uuid(childDocumentationUnitUuid)
                         .documentNumber("xxx")
-                        .referencedDocumentationUnitId(childDocumentationUnitUuid)
                         .build()))
             .coreData(CoreData.builder().documentationOffice(docOffice).build())
             .build();
@@ -333,9 +333,6 @@ void testLinkTheSameDocumentUnitsTwice() {
               assertThat(response.getResponseBody().previousDecisions().get(0))
                   .extracting("documentNumber")
                   .isEqualTo("xxx");
-              assertThat(response.getResponseBody().previousDecisions().get(0))
-                  .extracting("referencedDocumentationUnitId")
-                  .isEqualTo(childDocumentationUnitUuid);
             });
   }
 

diff --git a/frontend/test/components/InlineDecision.spec.ts b/frontend/test/components/InlineDecision.spec.ts
@@ -26,8 +26,7 @@ function renderComponent(options?: {
         decisionDate:
           options?.decisionDate ?? "2004-12-02 12:00:00.000000 +00:00",
         documentNumber: options?.documentNumber ?? undefined,
-        referencedDocumentationUnitId:
-          options?.referencedDocumentationUnitId ?? undefined,
+        referenceFound: true,
       },
     }),
   }
@@ -80,7 +79,6 @@ describe("Decision ListItem", () => {
   it("renders with link if linked to docunit", async () => {
     renderComponent({
       documentNumber: "fooDocumentNumber",
-      referencedDocumentationUnitId: "abc",
     })
     expect(screen.getByRole("link")).toHaveAttribute(
       "href",

diff --git a/frontend/test/components/activeCitations.spec.ts b/frontend/test/components/activeCitations.spec.ts
@@ -30,7 +30,7 @@ function renderComponent(options?: { modelValue?: ActiveCitation[] }) {
 function generateActiveCitation(options?: {
   uuid?: string
   documentNumber?: string
-  referencedDocumentationUnitId?: string
+  referenceFound?: boolean
   court?: Court
   decisionDate?: string
   fileNumber?: string
@@ -40,8 +40,6 @@ function generateActiveCitation(options?: {
   const activeCitation = new ActiveCitation({
     uuid: options?.uuid ?? "123",
     documentNumber: options?.documentNumber ?? undefined,
-    referencedDocumentationUnitId:
-      options?.referencedDocumentationUnitId ?? undefined,
     court: options?.court ?? {
       type: "type1",
       location: "location1",
@@ -58,6 +56,7 @@ function generateActiveCitation(options?: {
       jurisShortcut: "Änderungen",
       label: "Änderungen",
     },
+    referenceFound: options?.referenceFound ?? false,
   })
   return activeCitation
 }
@@ -406,7 +405,7 @@ describe("Active Citations", () => {
       modelValue: [
         generateActiveCitation({
           documentNumber: "ABC",
-          referencedDocumentationUnitId: "abc",
+          referenceFound: true,
         }),
       ],
     })
@@ -489,7 +488,7 @@ describe("Active Citations", () => {
       modelValue: [
         generateActiveCitation({
           documentNumber: "123",
-          referencedDocumentationUnitId: "123",
+          referenceFound: true,
           citationStyle: {
             label: "invalid",
           },

diff --git a/frontend/test/components/ensuingDecisions.spec.ts b/frontend/test/components/ensuingDecisions.spec.ts
@@ -33,7 +33,7 @@ function generateEnsuingDecision(options?: {
   decisionDate?: string
   fileNumber?: string
   documentType?: DocumentType
-  referencedDocumentationUnitId?: string
+  referenceFound?: boolean
   pending?: boolean
   note?: string
 }) {
@@ -51,8 +51,7 @@ function generateEnsuingDecision(options?: {
       jurisShortcut: "documentTypeShortcut1",
       label: "documentType1",
     },
-    referencedDocumentationUnitId:
-      options?.referencedDocumentationUnitId ?? undefined,
+    referenceFound: options?.referenceFound ?? false,
     pending: options?.pending ?? false,
     note: options?.note ?? undefined,
   })
@@ -298,7 +297,7 @@ describe("EnsuingDecisions", () => {
       modelValue: [
         generateEnsuingDecision({
           documentNumber: "ABC",
-          referencedDocumentationUnitId: "abc",
+          referenceFound: true,
         }),
       ],
     })

diff --git a/frontend/test/components/previousDecisions.spec.ts b/frontend/test/components/previousDecisions.spec.ts
@@ -34,13 +34,12 @@ function generatePreviousDecision(options?: {
   fileNumber?: string
   documentType?: DocumentType
   dateKnown?: boolean
-  referencedDocumentationUnitId?: string
+  referenceFound?: boolean
 }) {
   const previousDecision = new PreviousDecision({
     uuid: options?.uuid ?? "123",
     documentNumber: options?.documentNumber ?? undefined,
-    referencedDocumentationUnitId:
-      options?.referencedDocumentationUnitId ?? undefined,
+    referenceFound: options?.referenceFound ?? false,
     court: options?.court ?? {
       type: "type1",
       location: "location1",
@@ -356,7 +355,7 @@ describe("PreviousDecisions", () => {
       modelValue: [
         generatePreviousDecision({
           documentNumber: "ABC",
-          referencedDocumentationUnitId: "abc",
+          referenceFound: true,
         }),
       ],
     })

diff --git a/frontend/test/domain/proceedingDecision.spec.ts b/frontend/test/domain/proceedingDecision.spec.ts
@@ -37,7 +37,7 @@ describe("ProceedingDecision", () => {
   it("returns true if linked to other docunit", () => {
     const proceedingDecision = new ProceedingDecision({
       documentNumber: "ABC",
-      referencedDocumentationUnitId: "abc",
+      referenceFound: true,
     })
     expect(proceedingDecision.isReadOnly).toBeTruthy()
   })