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

Merge pull request 'single group fix' (#54) from single0-group-fix into master 

Reviewed-on: http://git.plannaplan.pl/filipizydorczyk/backend/pulls/54
This commit is contained in:
Marcin Woźniak 2021-01-25 16:25:13 +01:00
parent bb7f1b6737 72f049b478
commit cf4d8c05a2
1 changed files with 8 additions and 4 deletions
Show Stats 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

@ -108,8 +108,12 @@ public class AssignmentResponse {
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()));
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;
}
/**
@ -121,8 +125,8 @@ public class AssignmentResponse {
this.id = course.getId();
this.name = course.getName();
this.symbol = course.getSymbol();
this.classes = new GroupWithCapacityResponse(classes);
this.lecture = new GroupWithCapacityResponse(lecture);
this.classes = classes != null ? new GroupWithCapacityResponse(classes) : null;
this.lecture = lecture != null ? new GroupWithCapacityResponse(lecture) : null;
}
/**