From 72f049b478795bc49a745d7270377d07db7cbc29 Mon Sep 17 00:00:00 2001 From: Filip Izydorczyk Date: Mon, 25 Jan 2021 16:23:28 +0100 Subject: [PATCH] single group fix --- .../responses/models/AssignmentResponse.java | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) 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 cf06066..0616dfe 100755 --- a/restservice/src/main/java/com/plannaplan/responses/models/AssignmentResponse.java +++ b/restservice/src/main/java/com/plannaplan/responses/models/AssignmentResponse.java @@ -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; } /**