From 9d3500c1fbe2e22ba31f6bdb5165fd43c647af29 Mon Sep 17 00:00:00 2001 From: BuildTools Date: Fri, 20 Nov 2020 16:20:38 +0100 Subject: [PATCH] Added api endpoiunt mapper needs to be rewriteen --- .../com/plannaplan/controllers/GroupController.java | 3 ++- .../responses/models/GroupDefaultResponse.java | 12 ++++++++++++ .../responses/models/GroupWithCapacityResponse.java | 5 +++++ 3 files changed, 19 insertions(+), 1 deletion(-) diff --git a/restservice/src/main/java/com/plannaplan/controllers/GroupController.java b/restservice/src/main/java/com/plannaplan/controllers/GroupController.java index 65b6c4e..3600a45 100755 --- a/restservice/src/main/java/com/plannaplan/controllers/GroupController.java +++ b/restservice/src/main/java/com/plannaplan/controllers/GroupController.java @@ -37,7 +37,8 @@ public class GroupController { @ApiOperation(value = "Return list of lectures and classes (if present) given course") public ResponseEntity> getCourses( @PathVariable(name = "id") Long id, - @RequestParam(name = "capacity", defaultValue = "true") @ApiParam(value = "Boolean if we want to have capacity field in response") Boolean capacity) { + @RequestParam(name = "capacity", defaultValue = "true") @ApiParam(value = "Boolean if we want to have capacity field in response") Boolean capacity, + @RequestParam(name = "takenPlaces", defaultValue = "false") @ApiParam(value = "Boolean if we want to have respoonse with information about taken places by other students") Boolean takenPlaces) { List groups = this.groupService.getGroupsByCourse(id); if (capacity) { return new ResponseEntity<>(GroupsMappers.mapToGetCourseGroupsWithCapacityResponse(groups), HttpStatus.OK); diff --git a/restservice/src/main/java/com/plannaplan/responses/models/GroupDefaultResponse.java b/restservice/src/main/java/com/plannaplan/responses/models/GroupDefaultResponse.java index 165be0f..50329eb 100755 --- a/restservice/src/main/java/com/plannaplan/responses/models/GroupDefaultResponse.java +++ b/restservice/src/main/java/com/plannaplan/responses/models/GroupDefaultResponse.java @@ -28,6 +28,9 @@ public class GroupDefaultResponse { @ApiModelProperty(value = "Value shows kind of group. The types are LECTURE or CLASS.") private GroupType type; + @ApiModelProperty(value = "Value shows how many places is already taken by other students.") + private int takenPlaces; + public GroupDefaultResponse(Groups group) { this.id = group.getId() != null ? group.getId() : null; this.day = group.getDay() != null ? group.getDay().label : -1; @@ -37,6 +40,11 @@ public class GroupDefaultResponse { this.type = group.getType() != null ? group.getType() : null; } + public GroupDefaultResponse(Groups group, int takenPlaces) { + this(group); + this.takenPlaces = takenPlaces; + } + public GroupDefaultResponse(Assignment assignment) { this(assignment.getGroup()); } @@ -65,4 +73,8 @@ public class GroupDefaultResponse { return id; } + public int getTakenPlaces() { + return this.takenPlaces; + } + } diff --git a/restservice/src/main/java/com/plannaplan/responses/models/GroupWithCapacityResponse.java b/restservice/src/main/java/com/plannaplan/responses/models/GroupWithCapacityResponse.java index 8e7a1f8..9407e4d 100755 --- a/restservice/src/main/java/com/plannaplan/responses/models/GroupWithCapacityResponse.java +++ b/restservice/src/main/java/com/plannaplan/responses/models/GroupWithCapacityResponse.java @@ -14,6 +14,11 @@ public class GroupWithCapacityResponse extends GroupDefaultResponse { this.capacity = group.getCapacity(); } + public GroupWithCapacityResponse(Groups group, int takenPlaces) { + super(group, takenPlaces); + this.capacity = group.getCapacity(); + } + public GroupWithCapacityResponse(Assignment assignment) { this(assignment.getGroup()); }