BP-732 remove double database requests
diff --git a/oKBereitschaftsplanungBackend/src/main/java/org/eclipse/openk/sp/controller/planning/BodyDataCopyController.java b/oKBereitschaftsplanungBackend/src/main/java/org/eclipse/openk/sp/controller/planning/BodyDataCopyController.java
index a9bc6a7..41555da 100644
--- a/oKBereitschaftsplanungBackend/src/main/java/org/eclipse/openk/sp/controller/planning/BodyDataCopyController.java
+++ b/oKBereitschaftsplanungBackend/src/main/java/org/eclipse/openk/sp/controller/planning/BodyDataCopyController.java
@@ -262,8 +262,7 @@
lsMsg.add(dto);
// delete
- listBodyTarget = deleteExistingBodysInIntervall(groupId, standbyScheduleCopyDto.getValidFrom(),
- standbyScheduleCopyDto.getValidTo(), targetStatus, lsMsg);
+ listBodyTarget = deleteExistingBodysInIntervall(listBodyTarget, lsMsg);
}
}
@@ -375,21 +374,17 @@
return dto;
}
- public List<StandbyScheduleBody> deleteExistingBodysInIntervall(Long groupId, Date validFrom, Date validTo,
- StandbyStatus status, List<PlanningMsgDto> lsMsg) {
+ public List<StandbyScheduleBody> deleteExistingBodysInIntervall(List<StandbyScheduleBody> listBodyTarget,
+ List<PlanningMsgDto> lsMsg) {
// LOGGER.info("deleteExistingBodysInIntervall " + groupId + " before copyByGroups - start " + new Date());
+ if (listBodyTarget != null && !listBodyTarget.isEmpty()) {
- // search existing bodies and delete them
- List<StandbyScheduleBody> listBodyTarget = plannedDataController
- .getPlannedBodysForGroupIdAndIntervallAndStatus(groupId, validFrom, validTo, status.getId());
+ // clear existing
+ for (StandbyScheduleBody standbyScheduleBody : listBodyTarget) {
+ lsMsg.add(deleteMsgSavingBody(standbyScheduleBody));
+ }
- // clear existing
- for (StandbyScheduleBody standbyScheduleBody : listBodyTarget) {
- lsMsg.add(deleteMsgSavingBody(standbyScheduleBody));
- }
-
- if (!listBodyTarget.isEmpty()) {
standbyScheduleBodyRepository.delete(listBodyTarget);
listBodyTarget = new ArrayList<>();
}
diff --git a/oKBereitschaftsplanungBackend/src/main/java/org/eclipse/openk/sp/controller/planning/PlannedDataController.java b/oKBereitschaftsplanungBackend/src/main/java/org/eclipse/openk/sp/controller/planning/PlannedDataController.java
index a535103..aa57bcf 100644
--- a/oKBereitschaftsplanungBackend/src/main/java/org/eclipse/openk/sp/controller/planning/PlannedDataController.java
+++ b/oKBereitschaftsplanungBackend/src/main/java/org/eclipse/openk/sp/controller/planning/PlannedDataController.java
@@ -428,7 +428,7 @@
Long statusId) {
validFrom = DateHelper.getStartOfDay(validFrom);
- validTo = DateHelper.getEndOfDay(validTo);
+ validTo = DateHelper.getEndOfThisDay(validTo);
List<StandbyScheduleBody> listBodies = standbyScheduleBodyRepository.findByGroupsAndDateAndStatus(groupIds,
validFrom, validTo, statusId);
diff --git a/oKBereitschaftsplanungBackend/src/main/java/org/eclipse/openk/sp/dto/StandbyScheduleDto.java b/oKBereitschaftsplanungBackend/src/main/java/org/eclipse/openk/sp/dto/StandbyScheduleDto.java
index 5689105..7e93da7 100644
--- a/oKBereitschaftsplanungBackend/src/main/java/org/eclipse/openk/sp/dto/StandbyScheduleDto.java
+++ b/oKBereitschaftsplanungBackend/src/main/java/org/eclipse/openk/sp/dto/StandbyScheduleDto.java
@@ -67,7 +67,7 @@
public StandbyScheduleDto(Date validFrom, Date validTo, List<StandbyGroupSelectionDto> listStandbyGroupDto) {
Date dateIndex = DateHelper.getStartOfDay(validFrom);
- Date endDate = DateHelper.getEndOfDay(validTo);
+ Date endDate = DateHelper.getEndOfThisDay(validTo);
while (DateHelper.isDateBefore(dateIndex, endDate)) {
PlanRowsDto dto = new PlanRowsDto(listStandbyGroupDto);
diff --git a/oKBereitschaftsplanungBackend/src/main/java/org/eclipse/openk/sp/util/DateHelper.java b/oKBereitschaftsplanungBackend/src/main/java/org/eclipse/openk/sp/util/DateHelper.java
index 4c68fca..2ad2a5e 100644
--- a/oKBereitschaftsplanungBackend/src/main/java/org/eclipse/openk/sp/util/DateHelper.java
+++ b/oKBereitschaftsplanungBackend/src/main/java/org/eclipse/openk/sp/util/DateHelper.java
@@ -136,6 +136,11 @@
return new DateTime(dateTime.getYear(), dateTime.getMonthOfYear(), dateTime.getDayOfMonth(), 0, 0, 0).toDate();
}
+ public static Date getEndOfThisDay(Date date) {
+ DateTime dateTime = new DateTime(date);
+ return new DateTime(dateTime.getYear(), dateTime.getMonthOfYear(), dateTime.getDayOfMonth(), 0, 0, 0).toDate();
+ }
+
/**
* Method to set the time of the date to '00:00:00'.
*
diff --git a/oKBereitschaftsplanungBackend/src/test/java/org/eclipse/openk/sp/controller/planning/BodyDataCopyControllerTest.java b/oKBereitschaftsplanungBackend/src/test/java/org/eclipse/openk/sp/controller/planning/BodyDataCopyControllerTest.java
index a32301f..1e86c5e 100644
--- a/oKBereitschaftsplanungBackend/src/test/java/org/eclipse/openk/sp/controller/planning/BodyDataCopyControllerTest.java
+++ b/oKBereitschaftsplanungBackend/src/test/java/org/eclipse/openk/sp/controller/planning/BodyDataCopyControllerTest.java
@@ -14,6 +14,7 @@
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertNull;
import static org.mockito.Matchers.any;
import static org.mockito.Mockito.when;
@@ -29,7 +30,6 @@
import org.eclipse.openk.sp.db.dao.StandbyListRepository;
import org.eclipse.openk.sp.db.dao.StandbyScheduleBodyRepository;
import org.eclipse.openk.sp.db.dao.StandbyStatusRepository;
-import org.eclipse.openk.sp.db.model.ArchiveStandbyScheduleHeader;
import org.eclipse.openk.sp.db.model.StandbyGroup;
import org.eclipse.openk.sp.db.model.StandbyList;
import org.eclipse.openk.sp.db.model.StandbyScheduleBody;
@@ -45,6 +45,7 @@
import org.eclipse.openk.sp.exceptions.SpException;
import org.eclipse.openk.sp.util.DateHelper;
import org.eclipse.openk.sp.util.FileHelperTest;
+import org.eclipse.openk.sp.util.GsonTypeHelper;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.mockito.InjectMocks;
@@ -114,53 +115,26 @@
@Test
public void deleteExistingBodysInIntervall() throws SpException {
- boolean doOnce = true;
- Long groupId = new Long(1);
- Date dateIndex = new Date();
- StandbyStatus statusn = new StandbyStatus();
List<PlanningMsgDto> lsMsg = new ArrayList<>();
- Long id = new Long(2);
- String modUserName = "test";
- String jsonPlan = "{\"filter\":{\"validFrom\":\"Oct 14, 2018 2:00:00 AM\",\"validTo\":\"Oct 16, 2018 2:00:00 AM\",\"standbyListId\":1},\"planHeader\":{\"label\":\"Datum/Gruppe\",\"listGroups\":[{\"id\":1,\"title\":\"group1\",\"modificationDate\":\"Aug 6, 2018 2:00:00 AM\"},{\"id\":2,\"title\":\"group2\",\"modificationDate\":\"Aug 6, 2018 2:00:00 AM\"},{\"id\":3,\"title\":\"Sondergruppe\",\"modificationDate\":\"Aug 6, 2018 2:00:00 AM\"}]},\"listPlanRows\":[{\"label\":\"14.10.2018, Sonntag\",\"listGroupBodies\":[[{\"id\":27,\"validFrom\":\"Oct 14, 2018 12:00:00 AM\",\"validTo\":\"Oct 14, 2018 8:00:00 AM\",\"user\":{\"id\":1,\"firstname\":\"Max\",\"lastname\":\"Mustermann\",\"isCompany\":false,\"notes\":\"Test-Notiz\",\"validFrom\":\"Jan 1, 2018 2:00:00 AM\",\"validTo\":\"Jan 1, 2022 2:00:00 AM\",\"modificationDate\":\"Aug 2, 2018 4:57:07 PM\",\"organisation\":{\"id\":1,\"orgaName\":\"TestOrga\",\"address\":{\"id\":1,\"postcode\":\"33100\",\"community\":\"community-sued\",\"communitySuffix\":\"_sued\",\"street\":\"Teststraße 1\",\"housenumber\":\"1\",\"wgs84zone\":\"EPSG-xy\",\"latitude\":\"1.0000\",\"longitude\":\"2.0000\",\"urlMap\":\"www.url.de\"}},\"privateAddress\":{\"id\":3,\"postcode\":\"33100\",\"community\":\"community-sued\",\"communitySuffix\":\"_sued\",\"street\":\"Private Str. 1a\",\"housenumber\":\"1\",\"wgs84zone\":\"EPSG-xy\",\"latitude\":\"1.0000\",\"longitude\":\"2.0000\",\"urlMap\":\"www.url.de\"},\"businessContactData\":{\"id\":1,\"isPrivate\":true,\"phone\":\"0123 456789\",\"cellphone\":\"0123 456789\",\"radiocomm\":\"01234656789\",\"email\":\"test@test.de\",\"pager\":\"0123 456789\"},\"privateContactData\":{\"id\":3,\"isPrivate\":true,\"phone\":\"0123 456789\",\"cellphone\":\"0123 456789\",\"radiocomm\":\"01234656789\",\"email\":\"test@test.de\",\"pager\":\"0123 456789\"},\"lsUserInRegions\":[{\"id\":1,\"regionId\":1,\"regionName\":\"Darmstadt\",\"userId\":1}],\"lsUserFunctions\":[]},\"status\":{\"id\":1,\"title\":\"Plan-Plan\"},\"standbyGroup\":{\"id\":1,\"title\":\"group1\",\"note\":\"Test-Notiz\",\"modificationDate\":\"Aug 6, 2018 2:00:00 AM\",\"nextUserInNextCycle\":false,\"lsUserFunction\":[{\"functionId\":1,\"functionName\":\"Meister Betrieb Strom\"}],\"lsRegions\":[],\"lsIgnoredCalendarDays\":[]}},{\"id\":28,\"validFrom\":\"Oct 14, 2018 8:00:00 AM\",\"validTo\":\"Oct 14, 2018 11:59:59 PM\",\"user\":{\"id\":2,\"firstname\":\"Erika\",\"lastname\":\"Musterfrau\",\"isCompany\":false,\"notes\":\"Test-Notiz\",\"validFrom\":\"Jan 1, 2018 2:00:00 AM\",\"validTo\":\"Jan 1, 2022 2:00:00 AM\",\"modificationDate\":\"Aug 2, 2018 4:57:07 PM\",\"organisation\":{\"id\":2,\"orgaName\":\"Mustermann GmbH\",\"address\":{\"id\":2,\"postcode\":\"33100\",\"community\":\"community-sued\",\"communitySuffix\":\"_sued\",\"street\":\"Teststraße 2\",\"housenumber\":\"1\",\"wgs84zone\":\"EPSG-xy\",\"latitude\":\"1.0000\",\"longitude\":\"2.0000\",\"urlMap\":\"www.url.de\"}},\"privateAddress\":{\"id\":4,\"postcode\":\"33100\",\"community\":\"community-sued\",\"communitySuffix\":\"_sued\",\"street\":\"Am Feldweg 5\",\"housenumber\":\"1\",\"wgs84zone\":\"EPSG-xy\",\"latitude\":\"1.0000\",\"longitude\":\"2.0000\",\"urlMap\":\"www.url.de\"},\"businessContactData\":{\"id\":2,\"isPrivate\":false,\"phone\":\"0123 111111\",\"cellphone\":\"0123 987654\",\"radiocomm\":\"01234656789\",\"email\":\"test@test.de\",\"pager\":\"0123 987654\"},\"privateContactData\":{\"id\":4,\"isPrivate\":false,\"phone\":\"0123 111111\",\"cellphone\":\"0123 987654\",\"radiocomm\":\"01234656789\",\"email\":\"test@test.de\",\"pager\":\"0123 987654\"},\"lsUserInRegions\":[{\"id\":2,\"regionId\":1,\"regionName\":\"Darmstadt\",\"userId\":2},{\"id\":3,\"regionId\":2,\"regionName\":\"Erbach\",\"userId\":2}],\"lsUserFunctions\":[]},\"status\":{\"id\":1,\"title\":\"Plan-Plan\"},\"standbyGroup\":{\"id\":1,\"title\":\"group1\",\"note\":\"Test-Notiz\",\"modificationDate\":\"Aug 6, 2018 2:00:00 AM\",\"nextUserInNextCycle\":false,\"lsUserFunction\":[{\"functionId\":1,\"functionName\":\"Meister Betrieb Strom\"}],\"lsRegions\":[],\"lsIgnoredCalendarDays\":[]}}],[{\"id\":87,\"validFrom\":\"Oct 14, 2018 12:00:00 AM\",\"validTo\":\"Oct 14, 2018 8:00:00 AM\",\"user\":{\"id\":3,\"firstname\":\"N\",\"lastname\":\"N 1\",\"isCompany\":false,\"notes\":\"noch nicht belegter Anwender\",\"validFrom\":\"Jan 1, 2018 12:00:00 AM\",\"validTo\":\"Jan 1, 2033 12:00:00 AM\",\"modificationDate\":\"Sep 26, 2018 6:57:07 AM\",\"organisation\":{\"id\":1,\"orgaName\":\"TestOrga\",\"address\":{\"id\":1,\"postcode\":\"33100\",\"community\":\"community-sued\",\"communitySuffix\":\"_sued\",\"street\":\"Teststraße 1\",\"housenumber\":\"1\",\"wgs84zone\":\"EPSG-xy\",\"latitude\":\"1.0000\",\"longitude\":\"2.0000\",\"urlMap\":\"www.url.de\"}},\"privateAddress\":{\"id\":1,\"postcode\":\"33100\",\"community\":\"community-sued\",\"communitySuffix\":\"_sued\",\"street\":\"Teststraße 1\",\"housenumber\":\"1\",\"wgs84zone\":\"EPSG-xy\",\"latitude\":\"1.0000\",\"longitude\":\"2.0000\",\"urlMap\":\"www.url.de\"},\"businessContactData\":{\"id\":1,\"isPrivate\":true,\"phone\":\"0123 456789\",\"cellphone\":\"0123 456789\",\"radiocomm\":\"01234656789\",\"email\":\"test@test.de\",\"pager\":\"0123 456789\"},\"privateContactData\":{\"id\":1,\"isPrivate\":true,\"phone\":\"0123 456789\",\"cellphone\":\"0123 456789\",\"radiocomm\":\"01234656789\",\"email\":\"test@test.de\",\"pager\":\"0123 456789\"},\"lsUserInRegions\":[],\"lsUserFunctions\":[]},\"status\":{\"id\":1,\"title\":\"Plan-Plan\"},\"standbyGroup\":{\"id\":2,\"title\":\"group2\",\"note\":\"Test-Notiz\",\"modificationDate\":\"Aug 6, 2018 2:00:00 AM\",\"nextUserInNextCycle\":false,\"lsUserFunction\":[{\"functionId\":3,\"functionName\":\"Ingenieure Strom/Gas/Wasser\"}],\"lsRegions\":[],\"lsIgnoredCalendarDays\":[]}},{\"id\":88,\"validFrom\":\"Oct 14, 2018 8:00:00 AM\",\"validTo\":\"Oct 14, 2018 11:59:59 PM\",\"user\":{\"id\":3,\"firstname\":\"N\",\"lastname\":\"N 1\",\"isCompany\":false,\"notes\":\"noch nicht belegter Anwender\",\"validFrom\":\"Jan 1, 2018 12:00:00 AM\",\"validTo\":\"Jan 1, 2033 12:00:00 AM\",\"modificationDate\":\"Sep 26, 2018 6:57:07 AM\",\"organisation\":{\"id\":1,\"orgaName\":\"TestOrga\",\"address\":{\"id\":1,\"postcode\":\"33100\",\"community\":\"community-sued\",\"communitySuffix\":\"_sued\",\"street\":\"Teststraße 1\",\"housenumber\":\"1\",\"wgs84zone\":\"EPSG-xy\",\"latitude\":\"1.0000\",\"longitude\":\"2.0000\",\"urlMap\":\"www.url.de\"}},\"privateAddress\":{\"id\":1,\"postcode\":\"33100\",\"community\":\"community-sued\",\"communitySuffix\":\"_sued\",\"street\":\"Teststraße 1\",\"housenumber\":\"1\",\"wgs84zone\":\"EPSG-xy\",\"latitude\":\"1.0000\",\"longitude\":\"2.0000\",\"urlMap\":\"www.url.de\"},\"businessContactData\":{\"id\":1,\"isPrivate\":true,\"phone\":\"0123 456789\",\"cellphone\":\"0123 456789\",\"radiocomm\":\"01234656789\",\"email\":\"test@test.de\",\"pager\":\"0123 456789\"},\"privateContactData\":{\"id\":1,\"isPrivate\":true,\"phone\":\"0123 456789\",\"cellphone\":\"0123 456789\",\"radiocomm\":\"01234656789\",\"email\":\"test@test.de\",\"pager\":\"0123 456789\"},\"lsUserInRegions\":[],\"lsUserFunctions\":[]},\"status\":{\"id\":1,\"title\":\"Plan-Plan\"},\"standbyGroup\":{\"id\":2,\"title\":\"group2\",\"note\":\"Test-Notiz\",\"modificationDate\":\"Aug 6, 2018 2:00:00 AM\",\"nextUserInNextCycle\":false,\"lsUserFunction\":[{\"functionId\":3,\"functionName\":\"Ingenieure Strom/Gas/Wasser\"}],\"lsRegions\":[],\"lsIgnoredCalendarDays\":[]}}],[{\"id\":147,\"validFrom\":\"Oct 14, 2018 12:00:00 AM\",\"validTo\":\"Oct 14, 2018 8:00:00 AM\",\"user\":{\"id\":7,\"firstname\":\"N\",\"lastname\":\"N 5\",\"isCompany\":false,\"notes\":\"noch nicht belegter Anwender\",\"validFrom\":\"Jan 1, 2018 12:00:00 AM\",\"validTo\":\"Jan 1, 2033 12:00:00 AM\",\"modificationDate\":\"Sep 26, 2018 6:57:07 AM\",\"organisation\":{\"id\":1,\"orgaName\":\"TestOrga\",\"address\":{\"id\":1,\"postcode\":\"33100\",\"community\":\"community-sued\",\"communitySuffix\":\"_sued\",\"street\":\"Teststraße 1\",\"housenumber\":\"1\",\"wgs84zone\":\"EPSG-xy\",\"latitude\":\"1.0000\",\"longitude\":\"2.0000\",\"urlMap\":\"www.url.de\"}},\"privateAddress\":{\"id\":1,\"postcode\":\"33100\",\"community\":\"community-sued\",\"communitySuffix\":\"_sued\",\"street\":\"Teststraße 1\",\"housenumber\":\"1\",\"wgs84zone\":\"EPSG-xy\",\"latitude\":\"1.0000\",\"longitude\":\"2.0000\",\"urlMap\":\"www.url.de\"},\"businessContactData\":{\"id\":1,\"isPrivate\":true,\"phone\":\"0123 456789\",\"cellphone\":\"0123 456789\",\"radiocomm\":\"01234656789\",\"email\":\"test@test.de\",\"pager\":\"0123 456789\"},\"privateContactData\":{\"id\":1,\"isPrivate\":true,\"phone\":\"0123 456789\",\"cellphone\":\"0123 456789\",\"radiocomm\":\"01234656789\",\"email\":\"test@test.de\",\"pager\":\"0123 456789\"},\"lsUserInRegions\":[],\"lsUserFunctions\":[]},\"status\":{\"id\":1,\"title\":\"Plan-Plan\"},\"standbyGroup\":{\"id\":3,\"title\":\"Sondergruppe\",\"note\":\"Test-Notiz\",\"modificationDate\":\"Aug 6, 2018 2:00:00 AM\",\"nextUserInNextCycle\":true,\"lsUserFunction\":[{\"functionId\":4,\"functionName\":\"Meister Betrieb Gas\"}],\"lsRegions\":[],\"lsIgnoredCalendarDays\":[]}},{\"id\":148,\"validFrom\":\"Oct 14, 2018 8:00:00 AM\",\"validTo\":\"Oct 14, 2018 11:59:59 PM\",\"user\":{\"id\":8,\"firstname\":\"N\",\"lastname\":\"N 6\",\"isCompany\":false,\"notes\":\"noch nicht belegter Anwender\",\"validFrom\":\"Jan 1, 2018 12:00:00 AM\",\"validTo\":\"Jan 1, 2033 12:00:00 AM\",\"modificationDate\":\"Sep 26, 2018 6:57:07 AM\",\"organisation\":{\"id\":1,\"orgaName\":\"TestOrga\",\"address\":{\"id\":1,\"postcode\":\"33100\",\"community\":\"community-sued\",\"communitySuffix\":\"_sued\",\"street\":\"Teststraße 1\",\"housenumber\":\"1\",\"wgs84zone\":\"EPSG-xy\",\"latitude\":\"1.0000\",\"longitude\":\"2.0000\",\"urlMap\":\"www.url.de\"}},\"privateAddress\":{\"id\":1,\"postcode\":\"33100\",\"community\":\"community-sued\",\"communitySuffix\":\"_sued\",\"street\":\"Teststraße 1\",\"housenumber\":\"1\",\"wgs84zone\":\"EPSG-xy\",\"latitude\":\"1.0000\",\"longitude\":\"2.0000\",\"urlMap\":\"www.url.de\"},\"businessContactData\":{\"id\":1,\"isPrivate\":true,\"phone\":\"0123 456789\",\"cellphone\":\"0123 456789\",\"radiocomm\":\"01234656789\",\"email\":\"test@test.de\",\"pager\":\"0123 456789\"},\"privateContactData\":{\"id\":1,\"isPrivate\":true,\"phone\":\"0123 456789\",\"cellphone\":\"0123 456789\",\"radiocomm\":\"01234656789\",\"email\":\"test@test.de\",\"pager\":\"0123 456789\"},\"lsUserInRegions\":[],\"lsUserFunctions\":[]},\"status\":{\"id\":1,\"title\":\"Plan-Plan\"},\"standbyGroup\":{\"id\":3,\"title\":\"Sondergruppe\",\"note\":\"Test-Notiz\",\"modificationDate\":\"Aug 6, 2018 2:00:00 AM\",\"nextUserInNextCycle\":true,\"lsUserFunction\":[{\"functionId\":4,\"functionName\":\"Meister Betrieb Gas\"}],\"lsRegions\":[],\"lsIgnoredCalendarDays\":[]}}]]},{\"label\":\"15.10.2018 Montag\",\"listGroupBodies\":[[{\"id\":29,\"validFrom\":\"Oct 15, 2018 12:00:00 AM\",\"validTo\":\"Oct 15, 2018 8:00:00 AM\",\"user\":{\"id\":2,\"firstname\":\"Erika\",\"lastname\":\"Musterfrau\",\"isCompany\":false,\"notes\":\"Test-Notiz\",\"validFrom\":\"Jan 1, 2018 2:00:00 AM\",\"validTo\":\"Jan 1, 2022 2:00:00 AM\",\"modificationDate\":\"Aug 2, 2018 4:57:07 PM\",\"organisation\":{\"id\":2,\"orgaName\":\"Mustermann GmbH\",\"address\":{\"id\":2,\"postcode\":\"33100\",\"community\":\"community-sued\",\"communitySuffix\":\"_sued\",\"street\":\"Teststraße 2\",\"housenumber\":\"1\",\"wgs84zone\":\"EPSG-xy\",\"latitude\":\"1.0000\",\"longitude\":\"2.0000\",\"urlMap\":\"www.url.de\"}},\"privateAddress\":{\"id\":4,\"postcode\":\"33100\",\"community\":\"community-sued\",\"communitySuffix\":\"_sued\",\"street\":\"Am Feldweg 5\",\"housenumber\":\"1\",\"wgs84zone\":\"EPSG-xy\",\"latitude\":\"1.0000\",\"longitude\":\"2.0000\",\"urlMap\":\"www.url.de\"},\"businessContactData\":{\"id\":2,\"isPrivate\":false,\"phone\":\"0123 111111\",\"cellphone\":\"0123 987654\",\"radiocomm\":\"01234656789\",\"email\":\"test@test.de\",\"pager\":\"0123 987654\"},\"privateContactData\":{\"id\":4,\"isPrivate\":false,\"phone\":\"0123 111111\",\"cellphone\":\"0123 987654\",\"radiocomm\":\"01234656789\",\"email\":\"test@test.de\",\"pager\":\"0123 987654\"},\"lsUserInRegions\":[{\"id\":2,\"regionId\":1,\"regionName\":\"Darmstadt\",\"userId\":2},{\"id\":3,\"regionId\":2,\"regionName\":\"Erbach\",\"userId\":2}],\"lsUserFunctions\":[]},\"status\":{\"id\":1,\"title\":\"Plan-Plan\"},\"standbyGroup\":{\"id\":1,\"title\":\"group1\",\"note\":\"Test-Notiz\",\"modificationDate\":\"Aug 6, 2018 2:00:00 AM\",\"nextUserInNextCycle\":false,\"lsUserFunction\":[{\"functionId\":1,\"functionName\":\"Meister Betrieb Strom\"}],\"lsRegions\":[],\"lsIgnoredCalendarDays\":[]}},{\"id\":30,\"validFrom\":\"Oct 15, 2018 4:00:00 PM\",\"validTo\":\"Oct 15, 2018 11:59:59 PM\",\"user\":{\"id\":3,\"firstname\":\"N\",\"lastname\":\"N 1\",\"isCompany\":false,\"notes\":\"noch nicht belegter Anwender\",\"validFrom\":\"Jan 1, 2018 12:00:00 AM\",\"validTo\":\"Jan 1, 2033 12:00:00 AM\",\"modificationDate\":\"Sep 26, 2018 6:57:07 AM\",\"organisation\":{\"id\":1,\"orgaName\":\"TestOrga\",\"address\":{\"id\":1,\"postcode\":\"33100\",\"community\":\"community-sued\",\"communitySuffix\":\"_sued\",\"street\":\"Teststraße 1\",\"housenumber\":\"1\",\"wgs84zone\":\"EPSG-xy\",\"latitude\":\"1.0000\",\"longitude\":\"2.0000\",\"urlMap\":\"www.url.de\"}},\"privateAddress\":{\"id\":1,\"postcode\":\"33100\",\"community\":\"community-sued\",\"communitySuffix\":\"_sued\",\"street\":\"Teststraße 1\",\"housenumber\":\"1\",\"wgs84zone\":\"EPSG-xy\",\"latitude\":\"1.0000\",\"longitude\":\"2.0000\",\"urlMap\":\"www.url.de\"},\"businessContactData\":{\"id\":1,\"isPrivate\":true,\"phone\":\"0123 456789\",\"cellphone\":\"0123 456789\",\"radiocomm\":\"01234656789\",\"email\":\"test@test.de\",\"pager\":\"0123 456789\"},\"privateContactData\":{\"id\":1,\"isPrivate\":true,\"phone\":\"0123 456789\",\"cellphone\":\"0123 456789\",\"radiocomm\":\"01234656789\",\"email\":\"test@test.de\",\"pager\":\"0123 456789\"},\"lsUserInRegions\":[],\"lsUserFunctions\":[]},\"status\":{\"id\":1,\"title\":\"Plan-Plan\"},\"standbyGroup\":{\"id\":1,\"title\":\"group1\",\"note\":\"Test-Notiz\",\"modificationDate\":\"Aug 6, 2018 2:00:00 AM\",\"nextUserInNextCycle\":false,\"lsUserFunction\":[{\"functionId\":1,\"functionName\":\"Meister Betrieb Strom\"}],\"lsRegions\":[],\"lsIgnoredCalendarDays\":[]}}],[{\"id\":89,\"validFrom\":\"Oct 15, 2018 12:00:00 AM\",\"validTo\":\"Oct 15, 2018 8:00:00 AM\",\"user\":{\"id\":3,\"firstname\":\"N\",\"lastname\":\"N 1\",\"isCompany\":false,\"notes\":\"noch nicht belegter Anwender\",\"validFrom\":\"Jan 1, 2018 12:00:00 AM\",\"validTo\":\"Jan 1, 2033 12:00:00 AM\",\"modificationDate\":\"Sep 26, 2018 6:57:07 AM\",\"organisation\":{\"id\":1,\"orgaName\":\"TestOrga\",\"address\":{\"id\":1,\"postcode\":\"33100\",\"community\":\"community-sued\",\"communitySuffix\":\"_sued\",\"street\":\"Teststraße 1\",\"housenumber\":\"1\",\"wgs84zone\":\"EPSG-xy\",\"latitude\":\"1.0000\",\"longitude\":\"2.0000\",\"urlMap\":\"www.url.de\"}},\"privateAddress\":{\"id\":1,\"postcode\":\"33100\",\"community\":\"community-sued\",\"communitySuffix\":\"_sued\",\"street\":\"Teststraße 1\",\"housenumber\":\"1\",\"wgs84zone\":\"EPSG-xy\",\"latitude\":\"1.0000\",\"longitude\":\"2.0000\",\"urlMap\":\"www.url.de\"},\"businessContactData\":{\"id\":1,\"isPrivate\":true,\"phone\":\"0123 456789\",\"cellphone\":\"0123 456789\",\"radiocomm\":\"01234656789\",\"email\":\"test@test.de\",\"pager\":\"0123 456789\"},\"privateContactData\":{\"id\":1,\"isPrivate\":true,\"phone\":\"0123 456789\",\"cellphone\":\"0123 456789\",\"radiocomm\":\"01234656789\",\"email\":\"test@test.de\",\"pager\":\"0123 456789\"},\"lsUserInRegions\":[],\"lsUserFunctions\":[]},\"status\":{\"id\":1,\"title\":\"Plan-Plan\"},\"standbyGroup\":{\"id\":2,\"title\":\"group2\",\"note\":\"Test-Notiz\",\"modificationDate\":\"Aug 6, 2018 2:00:00 AM\",\"nextUserInNextCycle\":false,\"lsUserFunction\":[{\"functionId\":3,\"functionName\":\"Ingenieure Strom/Gas/Wasser\"}],\"lsRegions\":[],\"lsIgnoredCalendarDays\":[]}},{\"id\":90,\"validFrom\":\"Oct 15, 2018 4:00:00 PM\",\"validTo\":\"Oct 15, 2018 11:59:59 PM\",\"user\":{\"id\":3,\"firstname\":\"N\",\"lastname\":\"N 1\",\"isCompany\":false,\"notes\":\"noch nicht belegter Anwender\",\"validFrom\":\"Jan 1, 2018 12:00:00 AM\",\"validTo\":\"Jan 1, 2033 12:00:00 AM\",\"modificationDate\":\"Sep 26, 2018 6:57:07 AM\",\"organisation\":{\"id\":1,\"orgaName\":\"TestOrga\",\"address\":{\"id\":1,\"postcode\":\"33100\",\"community\":\"community-sued\",\"communitySuffix\":\"_sued\",\"street\":\"Teststraße 1\",\"housenumber\":\"1\",\"wgs84zone\":\"EPSG-xy\",\"latitude\":\"1.0000\",\"longitude\":\"2.0000\",\"urlMap\":\"www.url.de\"}},\"privateAddress\":{\"id\":1,\"postcode\":\"33100\",\"community\":\"community-sued\",\"communitySuffix\":\"_sued\",\"street\":\"Teststraße 1\",\"housenumber\":\"1\",\"wgs84zone\":\"EPSG-xy\",\"latitude\":\"1.0000\",\"longitude\":\"2.0000\",\"urlMap\":\"www.url.de\"},\"businessContactData\":{\"id\":1,\"isPrivate\":true,\"phone\":\"0123 456789\",\"cellphone\":\"0123 456789\",\"radiocomm\":\"01234656789\",\"email\":\"test@test.de\",\"pager\":\"0123 456789\"},\"privateContactData\":{\"id\":1,\"isPrivate\":true,\"phone\":\"0123 456789\",\"cellphone\":\"0123 456789\",\"radiocomm\":\"01234656789\",\"email\":\"test@test.de\",\"pager\":\"0123 456789\"},\"lsUserInRegions\":[],\"lsUserFunctions\":[]},\"status\":{\"id\":1,\"title\":\"Plan-Plan\"},\"standbyGroup\":{\"id\":2,\"title\":\"group2\",\"note\":\"Test-Notiz\",\"modificationDate\":\"Aug 6, 2018 2:00:00 AM\",\"nextUserInNextCycle\":false,\"lsUserFunction\":[{\"functionId\":3,\"functionName\":\"Ingenieure Strom/Gas/Wasser\"}],\"lsRegions\":[],\"lsIgnoredCalendarDays\":[]}}],[{\"id\":149,\"validFrom\":\"Oct 15, 2018 12:00:00 AM\",\"validTo\":\"Oct 15, 2018 8:00:00 AM\",\"user\":{\"id\":8,\"firstname\":\"N\",\"lastname\":\"N 6\",\"isCompany\":false,\"notes\":\"noch nicht belegter Anwender\",\"validFrom\":\"Jan 1, 2018 12:00:00 AM\",\"validTo\":\"Jan 1, 2033 12:00:00 AM\",\"modificationDate\":\"Sep 26, 2018 6:57:07 AM\",\"organisation\":{\"id\":1,\"orgaName\":\"TestOrga\",\"address\":{\"id\":1,\"postcode\":\"33100\",\"community\":\"community-sued\",\"communitySuffix\":\"_sued\",\"street\":\"Teststraße 1\",\"housenumber\":\"1\",\"wgs84zone\":\"EPSG-xy\",\"latitude\":\"1.0000\",\"longitude\":\"2.0000\",\"urlMap\":\"www.url.de\"}},\"privateAddress\":{\"id\":1,\"postcode\":\"33100\",\"community\":\"community-sued\",\"communitySuffix\":\"_sued\",\"street\":\"Teststraße 1\",\"housenumber\":\"1\",\"wgs84zone\":\"EPSG-xy\",\"latitude\":\"1.0000\",\"longitude\":\"2.0000\",\"urlMap\":\"www.url.de\"},\"businessContactData\":{\"id\":1,\"isPrivate\":true,\"phone\":\"0123 456789\",\"cellphone\":\"0123 456789\",\"radiocomm\":\"01234656789\",\"email\":\"test@test.de\",\"pager\":\"0123 456789\"},\"privateContactData\":{\"id\":1,\"isPrivate\":true,\"phone\":\"0123 456789\",\"cellphone\":\"0123 456789\",\"radiocomm\":\"01234656789\",\"email\":\"test@test.de\",\"pager\":\"0123 456789\"},\"lsUserInRegions\":[],\"lsUserFunctions\":[]},\"status\":{\"id\":1,\"title\":\"Plan-Plan\"},\"standbyGroup\":{\"id\":3,\"title\":\"Sondergruppe\",\"note\":\"Test-Notiz\",\"modificationDate\":\"Aug 6, 2018 2:00:00 AM\",\"nextUserInNextCycle\":true,\"lsUserFunction\":[{\"functionId\":4,\"functionName\":\"Meister Betrieb Gas\"}],\"lsRegions\":[],\"lsIgnoredCalendarDays\":[]}},{\"id\":150,\"validFrom\":\"Oct 15, 2018 4:00:00 PM\",\"validTo\":\"Oct 15, 2018 11:59:59 PM\",\"user\":{\"id\":9,\"firstname\":\"N\",\"lastname\":\"N 7\",\"isCompany\":false,\"notes\":\"noch nicht belegter Anwender\",\"validFrom\":\"Jan 1, 2018 12:00:00 AM\",\"validTo\":\"Jan 1, 2033 12:00:00 AM\",\"modificationDate\":\"Sep 26, 2018 6:57:07 AM\",\"organisation\":{\"id\":1,\"orgaName\":\"TestOrga\",\"address\":{\"id\":1,\"postcode\":\"33100\",\"community\":\"community-sued\",\"communitySuffix\":\"_sued\",\"street\":\"Teststraße 1\",\"housenumber\":\"1\",\"wgs84zone\":\"EPSG-xy\",\"latitude\":\"1.0000\",\"longitude\":\"2.0000\",\"urlMap\":\"www.url.de\"}},\"privateAddress\":{\"id\":1,\"postcode\":\"33100\",\"community\":\"community-sued\",\"communitySuffix\":\"_sued\",\"street\":\"Teststraße 1\",\"housenumber\":\"1\",\"wgs84zone\":\"EPSG-xy\",\"latitude\":\"1.0000\",\"longitude\":\"2.0000\",\"urlMap\":\"www.url.de\"},\"businessContactData\":{\"id\":1,\"isPrivate\":true,\"phone\":\"0123 456789\",\"cellphone\":\"0123 456789\",\"radiocomm\":\"01234656789\",\"email\":\"test@test.de\",\"pager\":\"0123 456789\"},\"privateContactData\":{\"id\":1,\"isPrivate\":true,\"phone\":\"0123 456789\",\"cellphone\":\"0123 456789\",\"radiocomm\":\"01234656789\",\"email\":\"test@test.de\",\"pager\":\"0123 456789\"},\"lsUserInRegions\":[],\"lsUserFunctions\":[]},\"status\":{\"id\":1,\"title\":\"Plan-Plan\"},\"standbyGroup\":{\"id\":3,\"title\":\"Sondergruppe\",\"note\":\"Test-Notiz\",\"modificationDate\":\"Aug 6, 2018 2:00:00 AM\",\"nextUserInNextCycle\":true,\"lsUserFunction\":[{\"functionId\":4,\"functionName\":\"Meister Betrieb Gas\"}],\"lsRegions\":[],\"lsIgnoredCalendarDays\":[]}}]]},{\"label\":\"16.10.2018, Dienstag\",\"listGroupBodies\":[[{\"id\":31,\"validFrom\":\"Oct 16, 2018 12:00:00 AM\",\"validTo\":\"Oct 16, 2018 8:00:00 AM\",\"user\":{\"id\":3,\"firstname\":\"N\",\"lastname\":\"N 1\",\"isCompany\":false,\"notes\":\"noch nicht belegter Anwender\",\"validFrom\":\"Jan 1, 2018 12:00:00 AM\",\"validTo\":\"Jan 1, 2033 12:00:00 AM\",\"modificationDate\":\"Sep 26, 2018 6:57:07 AM\",\"organisation\":{\"id\":1,\"orgaName\":\"TestOrga\",\"address\":{\"id\":1,\"postcode\":\"33100\",\"community\":\"community-sued\",\"communitySuffix\":\"_sued\",\"street\":\"Teststraße 1\",\"housenumber\":\"1\",\"wgs84zone\":\"EPSG-xy\",\"latitude\":\"1.0000\",\"longitude\":\"2.0000\",\"urlMap\":\"www.url.de\"}},\"privateAddress\":{\"id\":1,\"postcode\":\"33100\",\"community\":\"community-sued\",\"communitySuffix\":\"_sued\",\"street\":\"Teststraße 1\",\"housenumber\":\"1\",\"wgs84zone\":\"EPSG-xy\",\"latitude\":\"1.0000\",\"longitude\":\"2.0000\",\"urlMap\":\"www.url.de\"},\"businessContactData\":{\"id\":1,\"isPrivate\":true,\"phone\":\"0123 456789\",\"cellphone\":\"0123 456789\",\"radiocomm\":\"01234656789\",\"email\":\"test@test.de\",\"pager\":\"0123 456789\"},\"privateContactData\":{\"id\":1,\"isPrivate\":true,\"phone\":\"0123 456789\",\"cellphone\":\"0123 456789\",\"radiocomm\":\"01234656789\",\"email\":\"test@test.de\",\"pager\":\"0123 456789\"},\"lsUserInRegions\":[],\"lsUserFunctions\":[]},\"status\":{\"id\":1,\"title\":\"Plan-Plan\"},\"standbyGroup\":{\"id\":1,\"title\":\"group1\",\"note\":\"Test-Notiz\",\"modificationDate\":\"Aug 6, 2018 2:00:00 AM\",\"nextUserInNextCycle\":false,\"lsUserFunction\":[{\"functionId\":1,\"functionName\":\"Meister Betrieb Strom\"}],\"lsRegions\":[],\"lsIgnoredCalendarDays\":[]}},{\"id\":32,\"validFrom\":\"Oct 16, 2018 4:00:00 PM\",\"validTo\":\"Oct 16, 2018 11:59:59 PM\",\"user\":{\"id\":4,\"firstname\":\"N\",\"lastname\":\"N 2\",\"isCompany\":false,\"notes\":\"noch nicht belegter Anwender\",\"validFrom\":\"Jan 1, 2018 12:00:00 AM\",\"validTo\":\"Jan 1, 2033 12:00:00 AM\",\"modificationDate\":\"Sep 26, 2018 6:57:07 AM\",\"organisation\":{\"id\":1,\"orgaName\":\"TestOrga\",\"address\":{\"id\":1,\"postcode\":\"33100\",\"community\":\"community-sued\",\"communitySuffix\":\"_sued\",\"street\":\"Teststraße 1\",\"housenumber\":\"1\",\"wgs84zone\":\"EPSG-xy\",\"latitude\":\"1.0000\",\"longitude\":\"2.0000\",\"urlMap\":\"www.url.de\"}},\"privateAddress\":{\"id\":1,\"postcode\":\"33100\",\"community\":\"community-sued\",\"communitySuffix\":\"_sued\",\"street\":\"Teststraße 1\",\"housenumber\":\"1\",\"wgs84zone\":\"EPSG-xy\",\"latitude\":\"1.0000\",\"longitude\":\"2.0000\",\"urlMap\":\"www.url.de\"},\"businessContactData\":{\"id\":1,\"isPrivate\":true,\"phone\":\"0123 456789\",\"cellphone\":\"0123 456789\",\"radiocomm\":\"01234656789\",\"email\":\"test@test.de\",\"pager\":\"0123 456789\"},\"privateContactData\":{\"id\":1,\"isPrivate\":true,\"phone\":\"0123 456789\",\"cellphone\":\"0123 456789\",\"radiocomm\":\"01234656789\",\"email\":\"test@test.de\",\"pager\":\"0123 456789\"},\"lsUserInRegions\":[],\"lsUserFunctions\":[]},\"status\":{\"id\":1,\"title\":\"Plan-Plan\"},\"standbyGroup\":{\"id\":1,\"title\":\"group1\",\"note\":\"Test-Notiz\",\"modificationDate\":\"Aug 6, 2018 2:00:00 AM\",\"nextUserInNextCycle\":false,\"lsUserFunction\":[{\"functionId\":1,\"functionName\":\"Meister Betrieb Strom\"}],\"lsRegions\":[],\"lsIgnoredCalendarDays\":[]}}],[{\"id\":91,\"validFrom\":\"Oct 16, 2018 12:00:00 AM\",\"validTo\":\"Oct 16, 2018 8:00:00 AM\",\"user\":{\"id\":3,\"firstname\":\"N\",\"lastname\":\"N 1\",\"isCompany\":false,\"notes\":\"noch nicht belegter Anwender\",\"validFrom\":\"Jan 1, 2018 12:00:00 AM\",\"validTo\":\"Jan 1, 2033 12:00:00 AM\",\"modificationDate\":\"Sep 26, 2018 6:57:07 AM\",\"organisation\":{\"id\":1,\"orgaName\":\"TestOrga\",\"address\":{\"id\":1,\"postcode\":\"33100\",\"community\":\"community-sued\",\"communitySuffix\":\"_sued\",\"street\":\"Teststraße 1\",\"housenumber\":\"1\",\"wgs84zone\":\"EPSG-xy\",\"latitude\":\"1.0000\",\"longitude\":\"2.0000\",\"urlMap\":\"www.url.de\"}},\"privateAddress\":{\"id\":1,\"postcode\":\"33100\",\"community\":\"community-sued\",\"communitySuffix\":\"_sued\",\"street\":\"Teststraße 1\",\"housenumber\":\"1\",\"wgs84zone\":\"EPSG-xy\",\"latitude\":\"1.0000\",\"longitude\":\"2.0000\",\"urlMap\":\"www.url.de\"},\"businessContactData\":{\"id\":1,\"isPrivate\":true,\"phone\":\"0123 456789\",\"cellphone\":\"0123 456789\",\"radiocomm\":\"01234656789\",\"email\":\"test@test.de\",\"pager\":\"0123 456789\"},\"privateContactData\":{\"id\":1,\"isPrivate\":true,\"phone\":\"0123 456789\",\"cellphone\":\"0123 456789\",\"radiocomm\":\"01234656789\",\"email\":\"test@test.de\",\"pager\":\"0123 456789\"},\"lsUserInRegions\":[],\"lsUserFunctions\":[]},\"status\":{\"id\":1,\"title\":\"Plan-Plan\"},\"standbyGroup\":{\"id\":2,\"title\":\"group2\",\"note\":\"Test-Notiz\",\"modificationDate\":\"Aug 6, 2018 2:00:00 AM\",\"nextUserInNextCycle\":false,\"lsUserFunction\":[{\"functionId\":3,\"functionName\":\"Ingenieure Strom/Gas/Wasser\"}],\"lsRegions\":[],\"lsIgnoredCalendarDays\":[]}},{\"id\":92,\"validFrom\":\"Oct 16, 2018 4:00:00 PM\",\"validTo\":\"Oct 16, 2018 11:59:59 PM\",\"user\":{\"id\":1,\"firstname\":\"Max\",\"lastname\":\"Mustermann\",\"isCompany\":false,\"notes\":\"Test-Notiz\",\"validFrom\":\"Jan 1, 2018 2:00:00 AM\",\"validTo\":\"Jan 1, 2022 2:00:00 AM\",\"modificationDate\":\"Aug 2, 2018 4:57:07 PM\",\"organisation\":{\"id\":1,\"orgaName\":\"TestOrga\",\"address\":{\"id\":1,\"postcode\":\"33100\",\"community\":\"community-sued\",\"communitySuffix\":\"_sued\",\"street\":\"Teststraße 1\",\"housenumber\":\"1\",\"wgs84zone\":\"EPSG-xy\",\"latitude\":\"1.0000\",\"longitude\":\"2.0000\",\"urlMap\":\"www.url.de\"}},\"privateAddress\":{\"id\":3,\"postcode\":\"33100\",\"community\":\"community-sued\",\"communitySuffix\":\"_sued\",\"street\":\"Private Str. 1a\",\"housenumber\":\"1\",\"wgs84zone\":\"EPSG-xy\",\"latitude\":\"1.0000\",\"longitude\":\"2.0000\",\"urlMap\":\"www.url.de\"},\"businessContactData\":{\"id\":1,\"isPrivate\":true,\"phone\":\"0123 456789\",\"cellphone\":\"0123 456789\",\"radiocomm\":\"01234656789\",\"email\":\"test@test.de\",\"pager\":\"0123 456789\"},\"privateContactData\":{\"id\":3,\"isPrivate\":true,\"phone\":\"0123 456789\",\"cellphone\":\"0123 456789\",\"radiocomm\":\"01234656789\",\"email\":\"test@test.de\",\"pager\":\"0123 456789\"},\"lsUserInRegions\":[{\"id\":1,\"regionId\":1,\"regionName\":\"Darmstadt\",\"userId\":1}],\"lsUserFunctions\":[]},\"status\":{\"id\":1,\"title\":\"Plan-Plan\"},\"standbyGroup\":{\"id\":2,\"title\":\"group2\",\"note\":\"Test-Notiz\",\"modificationDate\":\"Aug 6, 2018 2:00:00 AM\",\"nextUserInNextCycle\":false,\"lsUserFunction\":[{\"functionId\":3,\"functionName\":\"Ingenieure Strom/Gas/Wasser\"}],\"lsRegions\":[],\"lsIgnoredCalendarDays\":[]}}],[{\"id\":151,\"validFrom\":\"Oct 16, 2018 12:00:00 AM\",\"validTo\":\"Oct 16, 2018 8:00:00 AM\",\"user\":{\"id\":9,\"firstname\":\"N\",\"lastname\":\"N 7\",\"isCompany\":false,\"notes\":\"noch nicht belegter Anwender\",\"validFrom\":\"Jan 1, 2018 12:00:00 AM\",\"validTo\":\"Jan 1, 2033 12:00:00 AM\",\"modificationDate\":\"Sep 26, 2018 6:57:07 AM\",\"organisation\":{\"id\":1,\"orgaName\":\"TestOrga\",\"address\":{\"id\":1,\"postcode\":\"33100\",\"community\":\"community-sued\",\"communitySuffix\":\"_sued\",\"street\":\"Teststraße 1\",\"housenumber\":\"1\",\"wgs84zone\":\"EPSG-xy\",\"latitude\":\"1.0000\",\"longitude\":\"2.0000\",\"urlMap\":\"www.url.de\"}},\"privateAddress\":{\"id\":1,\"postcode\":\"33100\",\"community\":\"community-sued\",\"communitySuffix\":\"_sued\",\"street\":\"Teststraße 1\",\"housenumber\":\"1\",\"wgs84zone\":\"EPSG-xy\",\"latitude\":\"1.0000\",\"longitude\":\"2.0000\",\"urlMap\":\"www.url.de\"},\"businessContactData\":{\"id\":1,\"isPrivate\":true,\"phone\":\"0123 456789\",\"cellphone\":\"0123 456789\",\"radiocomm\":\"01234656789\",\"email\":\"test@test.de\",\"pager\":\"0123 456789\"},\"privateContactData\":{\"id\":1,\"isPrivate\":true,\"phone\":\"0123 456789\",\"cellphone\":\"0123 456789\",\"radiocomm\":\"01234656789\",\"email\":\"test@test.de\",\"pager\":\"0123 456789\"},\"lsUserInRegions\":[],\"lsUserFunctions\":[]},\"status\":{\"id\":1,\"title\":\"Plan-Plan\"},\"standbyGroup\":{\"id\":3,\"title\":\"Sondergruppe\",\"note\":\"Test-Notiz\",\"modificationDate\":\"Aug 6, 2018 2:00:00 AM\",\"nextUserInNextCycle\":true,\"lsUserFunction\":[{\"functionId\":4,\"functionName\":\"Meister Betrieb Gas\"}],\"lsRegions\":[],\"lsIgnoredCalendarDays\":[]}},{\"id\":152,\"validFrom\":\"Oct 16, 2018 4:00:00 PM\",\"validTo\":\"Oct 16, 2018 11:59:59 PM\",\"user\":{\"id\":9,\"firstname\":\"N\",\"lastname\":\"N 7\",\"isCompany\":false,\"notes\":\"noch nicht belegter Anwender\",\"validFrom\":\"Jan 1, 2018 12:00:00 AM\",\"validTo\":\"Jan 1, 2033 12:00:00 AM\",\"modificationDate\":\"Sep 26, 2018 6:57:07 AM\",\"organisation\":{\"id\":1,\"orgaName\":\"TestOrga\",\"address\":{\"id\":1,\"postcode\":\"33100\",\"community\":\"community-sued\",\"communitySuffix\":\"_sued\",\"street\":\"Teststraße 1\",\"housenumber\":\"1\",\"wgs84zone\":\"EPSG-xy\",\"latitude\":\"1.0000\",\"longitude\":\"2.0000\",\"urlMap\":\"www.url.de\"}},\"privateAddress\":{\"id\":1,\"postcode\":\"33100\",\"community\":\"community-sued\",\"communitySuffix\":\"_sued\",\"street\":\"Teststraße 1\",\"housenumber\":\"1\",\"wgs84zone\":\"EPSG-xy\",\"latitude\":\"1.0000\",\"longitude\":\"2.0000\",\"urlMap\":\"www.url.de\"},\"businessContactData\":{\"id\":1,\"isPrivate\":true,\"phone\":\"0123 456789\",\"cellphone\":\"0123 456789\",\"radiocomm\":\"01234656789\",\"email\":\"test@test.de\",\"pager\":\"0123 456789\"},\"privateContactData\":{\"id\":1,\"isPrivate\":true,\"phone\":\"0123 456789\",\"cellphone\":\"0123 456789\",\"radiocomm\":\"01234656789\",\"email\":\"test@test.de\",\"pager\":\"0123 456789\"},\"lsUserInRegions\":[],\"lsUserFunctions\":[]},\"status\":{\"id\":1,\"title\":\"Plan-Plan\"},\"standbyGroup\":{\"id\":3,\"title\":\"Sondergruppe\",\"note\":\"Test-Notiz\",\"modificationDate\":\"Aug 6, 2018 2:00:00 AM\",\"nextUserInNextCycle\":true,\"lsUserFunction\":[{\"functionId\":4,\"functionName\":\"Meister Betrieb Gas\"}],\"lsRegions\":[],\"lsIgnoredCalendarDays\":[]}}]]}]}";
+ List<StandbyScheduleBody> response = bodyDataCopyController.deleteExistingBodysInIntervall(null, lsMsg);
- StandbyStatus status = new StandbyStatus();
- ArchiveStandbyScheduleHeader header = new ArchiveStandbyScheduleHeader();
-
- header.setJsonPlan(jsonPlan);
- PlanningMsgResponseDto responseDto;
-
- // Mockito.when(archiveRepository.exists(Mockito.anyLong())).thenReturn(true);
- Mockito.when(standbyStatusRepository.findOne(Mockito.anyLong())).thenReturn(status);
- // Mockito.when(archiveRepository.findOne(Mockito.anyLong())).thenReturn(header);
-
- List<StandbyScheduleBody> response = bodyDataCopyController.deleteExistingBodysInIntervall(id, dateIndex,
- dateIndex, status, lsMsg);
-
- assertNotNull(response);
+ assertNull(response);
}
@Test
public void deleteExistingBodysInIntervall2() throws SpException {
+ FileHelperTest fh = new FileHelperTest();
+ String json = fh.loadStringFromResource("testStandbyScheduleBodySearchList.json");
- boolean doOnce = false;
- Long id = new Long(1);
- Date dateIndex = new Date();
- StandbyStatus status = new StandbyStatus();
+ List<StandbyScheduleBody> lsStandbyScheduleBody = (List<StandbyScheduleBody>) new Gson().fromJson(json,
+ GsonTypeHelper.JSON_TYPE_STANDBYBODY_ARRAY_LIST);
+
List<PlanningMsgDto> lsMsg = new ArrayList<>();
- List<StandbyScheduleBody> listBodyTarget = new ArrayList<>();
- StandbyScheduleBody standbyScheduleBody = new StandbyScheduleBody();
- listBodyTarget.add(standbyScheduleBody);
- // Mockito.when(archiveRepository.exists(Mockito.anyLong())).thenReturn(true);
- Mockito.when(standbyStatusRepository.findOne(Mockito.anyLong())).thenReturn(status);
-
- Mockito.when(plannedDataController.getPlannedBodysForGroupAndDayAndStatus(Mockito.anyLong(), Mockito.any(),
- Mockito.any())).thenReturn(listBodyTarget);
-
- List<StandbyScheduleBody> response = bodyDataCopyController.deleteExistingBodysInIntervall(id, dateIndex,
- dateIndex, status, lsMsg);
+ List<StandbyScheduleBody> response = bodyDataCopyController
+ .deleteExistingBodysInIntervall(lsStandbyScheduleBody, lsMsg);
assertNotNull(response);
