Merge branch 'DEVELOP' of ssh://git.eclipse.org:29418/openk-usermodules/org.eclipse.openk-usermodules.gridFailureInformation.backend into DEVELOP
diff --git a/gfsBackendService/src/main/java/org/eclipse/openk/gridfailureinformation/service/FailureInformationService.java b/gfsBackendService/src/main/java/org/eclipse/openk/gridfailureinformation/service/FailureInformationService.java
index 05b42df..9bfcef4 100644
--- a/gfsBackendService/src/main/java/org/eclipse/openk/gridfailureinformation/service/FailureInformationService.java
+++ b/gfsBackendService/src/main/java/org/eclipse/openk/gridfailureinformation/service/FailureInformationService.java
@@ -612,6 +612,8 @@
condensedFailureInformation.setHousenumber(failureInformation != null ? failureInformation.getHousenumber() : null);
condensedFailureInformation.setCity(failureInformation != null ? failureInformation.getCity() : null);
condensedFailureInformation.setDistrict(failureInformation != null ? failureInformation.getDistrict() : null);
+ condensedFailureInformation.setLongitude(failureInformation != null ? failureInformation.getLongitude() : null);
+ condensedFailureInformation.setLatitude(failureInformation != null ? failureInformation.getLatitude() : null);
condensedFailureInformation.setAddressType(failureInformation != null ? failureInformation.getAddressType() : null);
}
diff --git a/gfsBackendService/src/test/java/org/eclipse/openk/gridfailureinformation/service/FailureInformationServiceTest.java b/gfsBackendService/src/test/java/org/eclipse/openk/gridfailureinformation/service/FailureInformationServiceTest.java
index 0925c43..29078bc 100644
--- a/gfsBackendService/src/test/java/org/eclipse/openk/gridfailureinformation/service/FailureInformationServiceTest.java
+++ b/gfsBackendService/src/test/java/org/eclipse/openk/gridfailureinformation/service/FailureInformationServiceTest.java
@@ -710,6 +710,8 @@
assertEquals(tblFailureInformation1.getCity(), savedCondensedFailureInfoDto.getCity());
assertEquals(tblFailureInformation1.getPostcode(), savedCondensedFailureInfoDto.getPostcode());
assertEquals(tblFailureInformation1.getHousenumber(), savedCondensedFailureInfoDto.getHousenumber());
+ assertEquals(tblFailureInformation1.getLatitude(), savedCondensedFailureInfoDto.getLatitude());
+ assertEquals(tblFailureInformation1.getLongitude(), savedCondensedFailureInfoDto.getLongitude());
assertEquals(tblFailureInformation1.getRefExpectedReason().getUuid(), savedCondensedFailureInfoDto.getExpectedReasonId());
assertEquals(tblFailureInformation1.getFailureEndPlanned(), savedCondensedFailureInfoDto.getFailureEndPlanned());
assertEquals(tblFailureInformation1.getFailureBegin(), savedCondensedFailureInfoDto.getFailureBegin());
@@ -757,6 +759,8 @@
assertNull(savedCondensedFailureInfoDto.getFreetextCity());
assertNull(savedCondensedFailureInfoDto.getFreetextDistrict());
assertNull(savedCondensedFailureInfoDto.getFreetextPostcode());
+ assertNull(savedCondensedFailureInfoDto.getLatitude());
+ assertNull(savedCondensedFailureInfoDto.getLongitude());
assertEquals(tblFailureInformation1.getRefExpectedReason().getUuid(), savedCondensedFailureInfoDto.getExpectedReasonId());
assertEquals(tblFailureInformation1.getFailureEndPlanned(), savedCondensedFailureInfoDto.getFailureEndPlanned());
assertEquals(tblFailureInformation1.getFailureBegin(), savedCondensedFailureInfoDto.getFailureBegin());
@@ -822,6 +826,8 @@
assertNull(savedCondensedFailureInfoDto.getFreetextCity());
assertNull(savedCondensedFailureInfoDto.getFreetextDistrict());
assertNull(savedCondensedFailureInfoDto.getFreetextPostcode());
+ assertNull(savedCondensedFailureInfoDto.getLatitude());
+ assertNull(savedCondensedFailureInfoDto.getLongitude());
assertEquals(tblFailureInformation1.getFailureBegin(), savedCondensedFailureInfoDto.getFailureBegin());
assertEquals(tblFailureInformation3.getFailureEndPlanned(), savedCondensedFailureInfoDto.getFailureEndPlanned());
assertEquals(true, savedCondensedFailureInfoDto.getCondensed());
@@ -883,6 +889,8 @@
assertEquals(tblFailureInformation1.getCity(), savedCondensedFailureInfoDto.getCity());
assertEquals(tblFailureInformation1.getPostcode(), savedCondensedFailureInfoDto.getPostcode());
assertEquals(tblFailureInformation1.getHousenumber(), savedCondensedFailureInfoDto.getHousenumber());
+ assertEquals(tblFailureInformation1.getLatitude(), savedCondensedFailureInfoDto.getLatitude());
+ assertEquals(tblFailureInformation1.getLongitude(), savedCondensedFailureInfoDto.getLongitude());
assertEquals(tblFailureInformation1.getFailureBegin(), savedCondensedFailureInfoDto.getFailureBegin());
assertEquals(tblFailureInformation3.getFailureEndPlanned(), savedCondensedFailureInfoDto.getFailureEndPlanned());
assertEquals(true, savedCondensedFailureInfoDto.getCondensed());
