diff --git a/BackEnd/src/main/java/studycave/studycaverestservice/controller/TestController.java b/BackEnd/src/main/java/studycave/studycaverestservice/controller/TestController.java index 4226a74..1eced18 100644 --- a/BackEnd/src/main/java/studycave/studycaverestservice/controller/TestController.java +++ b/BackEnd/src/main/java/studycave/studycaverestservice/controller/TestController.java @@ -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 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; } diff --git a/BackEnd/src/main/java/studycave/studycaverestservice/model/test/dto/TestOwnerDTO.java b/BackEnd/src/main/java/studycave/studycaverestservice/model/test/dto/TestOwnerDTO.java index 9955729..2ec5b76 100644 --- a/BackEnd/src/main/java/studycave/studycaverestservice/model/test/dto/TestOwnerDTO.java +++ b/BackEnd/src/main/java/studycave/studycaverestservice/model/test/dto/TestOwnerDTO.java @@ -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")