filipizydorczyk/backend
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge pull request 'fixed' (#53) from capacity-fix into master

Browse Source 
Reviewed-on: http://git.plannaplan.pl/filipizydorczyk/backend/pulls/53
This commit is contained in:
Marcin Woźniak
2021-01-23 17:23:16 +01:00
parent 63def650c9 ad4984bdae
commit bb7f1b6737
2 changed files with 13 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
restservice/src/main/java/com/plannaplan/responses/models/AssignmentResponse.java
View File

@@ -16,6 +16,7 @@ import io.swagger.annotations.ApiModel;
public class AssignmentResponse { public class AssignmentResponse {
private Long id; private Long id;
private String name; private String name;
private String symbol;
private GroupWithCapacityResponse classes; private GroupWithCapacityResponse classes;
private GroupWithCapacityResponse lecture; private GroupWithCapacityResponse lecture;
@@ -27,10 +28,18 @@ public class AssignmentResponse {
public AssignmentResponse(Course course, Groups lecture, Groups classes) { public AssignmentResponse(Course course, Groups lecture, Groups classes) {
this.id = course.getId(); this.id = course.getId();
this.name = course.getName(); this.name = course.getName();
this.symbol = course.getSymbol();
this.lecture = lecture == null ? null : new GroupWithCapacityResponse(lecture); this.lecture = lecture == null ? null : new GroupWithCapacityResponse(lecture);
this.classes = classes == null ? null : new GroupWithCapacityResponse(classes); this.classes = classes == null ? null : new GroupWithCapacityResponse(classes);
} }
/**
* @return returns symbol of assigned course
*/
public String getSymbol() {
return symbol;
}
/** /**
* @param course course entity * @param course course entity
* @param lecture lecture Groups entity * @param lecture lecture Groups entity
@@ -41,6 +50,7 @@ public class AssignmentResponse {
public AssignmentResponse(Course course, Groups lecture, Groups classes, HashMap<Long, Integer> ammounts) { public AssignmentResponse(Course course, Groups lecture, Groups classes, HashMap<Long, Integer> ammounts) {
this.id = course.getId(); this.id = course.getId();
this.name = course.getName(); this.name = course.getName();
this.symbol = course.getSymbol();
this.lecture = lecture == null ? null : new GroupWithCapacityResponse(lecture, ammounts.get(lecture.getId())); this.lecture = lecture == null ? null : new GroupWithCapacityResponse(lecture, ammounts.get(lecture.getId()));
this.classes = classes == null ? null : new GroupWithCapacityResponse(classes, ammounts.get(classes.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<Long, Integer> ammounts) { public AssignmentResponse(Course course, Assignment lecture, Assignment classes, HashMap<Long, Integer> ammounts) {
this.id = course.getId(); this.id = course.getId();
this.name = course.getName(); this.name = course.getName();
this.symbol = course.getSymbol();
this.classes = new GroupWithCapacityResponse(classes, ammounts.get(classes.getGroup().getId())); this.classes = new GroupWithCapacityResponse(classes, ammounts.get(classes.getGroup().getId()));
this.lecture = new GroupWithCapacityResponse(lecture, ammounts.get(lecture.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) { public AssignmentResponse(Course course, Assignment lecture, Assignment classes) {
this.id = course.getId(); this.id = course.getId();
this.name = course.getName(); this.name = course.getName();
this.symbol = course.getSymbol();
this.classes = new GroupWithCapacityResponse(classes); this.classes = new GroupWithCapacityResponse(classes);
this.lecture = new GroupWithCapacityResponse(lecture); this.lecture = new GroupWithCapacityResponse(lecture);
} }

1
restservice/src/main/java/com/plannaplan/responses/models/GroupWithCapacityResponse.java
View File

@@ -50,6 +50,7 @@ public class GroupWithCapacityResponse extends GroupDefaultResponse {
*/ */
public GroupWithCapacityResponse(Assignment assignment, int takenPlaces) { public GroupWithCapacityResponse(Assignment assignment, int takenPlaces) {
super(assignment, takenPlaces); super(assignment, takenPlaces);
this.capacity = assignment.getGroup().getCapacity();
} }
/** /**