BP-832 fix bugs
diff --git a/oKBereitschaftsplanungBackend/src/main/java/org/eclipse/openk/sp/controller/SearchController.java b/oKBereitschaftsplanungBackend/src/main/java/org/eclipse/openk/sp/controller/SearchController.java
index 0c3217b..ab91541 100644
--- a/oKBereitschaftsplanungBackend/src/main/java/org/eclipse/openk/sp/controller/SearchController.java
+++ b/oKBereitschaftsplanungBackend/src/main/java/org/eclipse/openk/sp/controller/SearchController.java
@@ -128,8 +128,6 @@
public List<StandbyScheduleBodySearchDto> sortBodies(StandbyScheduleSearchDto standbyScheduleSearchDto,
List<StandbyScheduleBody> listFilteredBodies) {
- Map<Long, List<UserInStandbyGroupSelectionDto>> userInGroupList = new HashMap<>();
-
List<StandbyScheduleBodySearchDto> listBodyDtoBranchDirectHit = new ArrayList<>();
List<StandbyScheduleBodySearchDto> listBodyDtoIndirectHit = new ArrayList<>();
Map<Long, List<StandbyScheduleBodySearchDto>> mapGroupBranch = new HashMap<>();
diff --git a/oKBereitschaftsplanungBackend/src/main/java/org/eclipse/openk/sp/util/MockReportInputDto.java b/oKBereitschaftsplanungBackend/src/main/java/org/eclipse/openk/sp/util/MockReportInputDto.java
deleted file mode 100644
index 979eddb..0000000
--- a/oKBereitschaftsplanungBackend/src/main/java/org/eclipse/openk/sp/util/MockReportInputDto.java
+++ /dev/null
@@ -1,210 +0,0 @@
-package org.eclipse.openk.sp.util;
-
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.List;
-import java.util.Random;
-
-import org.eclipse.openk.sp.db.model.Address;
-import org.eclipse.openk.sp.db.model.ContactData;
-import org.eclipse.openk.sp.db.model.StandbyGroup;
-import org.eclipse.openk.sp.db.model.StandbyScheduleBody;
-import org.eclipse.openk.sp.db.model.User;
-import org.eclipse.openk.sp.db.model.UserFunction;
-import org.eclipse.openk.sp.dto.StandbyGroupSelectionDto;
-import org.eclipse.openk.sp.dto.report.ReportDto;
-import org.eclipse.openk.sp.dto.report.ReportGroupDto;
-import org.eclipse.openk.sp.dto.report.ReportInputDto;
-
-public class MockReportInputDto {
-
- protected int idx = 0;
-
- public List<ReportGroupDto> createGroupDto() {
-
- List<ReportGroupDto> list = new ArrayList<>();
-
- StandbyGroupSelectionDto group1 = new StandbyGroupSelectionDto();
- group1.setTitle("Konditoren und Liniengestalter");
- StandbyGroupSelectionDto group2 = new StandbyGroupSelectionDto();
- group2.setTitle("Berliner Wassergrundwerkspezialisten");
- StandbyGroupSelectionDto group3 = new StandbyGroupSelectionDto();
- group3.setTitle("Nürnberge Stromversorger");
-
- UserFunction function = new UserFunction();
- List<UserFunction> functions = new ArrayList<>();
- functions.add(function);
- function.setFunctionName("Funktion des Todes");
-
- String username = "Max Mustermann \n 0123 456789 \n 0123 456789 \n\n Frank Ministrone \n 0123 456789 \n 0123 456789 \n\n Domeniko Barbossa \n 0123 456789 \n 0123 456789 \n";
-
- for (int i = 0; i < 1000; i++) {
-
- ReportGroupDto reportGroupDto = new ReportGroupDto();
- reportGroupDto.setUser1(username);
- reportGroupDto.setUser2(username);
- reportGroupDto.setUser3(username);
- reportGroupDto.setUser4(username);
- reportGroupDto.setUser5(username);
- reportGroupDto.setUser6(username);
- reportGroupDto.setUser7(username);
- reportGroupDto.setUser8(username);
- reportGroupDto.setUser9(username);
- reportGroupDto.setUser10(username);
- reportGroupDto.setFromDate(new Date());
- reportGroupDto.setGroup1(group1);
- reportGroupDto.setGroup2(group2);
- reportGroupDto.setGroup3(group2);
- reportGroupDto.setGroup4(group3);
- reportGroupDto.setGroup5(group2);
- reportGroupDto.setGroup6(group2);
- reportGroupDto.setGroup7(group1);
- reportGroupDto.setGroup8(group2);
- reportGroupDto.setGroup9(group2);
- reportGroupDto.setGroup10(group3);
- list.add(reportGroupDto);
- }
-
- return list;
- }
-
- public static void main(String[] args) throws IOException {
-
- List<StandbyScheduleBody> bodyList = new ArrayList<>();
-
- for (ReportInputDto dto : create()) {
- bodyList.add(dto.getStandbyScheduleBody());
- }
-
-// List<ReportGroupDto> groupObjects = ReportGroupDtoConverter.convert(bodyList);
-//
-// System.out.println("Convertierte Objekte: " + groupObjects.size() + " von " + bodyList.size());
-//
-// for (ReportGroupDto groupDto : groupObjects) {
-// System.out.println("User1: " + groupDto.getUser1() + "User2: " + groupDto.getUser2());
-// }
-
- }
-
- public static List<StandbyScheduleBody> createStandbyList() throws IOException {
-
- List<StandbyScheduleBody> list = new ArrayList<>();
-
- ReportDto a = new ReportDto("Wochenplan");
- StandbyGroup group1 = new StandbyGroup();
- group1.setTitle("Elektriker");
- StandbyGroup group2 = new StandbyGroup();
- group2.setTitle("Wasserwirte");
-
- a.setPrintFormat("pdf");
-
- String phne = "0176/ 123 231 432";
- for (int i = 0; i < 1000; i++) {
-
- ReportInputDto dto = new ReportInputDto();
-
- StandbyScheduleBody s = new StandbyScheduleBody();
-
- if (i < 500) {
- s.setStandbyGroup(group1);
- } else {
- s.setStandbyGroup(group2);
- }
-
- User u = new User();
- u.setFirstname("Hans");
- u.setLastname("Frank");
-
- ContactData pri = new ContactData();
- pri.setCellphone(phne);
- pri.setPhone(phne);
-
- ContactData buis = new ContactData();
- buis.setCellphone(phne);
- buis.setPhone(phne);
- buis.setPager(phne);
- buis.setRadiocomm(phne);
-
- u.setBusinessContactData(buis);
- u.setPrivateContactData(pri);
-
- Address priA = new Address();
- priA.setCommunity("Hohaus");
-
- u.setPrivateAddress(priA);
-
- s.setUser(u);
- s.setValidFrom(new Date(2018, new Random().nextInt(12), new Random().nextInt(20)));
- s.setValidTo(s.getValidFrom());
-
- list.add(s);
- }
-
- return list;
- }
-
- public static List<ReportInputDto> create() throws IOException {
-
- List<ReportInputDto> list = new ArrayList<>();
-
- ReportDto a = new ReportDto("Wochenplan");
- StandbyGroup group1 = new StandbyGroup();
- group1.setTitle("Elektriker");
- StandbyGroup group2 = new StandbyGroup();
- group2.setTitle("Wasserwirte");
-
- a.setPrintFormat("pdf");
-
- String phne = "0176/ 123 231 432";
- for (int i = 0; i < 400; i++) {
-
- ReportInputDto dto = new ReportInputDto();
-
- StandbyScheduleBody s = new StandbyScheduleBody();
-
- if (i < 500) {
- s.setStandbyGroup(group1);
- } else {
- s.setStandbyGroup(group2);
- }
-
- User u = new User();
- u.setFirstname("Abcdefghijklmn");
- u.setLastname("Opqrstuvwxyz");
-
- ContactData pri = new ContactData();
- pri.setCellphone(phne);
- pri.setPhone(phne);
-
- ContactData buis = new ContactData();
- buis.setCellphone(phne);
- buis.setPhone(phne);
- buis.setPager(phne);
- buis.setRadiocomm(phne);
-
- u.setBusinessContactData(buis);
- u.setPrivateContactData(pri);
-
- Address priA = new Address();
- priA.setCommunity("Hohaus");
-
- u.setPrivateAddress(priA);
-
- s.setUser(u);//
- s.setValidFrom(new Date(2018, new Random().nextInt(12), new Random().nextInt(20)));
- s.setValidTo(s.getValidFrom());
-
- dto.setStandbyScheduleBody(s);
- dto.setReportDto(a);
- list.add(dto);
- }
-
- return list;
- }
-
- public Object next() throws IOException {
- return create().get(idx++);
- }
-
-}
