SI-433 Fix Version null boolean / DB-Skript Anpassung

gfsBackendService/src/main/java/org/eclipse/openk/gridfailureinformation/bpmn/impl/GfiGrid.java

@@ -56,7 +56,7 @@ public class GfiGrid extends ProcessGrid {
         enterMessage.connectOutputTo( storeEditStatusCreated );
         // -> nein
         storeEditStatusCreated.connectOutputTo( qualifyMessage );
-        // TODO Beabreitungsstatus: aktualisiert berücksichtigen: Zweig: Meldung aktulisieren
+        // TODO Beabreitungsstatus: aktualisiert berücksichtigen: Zweig: Meldung aktualisieren
         qualifyMessage.connectOutputTo(decideCanceled);
         //Meldung storniert?
         decideCanceled.connectOutputTo( YES, storeEditStatusCanceled );

gfsBackendService/src/main/java/org/eclipse/openk/gridfailureinformation/model/HtblFailureInformation.java

@@ -65,7 +65,7 @@ public class HtblFailureInformation {
     private String objectReferenceExternalSystem;
     private String publicationStatus;
     private String publicationFreetext;
-    private boolean condensed;
+    private Boolean condensed;
 
     @CreatedDate
     @Column(name = "create_date")

gfsBackendService/src/main/java/org/eclipse/openk/gridfailureinformation/model/TblFailureInformation.java

@@ -65,7 +65,7 @@ public class TblFailureInformation {
     private String objectReferenceExternalSystem;
     private String publicationStatus;
     private String publicationFreetext;
-    private boolean condensed;
+    private Boolean condensed;
 
     @CreatedDate
     @Column(name = "create_date")

gfsBackendService/src/main/java/org/eclipse/openk/gridfailureinformation/service/FailureInformationService.java

@@ -14,15 +14,14 @@
 */
 package org.eclipse.openk.gridfailureinformation.service;
 
-import lombok.extern.log4j.Log4j2;
-import org.eclipse.openk.gridfailureinformation.enums.OperationType;
-import org.eclipse.openk.gridfailureinformation.exceptions.BadRequestException;
 import lombok.extern.log4j.Log4j2;
 import org.eclipse.openk.gridfailureinformation.bpmn.base.ProcessException;
 import org.eclipse.openk.gridfailureinformation.bpmn.impl.GfiGrid;
 import org.eclipse.openk.gridfailureinformation.bpmn.impl.GfiProcessState;
 import org.eclipse.openk.gridfailureinformation.bpmn.impl.GfiProcessSubject;
 import org.eclipse.openk.gridfailureinformation.bpmn.impl.tasks.ProcessHelper;
+import org.eclipse.openk.gridfailureinformation.enums.OperationType;
+import org.eclipse.openk.gridfailureinformation.exceptions.BadRequestException;
 import org.eclipse.openk.gridfailureinformation.exceptions.InternalServerErrorException;
 import org.eclipse.openk.gridfailureinformation.exceptions.NotFoundException;
 import org.eclipse.openk.gridfailureinformation.exceptions.OperationDeniedException;
@@ -37,10 +36,11 @@ import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Pageable;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
-import java.util.*;
-import java.util.stream.Collectors;
 
+import java.util.Date;
+import java.util.List;
 import java.util.UUID;
+import java.util.stream.Collectors;
 
 @Log4j2
 @Service
@@ -338,7 +338,7 @@ public class FailureInformationService {
                 .collect(Collectors.toList());
 
         if (listFailureInfos.size() == filteredList.size()) {
-            log.info("alle Stdte gleich");
+            log.info("alle Städte gleich");
             condensedFailureInformation.setCity(firstCity);
         }
     }
@@ -354,7 +354,7 @@ public class FailureInformationService {
                 .collect(Collectors.toList());
 
         if (listFailureInfos.size() == filteredList.size()) {
-            log.info("alle mglichen Grnde  gleich");
+            log.info("alle möglichen Gründe  gleich");
             condensedFailureInformation.setRefExpectedReason(listFailureInfos.get(0).getRefExpectedReason());
         }
     }

gfsBackendService/src/main/java/org/eclipse/openk/gridfailureinformation/viewmodel/FailureInformationDto.java

@@ -59,7 +59,7 @@ public class FailureInformationDto implements Serializable {
     private String objectReferenceExternalSystem;
     private String publicationStatus;
     private String publicationFreetext;
-    private boolean condensed;
+    private Boolean condensed;
     private Long condensedCount;
 
     @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss.SSS'Z'")

gfsBackendService/src/main/resources/application.yml

@@ -58,7 +58,7 @@ cors:
 process:
   definitions:
     classification:
-      plannedMeasureDbid: 3
+      plannedMeasureDbid: 2
 
 email:
   sender: sender@olaf.senderson

gfsBackendService/src/main/resources/application_localdev.yml

@@ -56,7 +56,7 @@ cors:
 process:
   definitions:
     classification:
-      plannedMeasureDbid: 3
+      plannedMeasureDbid: 2
 email:
   sender: sender@olaf.senderson
   smtpHost: entdockergss

gfsBackendService/src/test/java/org/eclipse/openk/gridfailureinformation/service/FailureInformationServiceTest.java

@@ -22,7 +22,6 @@ import org.eclipse.openk.gridfailureinformation.model.*;
 import org.eclipse.openk.gridfailureinformation.repository.*;
 import org.eclipse.openk.gridfailureinformation.support.MockDataHelper;
 import org.eclipse.openk.gridfailureinformation.viewmodel.FailureInformationDto;
-import org.junit.Ignore;
 import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
 import org.mockito.stubbing.Answer;
@@ -33,7 +32,6 @@ import org.springframework.boot.test.mock.mockito.MockBean;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Pageable;
 import org.springframework.test.context.ContextConfiguration;
-import org.springframework.web.bind.annotation.ExceptionHandler;
 
 import java.sql.Date;
 import java.util.ArrayList;
@@ -42,9 +40,7 @@ import java.util.Optional;
 import java.util.UUID;
 
 import static org.junit.jupiter.api.Assertions.*;
-import static org.mockito.ArgumentMatchers.any;
-import static org.mockito.ArgumentMatchers.anyLong;
-import static org.mockito.ArgumentMatchers.anyString;
+import static org.mockito.ArgumentMatchers.*;
 import static org.mockito.Mockito.when;
 
 @DataJpaTest
@@ -525,7 +521,7 @@ public class FailureInformationServiceTest {
         assertEquals(tblFailureInformation1.getRefExpectedReason().getUuid(), savedCondensedFailureInfoDto.getExpectedReasonId());
         assertEquals(tblFailureInformation1.getFailureEndPlanned(), savedCondensedFailureInfoDto.getFailureEndPlanned());
         assertEquals(tblFailureInformation1.getFailureBegin(), savedCondensedFailureInfoDto.getFailureBegin());
-        assertEquals(true, savedCondensedFailureInfoDto.isCondensed());
+        assertEquals(true, savedCondensedFailureInfoDto.getCondensed());
         assertEquals(null, savedCondensedFailureInfoDto.getFailureInformationCondensedId());
         
     }
@@ -572,7 +568,7 @@ public class FailureInformationServiceTest {
         assertEquals(null, savedCondensedFailureInfoDto.getProbableReason());
         assertEquals(tblFailureInformation1.getFailureBegin(), savedCondensedFailureInfoDto.getFailureBegin());
         assertEquals(tblFailureInformation3.getFailureEndPlanned(), savedCondensedFailureInfoDto.getFailureEndPlanned());
-        assertEquals(true, savedCondensedFailureInfoDto.isCondensed());
+        assertEquals(true, savedCondensedFailureInfoDto.getCondensed());
         assertEquals(null, savedCondensedFailureInfoDto.getFailureInformationCondensedId());
 
     }