s416178
/
Punktonerzy
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

PUNKT-63 dodane dateFrom i dateTo do endpointa /tests/solve

This commit is contained in:
unknown 2020-01-16 18:08:56 +01:00
parent 85c01c2502
commit 0d221aedba
2 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
BackEnd/src/main/java/studycave/studycaverestservice/controller/TestController.java
View File

@ -157,6 +157,8 @@ public class TestController {
TestOwnerDTO testDTO = modelMapper.map(test.get(), TestOwnerDTO.class);
testDTO.setOwner(user.getUsername());
if (test.get().getPermission().equals("GROUP")) {
testDTO.setDateFrom(test.get().getAvailableFrom());
testDTO.setDateTo(test.get().getAvailableTo());
List<StudyGroupMember> groupUsers = test.get().getGroup().getMembers();
for (StudyGroupMember studyGroupMember : groupUsers) {
if (studyGroupMember.getIsGroupLeader()) {
@ -183,6 +185,7 @@ public class TestController {
if (testDTO.getAttempted() == null){
testDTO.setAttempted(false);
}
return testDTO;
}

3
BackEnd/src/main/java/studycave/studycaverestservice/model/test/dto/TestOwnerDTO.java
View File

@ -32,6 +32,9 @@ public class TestOwnerDTO {
private String permission;
private int grade;
private Long dateFrom;
private Long dateTo;
private Boolean attempted = null;
@JsonProperty("body")