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

Compare commits

...

3 Commits
capacity-s ... single0-gr

Author SHA1 Message Date
Filip Izydorczyk
72f049b478 single group fix 2021-01-25 16:23:28 +01:00
Marcin Woźniak
bb7f1b6737 Merge pull request 'fixed' () from capacity-fix into master 
Reviewed-on: http://git.plannaplan.pl/filipizydorczyk/backend/pulls/53
 2021-01-23 17:23:16 +01:00
Filip Izydorczyk
ad4984bdae fixed 2021-01-23 16:45:36 +01:00
2 changed files with 21 additions and 4 deletions
restservice/src/main/java/com/plannaplan/responses/models
AssignmentResponse.javaGroupWithCapacityResponse.java

24
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<Long, Integer> 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,8 +107,13 @@ public class AssignmentResponse {
public AssignmentResponse(Course course, Assignment lecture, Assignment classes, HashMap<Long, Integer> ammounts) {
this.id = course.getId();
this.name = course.getName();
this.classes = new GroupWithCapacityResponse(classes, ammounts.get(classes.getGroup().getId()));
this.lecture = new GroupWithCapacityResponse(lecture, ammounts.get(lecture.getGroup().getId()));
this.symbol = course.getSymbol();
this.classes = classes != null
? new GroupWithCapacityResponse(classes, ammounts.get(classes.getGroup().getId()))
: null;
this.lecture = lecture != null
? new GroupWithCapacityResponse(lecture, ammounts.get(lecture.getGroup().getId()))
: null;
}
/**
@ -109,8 +124,9 @@ public class AssignmentResponse {
public AssignmentResponse(Course course, Assignment lecture, Assignment classes) {
this.id = course.getId();
this.name = course.getName();
this.classes = new GroupWithCapacityResponse(classes);
this.lecture = new GroupWithCapacityResponse(lecture);
this.symbol = course.getSymbol();
this.classes = classes != null ? new GroupWithCapacityResponse(classes) : null;
this.lecture = lecture != null ? new GroupWithCapacityResponse(lecture) : null;
}
/**

1
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();
}
/**