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

Compare commits

base: filipizydorczyk:capacity-fix
Branches Tags
filipizydorczyk:master filipizydorczyk:single0-group-fix filipizydorczyk:capacity-fix filipizydorczyk:Add-licence
filipizydorczyk:capacity-symb filipizydorczyk:api-fileds filipizydorczyk:statistics-relase filipizydorczyk:beta filipizydorczyk:group-types-update filipizydorczyk:adding-type-into-AssignmentDetailed filipizydorczyk:exchanges-fix-tour-blocking filipizydorczyk:exchanges filipizydorczyk:poprawki-29-12 filipizydorczyk:refresh-token filipizydorczyk:restservice filipizydorczyk:token-release filipizydorczyk:endpoint-change filipizydorczyk:cors-fixed filipizydorczyk:auth-save-release filipizydorczyk:beta-v1.0
..
compare: filipizydorczyk:master
Branches Tags
filipizydorczyk:master filipizydorczyk:single0-group-fix filipizydorczyk:capacity-fix filipizydorczyk:Add-licence
filipizydorczyk:capacity-symb filipizydorczyk:api-fileds filipizydorczyk:statistics-relase filipizydorczyk:beta filipizydorczyk:group-types-update filipizydorczyk:adding-type-into-AssignmentDetailed filipizydorczyk:exchanges-fix-tour-blocking filipizydorczyk:exchanges filipizydorczyk:poprawki-29-12 filipizydorczyk:refresh-token filipizydorczyk:restservice filipizydorczyk:token-release filipizydorczyk:endpoint-change filipizydorczyk:cors-fixed filipizydorczyk:auth-save-release filipizydorczyk:beta-v1.0

3 Commits
capacity-f ... master

Author SHA1 Message Date
Marcin Woźniak
cf4d8c05a2 Merge pull request 'single group fix' (#54) from single0-group-fix into master 
Reviewed-on: http://git.plannaplan.pl/filipizydorczyk/backend/pulls/54
 2021-01-25 16:25:13 +01:00
Filip Izydorczyk
72f049b478 single group fix 2021-01-25 16:23:28 +01:00
Marcin Woźniak
bb7f1b6737 Merge pull request 'fixed' (#53) from capacity-fix into master 
Reviewed-on: http://git.plannaplan.pl/filipizydorczyk/backend/pulls/53
 2021-01-23 17:23:16 +01:00
1 changed files with 8 additions and 4 deletions
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;
}
/**