From ad4984bdaead6364f5d2f6b58d1271a564d4ef05 Mon Sep 17 00:00:00 2001 From: Filip Izydorczyk Date: Sat, 23 Jan 2021 16:45:36 +0100 Subject: [PATCH] fixed --- .../responses/models/AssignmentResponse.java | 12 ++++++++++++ .../responses/models/GroupWithCapacityResponse.java | 1 + 2 files changed, 13 insertions(+) diff --git a/restservice/src/main/java/com/plannaplan/responses/models/AssignmentResponse.java b/restservice/src/main/java/com/plannaplan/responses/models/AssignmentResponse.java index 8126bc5..cf06066 100755 --- a/restservice/src/main/java/com/plannaplan/responses/models/AssignmentResponse.java +++ b/restservice/src/main/java/com/plannaplan/responses/models/AssignmentResponse.java @@ -16,6 +16,7 @@ import io.swagger.annotations.ApiModel; public class AssignmentResponse { private Long id; private String name; + private String symbol; private GroupWithCapacityResponse classes; private GroupWithCapacityResponse lecture; @@ -27,10 +28,18 @@ public class AssignmentResponse { public AssignmentResponse(Course course, Groups lecture, Groups classes) { this.id = course.getId(); this.name = course.getName(); + this.symbol = course.getSymbol(); this.lecture = lecture == null ? null : new GroupWithCapacityResponse(lecture); this.classes = classes == null ? null : new GroupWithCapacityResponse(classes); } + /** + * @return returns symbol of assigned course + */ + public String getSymbol() { + return symbol; + } + /** * @param course course entity * @param lecture lecture Groups entity @@ -41,6 +50,7 @@ public class AssignmentResponse { public AssignmentResponse(Course course, Groups lecture, Groups classes, HashMap ammounts) { this.id = course.getId(); this.name = course.getName(); + this.symbol = course.getSymbol(); this.lecture = lecture == null ? null : new GroupWithCapacityResponse(lecture, ammounts.get(lecture.getId())); this.classes = classes == null ? null : new GroupWithCapacityResponse(classes, ammounts.get(classes.getId())); } @@ -97,6 +107,7 @@ public class AssignmentResponse { public AssignmentResponse(Course course, Assignment lecture, Assignment classes, HashMap ammounts) { this.id = course.getId(); this.name = course.getName(); + this.symbol = course.getSymbol(); this.classes = new GroupWithCapacityResponse(classes, ammounts.get(classes.getGroup().getId())); this.lecture = new GroupWithCapacityResponse(lecture, ammounts.get(lecture.getGroup().getId())); } @@ -109,6 +120,7 @@ public class AssignmentResponse { public AssignmentResponse(Course course, Assignment lecture, Assignment classes) { this.id = course.getId(); this.name = course.getName(); + this.symbol = course.getSymbol(); this.classes = new GroupWithCapacityResponse(classes); this.lecture = new GroupWithCapacityResponse(lecture); } 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 acb2e77..8b83c65 100755 --- a/restservice/src/main/java/com/plannaplan/responses/models/GroupWithCapacityResponse.java +++ b/restservice/src/main/java/com/plannaplan/responses/models/GroupWithCapacityResponse.java @@ -50,6 +50,7 @@ public class GroupWithCapacityResponse extends GroupDefaultResponse { */ public GroupWithCapacityResponse(Assignment assignment, int takenPlaces) { super(assignment, takenPlaces); + this.capacity = assignment.getGroup().getCapacity(); } /**