BP-796 fix wrong restriction on groupId
diff --git a/oKBereitschaftsplanungBackend/src/main/java/org/eclipse/openk/sp/controller/StandbyScheduleController.java b/oKBereitschaftsplanungBackend/src/main/java/org/eclipse/openk/sp/controller/StandbyScheduleController.java
index 6b0d257..cca45d3 100644
--- a/oKBereitschaftsplanungBackend/src/main/java/org/eclipse/openk/sp/controller/StandbyScheduleController.java
+++ b/oKBereitschaftsplanungBackend/src/main/java/org/eclipse/openk/sp/controller/StandbyScheduleController.java
@@ -51,18 +51,20 @@
public StandbyScheduleDto getFilteredPlanPlanning(StandbyScheduleFilterDto standbyScheduleFilterDto)
throws SpException {
- return plannedDataController.getFilteredPlanByStatus(standbyScheduleFilterDto, SpMsg.STATUS_PLANNING);
+ return plannedDataController.getFilteredPlanByStatus(standbyScheduleFilterDto, SpMsg.STATUS_PLANNING, true);
}
public StandbyScheduleDto getFilteredPlanClosedPlanning(StandbyScheduleFilterDto standbyScheduleFilterDto)
throws SpException {
- return plannedDataController.getFilteredPlanByStatus(standbyScheduleFilterDto, SpMsg.STATUS_CLOSED_PLANNING);
+ return plannedDataController.getFilteredPlanByStatus(standbyScheduleFilterDto, SpMsg.STATUS_CLOSED_PLANNING,
+ true);
}
public StandbyScheduleDto getFilteredPlanByStatusId(StandbyScheduleFilterDto standbyScheduleFilterDto,
Long statusId) throws SpException {
LOGGER.debug(new Date());
- StandbyScheduleDto plan = plannedDataController.getFilteredPlanByStatus(standbyScheduleFilterDto, statusId);
+ StandbyScheduleDto plan = plannedDataController.getFilteredPlanByStatus(standbyScheduleFilterDto, statusId,
+ true);
LOGGER.debug(new Date() + " for count day's " + plan.getListPlanRows().size());
return plan;
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 57efac7..1551b7d 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
@@ -66,8 +66,8 @@
@Autowired
CalendarController calendarController;
- public StandbyScheduleDto getFilteredPlanByStatus(StandbyScheduleFilterDto standbyScheduleFilterDto, Long statusId)
- throws SpException {
+ public StandbyScheduleDto getFilteredPlanByStatus(StandbyScheduleFilterDto standbyScheduleFilterDto, Long statusId,
+ boolean allDay) throws SpException {
try {
@@ -100,8 +100,12 @@
List<StandbyGroupSelectionDto> listStandbyGroupDto = mapGroupDto(standbyList.getLsStandbyGroups());
- Date startDate = DateHelper.getStartOfDay(standbyScheduleFilterDto.getValidFrom());
- Date endDate = DateHelper.getEndOfDay(standbyScheduleFilterDto.getValidTo());
+ Date startDate = standbyScheduleFilterDto.getValidFrom();
+ Date endDate = standbyScheduleFilterDto.getValidTo();
+ if (allDay) {
+ startDate = DateHelper.getStartOfDay(standbyScheduleFilterDto.getValidFrom());
+ endDate = DateHelper.getEndOfDay(standbyScheduleFilterDto.getValidTo());
+ }
StandbyScheduleDto plan = new StandbyScheduleDto(startDate, endDate, listStandbyGroupDto);
plan.setFilter(standbyScheduleFilterDto);
diff --git a/oKBereitschaftsplanungBackend/src/main/java/org/eclipse/openk/sp/controller/reports/ReportController.java b/oKBereitschaftsplanungBackend/src/main/java/org/eclipse/openk/sp/controller/reports/ReportController.java
index d4f54ca..afbb73d 100644
--- a/oKBereitschaftsplanungBackend/src/main/java/org/eclipse/openk/sp/controller/reports/ReportController.java
+++ b/oKBereitschaftsplanungBackend/src/main/java/org/eclipse/openk/sp/controller/reports/ReportController.java
@@ -154,7 +154,8 @@
if (allowedReports.contains(fileExtension)) {
String reportName = FilenameUtils.removeExtension(file.getName());
- ReportDto reportDto = new ReportDto(reportName);
+ ReportDto reportDto = new ReportDto();
+ reportDto.setReportName(reportName);
reportDto.setDefaultDayRange(31);
listReports.add(reportDto);
@@ -168,7 +169,7 @@
if (reportDto.getReportName().equals(REPORT_MAX10_GROUPS)) {
LOGGER.info(REPORT_NAME + REPORT_MAX10_GROUPS);
- inputDtos = reportGroupDtoConverter.getRows(reportDto);
+ inputDtos = reportGroupDtoConverter.get10Rows(reportDto);
} else {
SpErrorEntry ee = SpExceptionEnum.NO_DATA_FOR_REPORT_FOUND.getEntry();
diff --git a/oKBereitschaftsplanungBackend/src/main/java/org/eclipse/openk/sp/dto/UserInStandbyGroupDto.java b/oKBereitschaftsplanungBackend/src/main/java/org/eclipse/openk/sp/dto/UserInStandbyGroupDto.java
index 479514a..df57037 100644
--- a/oKBereitschaftsplanungBackend/src/main/java/org/eclipse/openk/sp/dto/UserInStandbyGroupDto.java
+++ b/oKBereitschaftsplanungBackend/src/main/java/org/eclipse/openk/sp/dto/UserInStandbyGroupDto.java
@@ -38,7 +38,6 @@
private Long id;
- @NotNull(message = "Gruppe ist nicht gesetzt")
private Long standbyGroupId;
@NotNull(message = "Mitarbeiter ist nicht gesetzt")
private Long userId;
diff --git a/oKBereitschaftsplanungBackend/src/main/java/org/eclipse/openk/sp/dto/report/ReportDto.java b/oKBereitschaftsplanungBackend/src/main/java/org/eclipse/openk/sp/dto/report/ReportDto.java
index 6f7e82d..d387126 100644
--- a/oKBereitschaftsplanungBackend/src/main/java/org/eclipse/openk/sp/dto/report/ReportDto.java
+++ b/oKBereitschaftsplanungBackend/src/main/java/org/eclipse/openk/sp/dto/report/ReportDto.java
@@ -15,6 +15,7 @@
import java.text.ParseException;
import java.util.Date;
+import javax.validation.constraints.NotNull;
import javax.xml.bind.annotation.XmlRootElement;
import org.eclipse.openk.sp.abstracts.AbstractDto;
@@ -37,22 +38,24 @@
*/
private static final long serialVersionUID = 1L;
+ @NotNull(message = "Planart muss angegeben werden")
private String reportName;
+ @NotNull(message = "Format muss angegeben werden")
private String format;
+ private Long groupId;
private StandbyGroup standByGroup;
+ private Long listId;
private StandbyList standByList;
private Long userId;
+ @NotNull(message = "Startdatum muss angegeben werden")
private Date from;
+ @NotNull(message = "Endedatum muss angegeben werden")
private Date to;
private Integer defaultDayRange;
+ @NotNull(message = "Ebene muss angegeben werden")
private String reportLevel;
private int groupPosition;
- public ReportDto(String reportName) {
- super();
- this.reportName = reportName;
- }
-
public String getReportName() {
return reportName;
}
@@ -66,7 +69,9 @@
}
public void setFormat(String format) {
- this.format = format;
+ if (format != null) {
+ this.format = format.toLowerCase();
+ }
}
public Date getFrom() {
@@ -74,7 +79,11 @@
}
public void setFrom(String from) throws ParseException {
- this.from = DateHelper.getDateFromString(from, "yyyy-MM-dd");
+ this.from = DateHelper.getDateFromString(from, "yyyy-MM-dd HH:mm:ss");
+ }
+
+ public void setFrom(Date from) {
+ this.from = from;
}
public Date getTo() {
@@ -82,7 +91,11 @@
}
public void setTo(String to) throws ParseException {
- this.to = DateHelper.getDateFromString(to, "yyyy-MM-dd");
+ this.to = DateHelper.getDateFromString(to, "yyyy-MM-dd HH:mm:ss");
+ }
+
+ public void setTo(Date to) {
+ this.to = to;
}
public Long getUserId() {
@@ -133,4 +146,32 @@
this.groupPosition = groupPosition;
}
+ /**
+ * @return the groupId
+ */
+ public Long getGroupId() {
+ return groupId;
+ }
+
+ /**
+ * @param groupId the groupId to set
+ */
+ public void setGroupId(Long groupId) {
+ this.groupId = groupId;
+ }
+
+ /**
+ * @return the listId
+ */
+ public Long getListId() {
+ return listId;
+ }
+
+ /**
+ * @param listId the listId to set
+ */
+ public void setListId(Long listId) {
+ this.listId = listId;
+ }
+
}
diff --git a/oKBereitschaftsplanungBackend/src/main/java/org/eclipse/openk/sp/rest/reports/ReportRestService.java b/oKBereitschaftsplanungBackend/src/main/java/org/eclipse/openk/sp/rest/reports/ReportRestService.java
index 349dcb5..9d54454 100644
--- a/oKBereitschaftsplanungBackend/src/main/java/org/eclipse/openk/sp/rest/reports/ReportRestService.java
+++ b/oKBereitschaftsplanungBackend/src/main/java/org/eclipse/openk/sp/rest/reports/ReportRestService.java
@@ -14,13 +14,14 @@
import java.io.File;
import java.io.IOException;
-import java.text.ParseException;
+import java.util.Date;
import java.util.List;
import javax.servlet.http.HttpServletResponse;
import javax.ws.rs.Consumes;
import javax.ws.rs.GET;
import javax.ws.rs.HeaderParam;
+import javax.ws.rs.PUT;
import javax.ws.rs.Path;
import javax.ws.rs.PathParam;
import javax.ws.rs.Produces;
@@ -76,15 +77,17 @@
@GET
@Produces({ MediaType.APPLICATION_OCTET_STREAM, MediaType.APPLICATION_JSON })
@Path("/generate/{reportName}")
+ @Deprecated
public Response generateReport(@PathParam("reportName") String reportName,
@QueryParam("standByListId") Long standByListId, @QueryParam("standByGroupId") Long standByGroupId,
@QueryParam("userId") Long userId, @QueryParam("printFormat") String printFormat,
- @QueryParam("fromDate") String fromDate, @QueryParam("toDate") String toDate,
+ @QueryParam("fromDate") Date fromDate, @QueryParam("toDate") Date toDate,
@QueryParam("reportLevel") String reportLevel, @Context HttpServletResponse response,
@ApiParam(name = "Authorization", value = "JWT Token", required = true) @HeaderParam(value = Globals.KEYCLOAK_AUTH_TAG) String jwt)
throws IOException {
- ReportDto reportDto = new ReportDto(reportName);
+ ReportDto reportDto = new ReportDto();
+ reportDto.setReportName(reportName);
reportDto.setFormat(printFormat.toLowerCase());
if (standByGroupId != null) {
reportDto.setStandByGroup(standbyGroupRepository.findOne(standByGroupId));
@@ -94,12 +97,9 @@
}
reportDto.setUserId(userId);
reportDto.setReportLevel(reportLevel);
- try {
- reportDto.setFrom(fromDate);
- reportDto.setTo(toDate);
- } catch (ParseException e) {
- logger.error(e, e);
- }
+
+ reportDto.setFrom(fromDate);
+ reportDto.setTo(toDate);
try {
File reportFile = reportController.generateReport(reportDto);
@@ -116,4 +116,28 @@
}
+ @PUT
+ @Produces({ MediaType.APPLICATION_OCTET_STREAM, MediaType.APPLICATION_JSON })
+ @Path("/generate")
+ public Response generateReportNew(@PathParam("ReportDto") ReportDto reportDto,
+ @Context HttpServletResponse response,
+ @ApiParam(name = "Authorization", value = "JWT Token", required = true) @HeaderParam(value = Globals.KEYCLOAK_AUTH_TAG) String jwt)
+ throws IOException {
+
+ try {
+ File reportFile = reportController.generateReport(reportDto);
+ ModifyingInvokable<File> invokable = modusr -> reportFile;
+ reportController.setResponseData(response, reportDto);
+ reportController.flushReportFile(reportFile, response.getOutputStream());
+ String[] securityRoles = Globals.getAllRolls();
+ return invokeRunnable(jwt, securityRoles, invokable);
+
+ } catch (SpException spException) {
+
+ return Response.status(HttpStatus.BAD_REQUEST.value()).entity(spException).type(MediaType.APPLICATION_JSON)
+ .build();
+ }
+
+ }
+
}
diff --git a/oKBereitschaftsplanungBackend/src/main/java/org/eclipse/openk/sp/util/ReportGroupDtoConverter.java b/oKBereitschaftsplanungBackend/src/main/java/org/eclipse/openk/sp/util/ReportGroupDtoConverter.java
index 8be3722..c9db2e2 100644
--- a/oKBereitschaftsplanungBackend/src/main/java/org/eclipse/openk/sp/util/ReportGroupDtoConverter.java
+++ b/oKBereitschaftsplanungBackend/src/main/java/org/eclipse/openk/sp/util/ReportGroupDtoConverter.java
@@ -47,7 +47,7 @@
protected static final Logger LOGGER = Logger.getLogger(ReportGroupDtoConverter.class);
- public List<ReportInputDto> getRows(ReportDto reportDto) throws SpException {
+ public List<ReportInputDto> get10Rows(ReportDto reportDto) throws SpException {
List<ReportInputDto> inputDto = new ArrayList<>();
@@ -62,7 +62,8 @@
}
// get plan
- StandbyScheduleDto plan = plannedDataController.getFilteredPlanByStatus(standbyScheduleFilterDto, reportLevel);
+ StandbyScheduleDto plan = plannedDataController.getFilteredPlanByStatus(standbyScheduleFilterDto, reportLevel,
+ false);
// get first 10 groups with some data
// empty groups are not represented
@@ -96,7 +97,9 @@
public ReportGroupDto addReportRow(ReportDto reportDto, List<ReportInputDto> inputDto, StandbyScheduleDto plan,
Date dateIndex, Long[] groupIdArray) {
- PlanRowsDto row = plan.getRow(dateIndex);
+ Date dayDate = DateHelper.getStartOfDay(dateIndex);
+
+ PlanRowsDto row = plan.getRow(dayDate);
ReportInputDto reportInputRow = new ReportInputDto();
reportInputRow.setReportDto(reportDto);
diff --git a/oKBereitschaftsplanungBackend/src/main/resources/reports/Diensthabende_Mitarbeiter_je_Bereitschaftsgruppe.rptdesign b/oKBereitschaftsplanungBackend/src/main/resources/reports/Diensthabende_Mitarbeiter_je_Bereitschaftsgruppe.rptdesign
index 5c7146d..d4286eb 100644
--- a/oKBereitschaftsplanungBackend/src/main/resources/reports/Diensthabende_Mitarbeiter_je_Bereitschaftsgruppe.rptdesign
+++ b/oKBereitschaftsplanungBackend/src/main/resources/reports/Diensthabende_Mitarbeiter_je_Bereitschaftsgruppe.rptdesign
@@ -652,13 +652,10 @@
</text>
</cell>
<cell id="346">
- <auto-text id="347">
+ <auto-text id="463">
<property name="textAlign">left</property>
<property name="type">total-page</property>
</auto-text>
- <auto-text id="463">
- <property name="type">page-number</property>
- </auto-text>
</cell>
<cell id="370">
<data id="378">
@@ -687,7 +684,7 @@
<property name="fontFamily">sans-serif</property>
<property name="fontSize">12pt</property>
<property name="fontWeight">bold</property>
- <property name="color">#808080</property>
+ <property name="color">black</property>
<property name="paddingTop">5pt</property>
<property name="paddingBottom">5pt</property>
<property name="whiteSpace">nowrap</property>
@@ -719,7 +716,7 @@
<property name="fontFamily">sans-serif</property>
<property name="fontSize">10pt</property>
<property name="fontWeight">bold</property>
- <property name="color">#808080</property>
+ <property name="color">black</property>
<property name="paddingBottom">0pt</property>
<property name="pageBreakAfter">auto</property>
<property name="pageBreakBefore">auto</property>
@@ -731,7 +728,7 @@
<property name="fontFamily">sans-serif</property>
<property name="fontSize">10pt</property>
<property name="fontWeight">bold</property>
- <property name="color">#808080</property>
+ <property name="color">black</property>
<property name="paddingTop">0pt</property>
<property name="paddingBottom">0pt</property>
<property name="pageBreakAfter">auto</property>
@@ -884,7 +881,7 @@
<property name="dataType">string</property>
</structure>
</list-property>
- <property name="repeatHeader">false</property>
+ <property name="repeatHeader">true</property>
<property name="pageBreakInterval">0</property>
<column id="432"/>
<column id="433">
diff --git a/oKBereitschaftsplanungBackend/src/main/resources/reports/Diensthabende_Mitarbeiter_je_Bereitschaftsgruppe_mit_Details.rptdesign b/oKBereitschaftsplanungBackend/src/main/resources/reports/Diensthabende_Mitarbeiter_je_Bereitschaftsgruppe_mit_Details.rptdesign
index 926d19a..fa930c7 100644
--- a/oKBereitschaftsplanungBackend/src/main/resources/reports/Diensthabende_Mitarbeiter_je_Bereitschaftsgruppe_mit_Details.rptdesign
+++ b/oKBereitschaftsplanungBackend/src/main/resources/reports/Diensthabende_Mitarbeiter_je_Bereitschaftsgruppe_mit_Details.rptdesign
@@ -530,11 +530,11 @@
<property name="width">20pt</property>
</column>
<column id="339">
- <property name="width">5pt</property>
+ <property name="width">15pt</property>
</column>
<column id="340">
<property name="textAlign">left</property>
- <property name="width">20pt</property>
+ <property name="width">29.25pt</property>
</column>
<column id="371">
<property name="width">80pt</property>
@@ -566,12 +566,8 @@
</text>
</cell>
<cell id="346">
- <auto-text id="347">
- <property name="textAlign">left</property>
- <property name="type">total-page</property>
- </auto-text>
<auto-text id="463">
- <property name="type">page-number</property>
+ <property name="type">total-page</property>
</auto-text>
</cell>
<cell id="370">
@@ -601,7 +597,7 @@
<property name="fontFamily">sans-serif</property>
<property name="fontSize">12pt</property>
<property name="fontWeight">bold</property>
- <property name="color">#808080</property>
+ <property name="color">black</property>
<property name="paddingTop">5pt</property>
<property name="paddingBottom">5pt</property>
<property name="whiteSpace">nowrap</property>
@@ -633,7 +629,7 @@
<property name="fontFamily">sans-serif</property>
<property name="fontSize">10pt</property>
<property name="fontWeight">bold</property>
- <property name="color">#808080</property>
+ <property name="color">#000000</property>
<property name="paddingBottom">0pt</property>
<property name="pageBreakAfter">auto</property>
<property name="pageBreakBefore">auto</property>
@@ -645,7 +641,7 @@
<property name="fontFamily">sans-serif</property>
<property name="fontSize">10pt</property>
<property name="fontWeight">bold</property>
- <property name="color">#808080</property>
+ <property name="color">#000000</property>
<property name="paddingTop">0pt</property>
<property name="paddingBottom">0pt</property>
<property name="pageBreakAfter">auto</property>
@@ -784,7 +780,7 @@
<property name="dataType">integer</property>
</structure>
</list-property>
- <property name="repeatHeader">false</property>
+ <property name="repeatHeader">true</property>
<property name="pageBreakInterval">0</property>
<column id="81">
<property name="width">55pt</property>
@@ -821,7 +817,7 @@
<property name="fontWeight">bold</property>
<property name="fontStyle">normal</property>
<property name="verticalAlign">middle</property>
- <property name="height">0.3125in</property>
+ <property name="height">12pt</property>
<cell id="24">
<property name="paddingTop">0pt</property>
<property name="paddingBottom">0pt</property>
diff --git "a/oKBereitschaftsplanungBackend/src/main/resources/reports/Pers\303\266nlicher_Einsatzplan.rptdesign" "b/oKBereitschaftsplanungBackend/src/main/resources/reports/Pers\303\266nlicher_Einsatzplan.rptdesign"
index 2afe182..61be070 100644
--- "a/oKBereitschaftsplanungBackend/src/main/resources/reports/Pers\303\266nlicher_Einsatzplan.rptdesign"
+++ "b/oKBereitschaftsplanungBackend/src/main/resources/reports/Pers\303\266nlicher_Einsatzplan.rptdesign"
@@ -499,12 +499,8 @@
</text>
</cell>
<cell id="346">
- <auto-text id="347">
- <property name="textAlign">left</property>
- <property name="type">total-page</property>
- </auto-text>
<auto-text id="463">
- <property name="type">page-number</property>
+ <property name="type">total-page</property>
</auto-text>
</cell>
<cell id="370">
@@ -534,7 +530,7 @@
<property name="fontFamily">sans-serif</property>
<property name="fontSize">12pt</property>
<property name="fontWeight">bold</property>
- <property name="color">#808080</property>
+ <property name="color">black</property>
<property name="paddingTop">5pt</property>
<property name="paddingBottom">5pt</property>
<property name="whiteSpace">nowrap</property>
@@ -566,7 +562,7 @@
<property name="fontFamily">sans-serif</property>
<property name="fontSize">10pt</property>
<property name="fontWeight">bold</property>
- <property name="color">#808080</property>
+ <property name="color">black</property>
<property name="paddingBottom">0pt</property>
<property name="pageBreakAfter">auto</property>
<property name="pageBreakBefore">auto</property>
@@ -578,7 +574,7 @@
<property name="fontFamily">sans-serif</property>
<property name="fontSize">10pt</property>
<property name="fontWeight">bold</property>
- <property name="color">#808080</property>
+ <property name="color">black</property>
<property name="paddingTop">0pt</property>
<property name="paddingBottom">0pt</property>
<property name="pageBreakAfter">auto</property>
@@ -689,7 +685,7 @@
<property name="dataType">string</property>
</structure>
</list-property>
- <property name="repeatHeader">false</property>
+ <property name="repeatHeader">true</property>
<property name="pageBreakInterval">0</property>
<column id="81">
<property name="textAlign">right</property>
diff --git a/oKBereitschaftsplanungBackend/src/test/java/org/eclipse/openk/sp/controller/StandbyScheduleControllerTest.java b/oKBereitschaftsplanungBackend/src/test/java/org/eclipse/openk/sp/controller/StandbyScheduleControllerTest.java
index fb757a9..7a106a8 100644
--- a/oKBereitschaftsplanungBackend/src/test/java/org/eclipse/openk/sp/controller/StandbyScheduleControllerTest.java
+++ b/oKBereitschaftsplanungBackend/src/test/java/org/eclipse/openk/sp/controller/StandbyScheduleControllerTest.java
@@ -66,7 +66,7 @@
StandbyScheduleDto sbsDto = new StandbyScheduleDto();
Mockito.when(plannedDataController.getFilteredPlanByStatus((StandbyScheduleFilterDto) Mockito.any(),
- Mockito.anyLong())).thenReturn(sbsDto);
+ Mockito.anyLong(), Mockito.anyBoolean())).thenReturn(sbsDto);
StandbyScheduleDto result = standbyScheduleController.getFilteredPlanPlanning(standbyScheduleFilterDto);
@@ -80,7 +80,7 @@
StandbyScheduleDto sbsDto = new StandbyScheduleDto();
Mockito.when(plannedDataController.getFilteredPlanByStatus((StandbyScheduleFilterDto) Mockito.any(),
- Mockito.anyLong())).thenReturn(sbsDto);
+ Mockito.anyLong(), Mockito.anyBoolean())).thenReturn(sbsDto);
StandbyScheduleDto result = standbyScheduleController.getFilteredPlanByStatusId(standbyScheduleFilterDto,
statusId);
@@ -94,7 +94,7 @@
StandbyScheduleDto sbsDto = new StandbyScheduleDto();
Mockito.when(plannedDataController.getFilteredPlanByStatus((StandbyScheduleFilterDto) Mockito.any(),
- Mockito.anyLong())).thenReturn(sbsDto);
+ Mockito.anyLong(), Mockito.anyBoolean())).thenReturn(sbsDto);
StandbyScheduleDto result = standbyScheduleController.getFilteredPlanClosedPlanning(standbyScheduleFilterDto);
diff --git a/oKBereitschaftsplanungBackend/src/test/java/org/eclipse/openk/sp/controller/planning/PlannedDataControllerTest.java b/oKBereitschaftsplanungBackend/src/test/java/org/eclipse/openk/sp/controller/planning/PlannedDataControllerTest.java
index 7a09078..fa04ddd 100644
--- a/oKBereitschaftsplanungBackend/src/test/java/org/eclipse/openk/sp/controller/planning/PlannedDataControllerTest.java
+++ b/oKBereitschaftsplanungBackend/src/test/java/org/eclipse/openk/sp/controller/planning/PlannedDataControllerTest.java
@@ -88,7 +88,7 @@
filter.setValidFrom(DateHelper.getDate(2017, 12, 31));
filter.setValidTo(DateHelper.getDate(2018, 1, 3));
- StandbyScheduleDto result = plannedDataController.getFilteredPlanByStatus(filter, SpMsg.STATUS_PLANNING);
+ StandbyScheduleDto result = plannedDataController.getFilteredPlanByStatus(filter, SpMsg.STATUS_PLANNING, true);
assertNotNull(result);
}
@@ -209,7 +209,7 @@
@Test(expected = SpException.class)
public void getFilteredPlanException2Test() throws SpException {
- StandbyScheduleDto result = plannedDataController.getFilteredPlanByStatus(null, SpMsg.STATUS_PLANNING);
+ StandbyScheduleDto result = plannedDataController.getFilteredPlanByStatus(null, SpMsg.STATUS_PLANNING, true);
assertNotNull(result);
}
@@ -245,7 +245,7 @@
when(standbyGroupRepository.findOne(Mockito.anyLong())).thenReturn(standbyGroup);
- StandbyScheduleDto plan = plannedDataController.getFilteredPlanByStatus(filter, SpMsg.STATUS_PLANNING);
+ StandbyScheduleDto plan = plannedDataController.getFilteredPlanByStatus(filter, SpMsg.STATUS_PLANNING, true);
assertNotNull(plan);
}
@@ -300,7 +300,7 @@
when(standbyScheduleBodyRepository.findByGroupsAndDateAndStatus(Mockito.any(), Mockito.any(), Mockito.any(),
Mockito.any())).thenReturn(lsStandbyScheduleBody);
- StandbyScheduleDto plan = plannedDataController.getFilteredPlanByStatus(filter, SpMsg.STATUS_PLANNING);
+ StandbyScheduleDto plan = plannedDataController.getFilteredPlanByStatus(filter, SpMsg.STATUS_PLANNING, true);
assertNotNull(plan);
}
diff --git a/oKBereitschaftsplanungBackend/src/test/java/org/eclipse/openk/sp/controller/reports/ReportControllerTest.java b/oKBereitschaftsplanungBackend/src/test/java/org/eclipse/openk/sp/controller/reports/ReportControllerTest.java
index 3eebc33..a9286a1 100644
--- a/oKBereitschaftsplanungBackend/src/test/java/org/eclipse/openk/sp/controller/reports/ReportControllerTest.java
+++ b/oKBereitschaftsplanungBackend/src/test/java/org/eclipse/openk/sp/controller/reports/ReportControllerTest.java
@@ -88,7 +88,8 @@
@Test
public void testGenerateReport() throws IOException, SpException {
- ReportDto reportDto = new ReportDto("Wochenübersicht");
+ ReportDto reportDto = new ReportDto();
+ reportDto.setReportName("Wochenübersicht");
reportDto.setFormat("pdf");
StandbyList standbyList = new StandbyList();
standbyList.setId(1L);
@@ -176,7 +177,8 @@
@Test
public void setResponseData() {
- ReportDto reportDto = new ReportDto("Wochenübersicht");
+ ReportDto reportDto = new ReportDto();
+ reportDto.setReportName("Wochenübersicht");
reportDto.setFormat("pdf");
MockHttpServletResponse response = new MockHttpServletResponse();
@@ -251,7 +253,8 @@
List<StandbyScheduleBody> lsStandbyScheduleBody = (List<StandbyScheduleBody>) new Gson().fromJson(json,
GsonTypeHelper.JSON_TYPE_STANDBYBODY_ARRAY_LIST);
- ReportDto reportDto = new ReportDto("Wochenübersicht");
+ ReportDto reportDto = new ReportDto();
+ reportDto.setReportName("Wochenübersicht");
reportDto.setFormat("pdf");
reportDto.setStandByList(standbyList);
reportDto.setReportLevel("Plan-Ebene");
@@ -268,7 +271,8 @@
@Test(expected = SpException.class)
public void performReportQueryExceptionTest() throws SpException {
- ReportDto reportDto = new ReportDto("Wochenübersicht");
+ ReportDto reportDto = new ReportDto();
+ reportDto.setReportName("Wochenübersicht");
reportDto.setFormat("pdf");
StandbyList standbyList = new StandbyList();
standbyList.setId(1L);
@@ -290,7 +294,8 @@
@Test(expected = SpException.class)
public void performReportQueryException2Test() throws SpException {
- ReportDto reportDto = new ReportDto("Wochenübersicht");
+ ReportDto reportDto = new ReportDto();
+ reportDto.setReportName("Wochenübersicht");
reportDto.setFormat("pdf");
reportDto.setReportLevel("Plan-Ebene");
@@ -302,9 +307,10 @@
@Test
public void setTaskParameters() throws EngineException, ParseException {
String text = "test";
- String dateStr = "2019-12-31";
+ String dateStr = "2019-12-31 12:00:00";
FileHelperTest fh = new FileHelperTest();
- ReportDto reportDto = new ReportDto("Wochenübersicht");
+ ReportDto reportDto = new ReportDto();
+ reportDto.setReportName("Wochenübersicht");
reportDto.setReportName(null);
InputStream rptdFileStream = fh.loadFromResource("test.rptdesign");
@@ -359,7 +365,8 @@
public void compress1ResultOnGroups() {
FileHelperTest fh = new FileHelperTest();
// List<ReportInputDto>
- ReportDto reportDto = new ReportDto("test");
+ ReportDto reportDto = new ReportDto();
+ reportDto.setReportName("Wochenübersicht");
String json = fh.loadStringFromResource("testStandbyScheduleBodySearchList.json");
List<StandbyScheduleBody> lsStandbyScheduleBody = (List<StandbyScheduleBody>) new Gson().fromJson(json,
diff --git a/oKBereitschaftsplanungBackend/src/test/java/org/eclipse/openk/sp/dto/report/ReportDtoTest.java b/oKBereitschaftsplanungBackend/src/test/java/org/eclipse/openk/sp/dto/report/ReportDtoTest.java
index e6c3b16..bb9b712 100644
--- a/oKBereitschaftsplanungBackend/src/test/java/org/eclipse/openk/sp/dto/report/ReportDtoTest.java
+++ b/oKBereitschaftsplanungBackend/src/test/java/org/eclipse/openk/sp/dto/report/ReportDtoTest.java
@@ -31,7 +31,8 @@
@Test
public void testGettersAndSetters() throws MalformedURLException, ParseException {
- ReportDto report = new ReportDto("Wochenübersicht");
+ ReportDto report = new ReportDto();
+ report.setReportName("Wochenübersicht");
assertEquals("Wochenübersicht", report.getReportName());
report.setReportName("Monatsübersicht");
@@ -43,13 +44,13 @@
report.setUserId(1L);
assertEquals(1L, report.getUserId().longValue());
- SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
- Date validationDate = sdf.parse("2018-10-10");
+ SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
+ Date validationDate = sdf.parse("2018-10-10 12:00:00");
- report.setFrom("2018-10-10");
+ report.setFrom("2018-10-10 12:00:00");
assertEquals(validationDate.getTime(), report.getFrom().getTime());
- report.setTo("2018-10-10");
+ report.setTo("2018-10-10 12:00:00");
assertEquals(validationDate.getTime(), report.getTo().getTime());
report.setStandByGroup(new StandbyGroup());
diff --git a/oKBereitschaftsplanungBackend/src/test/java/org/eclipse/openk/sp/dto/report/ReportInputDtoTest.java b/oKBereitschaftsplanungBackend/src/test/java/org/eclipse/openk/sp/dto/report/ReportInputDtoTest.java
index e64c8da..f71206f 100644
--- a/oKBereitschaftsplanungBackend/src/test/java/org/eclipse/openk/sp/dto/report/ReportInputDtoTest.java
+++ b/oKBereitschaftsplanungBackend/src/test/java/org/eclipse/openk/sp/dto/report/ReportInputDtoTest.java
@@ -37,7 +37,8 @@
StandbyScheduleBody standbyScheduleBody = new StandbyScheduleBody();
- ReportDto reportDto = new ReportDto("Wochenübersicht");
+ ReportDto reportDto = new ReportDto();
+ reportDto.setReportName("Wochenübersicht");
ReportInputDto reportInputDto = new ReportInputDto();
reportInputDto.setReportDto(reportDto);
diff --git a/oKBereitschaftsplanungBackend/src/test/java/org/eclipse/openk/sp/rest/reports/ReportRestServiceTest.java b/oKBereitschaftsplanungBackend/src/test/java/org/eclipse/openk/sp/rest/reports/ReportRestServiceTest.java
index 354f38d..3a58279 100644
--- a/oKBereitschaftsplanungBackend/src/test/java/org/eclipse/openk/sp/rest/reports/ReportRestServiceTest.java
+++ b/oKBereitschaftsplanungBackend/src/test/java/org/eclipse/openk/sp/rest/reports/ReportRestServiceTest.java
@@ -4,6 +4,7 @@
import java.io.File;
import java.io.IOException;
+import java.util.Date;
import javax.servlet.http.HttpServletResponse;
import javax.ws.rs.core.Response;
@@ -14,6 +15,7 @@
import org.eclipse.openk.sp.db.model.StandbyGroup;
import org.eclipse.openk.sp.db.model.StandbyList;
import org.eclipse.openk.sp.exceptions.SpException;
+import org.eclipse.openk.sp.util.DateHelper;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.mockito.InjectMocks;
@@ -64,14 +66,16 @@
Mockito.when(standbyGroupRepository.findOne(Mockito.any())).thenReturn(standbyGroup);
Mockito.when(reportController.generateReport(Mockito.any())).thenReturn(mockFile);
+ Date date1 = DateHelper.getDate(2018, 10, 11, 12, 00, 00);
+ Date date2 = DateHelper.getDate(2018, 10, 11, 12, 00, 00);
// If list is input parameter
- result = reportRestService.generateReport("Autoplan", 1L, null, null, "pdf", "2018-10-11", "2018-10-11",
- "Ist-Ebene", response, jwt);
+ result = reportRestService.generateReport("Autoplan", 1L, null, null, "pdf", date1, date2, "Ist-Ebene",
+ response, jwt);
assertNotNull(result);
// If group is input parameter
- result = reportRestService.generateReport("Autoplan", null, 1L, null, "pdf", "2018-10-11", "2018-10-11",
- "Plan-Ebene", response, jwt);
+ result = reportRestService.generateReport("Autoplan", null, 1L, null, "pdf", date1, date2, "Plan-Ebene",
+ response, jwt);
assertNotNull(result);
}
diff --git a/oKBereitschaftsplanungBackend/src/test/java/org/eclipse/openk/sp/util/ReportGroupDtoConverterTest.java b/oKBereitschaftsplanungBackend/src/test/java/org/eclipse/openk/sp/util/ReportGroupDtoConverterTest.java
index 2c1c0bc..c0582fc 100644
--- a/oKBereitschaftsplanungBackend/src/test/java/org/eclipse/openk/sp/util/ReportGroupDtoConverterTest.java
+++ b/oKBereitschaftsplanungBackend/src/test/java/org/eclipse/openk/sp/util/ReportGroupDtoConverterTest.java
@@ -59,12 +59,12 @@
private ReportDto getReport() {
ReportDto report = null;
try {
- report = new ReportDto("Wochenübersicht");
+ report = new ReportDto();
report.setReportName("Monatsübersicht");
report.setFormat("pdf");
report.setUserId(1L);
- report.setFrom("2018-10-10");
- report.setTo("2018-10-10");
+ report.setFrom("2018-10-10 12:00:00");
+ report.setTo("2018-10-10 12:00:00");
report.setStandByGroup(new StandbyGroup());
report.setStandByList(new StandbyList());
report.setDefaultDayRange(5);
@@ -172,15 +172,17 @@
StandbyGroupSelectionDto.class);
ReportDto reportDto = getReport();
- reportDto.setFrom("2019-02-01");
- reportDto.setTo("2019-02-04");
+ reportDto.setFrom("2019-02-01 12:00:00");
+ reportDto.setTo("2019-02-04 12:00:00");
reportDto.setStandByList(new StandbyList(plan.getFilter().getStandbyListId()));
- Mockito.when(plannedDataController.getFilteredPlanByStatus(Mockito.any(), Mockito.anyLong())).thenReturn(plan);
+ Mockito.when(
+ plannedDataController.getFilteredPlanByStatus(Mockito.any(), Mockito.anyLong(), Mockito.anyBoolean()))
+ .thenReturn(plan);
Mockito.when(standbyGroupRepository.findOne(Mockito.anyLong())).thenReturn(sb);
Mockito.when(entityConverter.convertEntityToDto(Mockito.any(), Mockito.any())).thenReturn(dto);
- List<ReportInputDto> result = reportGroupDtoConverter.getRows(reportDto);
+ List<ReportInputDto> result = reportGroupDtoConverter.get10Rows(reportDto);
assertNotNull(result);
}
