Schedule taken places

buisnesslogic/src/main/java/com/plannaplan/services/GroupService.java

@@ -7,6 +7,7 @@ import java.util.Optional;
 import java.util.stream.Collectors;
 import java.util.function.Function;
 
+import com.plannaplan.entities.Assignment;
 import com.plannaplan.entities.Groups;
 import com.plannaplan.repositories.GroupRepository;
 
@@ -30,7 +31,7 @@ public class GroupService {
         return this.repo.find(time, room, capacity);
     }
 
-    public Optional<Groups> find(Integer zajCykId, Integer nrGr ) {
+    public Optional<Groups> find(Integer zajCykId, Integer nrGr) {
         return this.repo.find(zajCykId, nrGr);
     }
 
@@ -64,6 +65,16 @@ public class GroupService {
 
     }
 
+    /**
+     * 
+     * @param assingemnts list of assingemnts you want to get taken places ammount
+     * @return HashMap<Long, Integer> where Long is group id and Integer is how many
+     *         places in gorup is already taken
+     */
+    public HashMap<Long, Integer> getTakenPlacesOfAssignments(List<Assignment> assignments) {
+        return getTakenPlaces(assignments.stream().map(Assignment::getGroup).collect(Collectors.toList()));
+    }
+
     /**
      * 
      * @param groups list of groups you want to get taken places ammount

restservice/src/main/java/com/plannaplan/controllers/CommisionController.java

@@ -36,6 +36,7 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestParam;
 
 import java.util.ArrayList;
+import java.util.HashMap;
 
 import com.plannaplan.responses.mappers.AssignmentResponseMappers;
 import com.plannaplan.responses.models.AssignmentResponse;
@@ -127,7 +128,10 @@ public class CommisionController extends TokenBasedController {
 
                 if (com.isPresent()) {
                         List<Assignment> respone = this.assignmentService.getCommisionAssignments(com.get());
-                        return new ResponseEntity<>(AssignmentResponseMappers.mapToResponse(respone), HttpStatus.OK);
+                        final HashMap<Long, Integer> ammounts = this.groupServcicxe
+                                        .getTakenPlacesOfAssignments(respone);
+                        return new ResponseEntity<>(AssignmentResponseMappers.mapToResponse(respone, ammounts),
+                                        HttpStatus.OK);
                 }
 
                 return new ResponseEntity<>(new ArrayList<>(), HttpStatus.OK);

restservice/src/main/java/com/plannaplan/responses/mappers/AssignmentResponseMappers.java

@@ -14,6 +14,11 @@ import com.plannaplan.types.GroupType;
 public class AssignmentResponseMappers {
 
     public static final List<AssignmentResponse> mapToResponse(List<Assignment> assignments) {
+        return mapToResponse(assignments, null);
+    }
+
+    public static final List<AssignmentResponse> mapToResponse(List<Assignment> assignments,
+            HashMap<Long, Integer> ammounts) {
         List<AssignmentResponse> response = new ArrayList<>();
         HashMap<Course, List<Groups>> courses = new HashMap<>();
         assignments.stream().forEach((Assignment assignment) -> {
@@ -29,14 +34,23 @@ public class AssignmentResponseMappers {
             final Course course = entry.getKey();
             final List<Groups> courseGroups = entry.getValue();
             if (courseGroups.size() == 1) {
+                if (ammounts != null) {
+                    response.add(new AssignmentResponse(course, courseGroups.get(0), ammounts));
+                } else {
                     response.add(new AssignmentResponse(course, courseGroups.get(0)));
                 }
+            }
             if (courseGroups.size() == 2) {
                 final Groups lecture = courseGroups.stream().filter(o -> o.getType() == GroupType.LECTURE).findFirst()
                         .get();
                 final Groups classes = courseGroups.stream().filter(o -> o.getType() == GroupType.CLASS).findFirst()
                         .get();
+
+                if (ammounts != null) {
+                    response.add(new AssignmentResponse(course, lecture, classes, ammounts));
+                } else {
                     response.add(new AssignmentResponse(course, lecture, classes));
+                }
 
             }
         }

restservice/src/main/java/com/plannaplan/responses/models/AssignmentResponse.java

@@ -1,5 +1,7 @@
 package com.plannaplan.responses.models;
 
+import java.util.HashMap;
+
 import com.plannaplan.entities.Course;
 import com.plannaplan.entities.Groups;
 import com.plannaplan.types.GroupType;
@@ -20,11 +22,23 @@ public class AssignmentResponse {
         this.classes = classes == null ? null : new GroupWithCapacityResponse(classes);
     }
 
+    public AssignmentResponse(Course course, Groups lecture, Groups classes, HashMap<Long, Integer> ammounts) {
+        this.id = course.getId();
+        this.name = course.getName();
+        this.lecture = lecture == null ? null : new GroupWithCapacityResponse(lecture, ammounts.get(lecture.getId()));
+        this.classes = classes == null ? null : new GroupWithCapacityResponse(classes, ammounts.get(classes.getId()));
+    }
+
     public AssignmentResponse(Course course, Groups group) {
         this(course, group.getType() == GroupType.LECTURE ? group : null,
                 group.getType() == GroupType.CLASS ? group : null);
     }
 
+    public AssignmentResponse(Course course, Groups group, HashMap<Long, Integer> ammounts) {
+        this(course, group.getType() == GroupType.LECTURE ? group : null,
+                group.getType() == GroupType.CLASS ? group : null, ammounts);
+    }
+
     public GroupWithCapacityResponse getLecture() {
         return this.lecture;
     }