Resolved confilics with master

Signed-off-by: Marcin Woźniak <y0rune@aol.com>

buisnesslogic/src/main/java/com/plannaplan/repositories/GroupRepository.java

@@ -31,4 +31,18 @@ public interface GroupRepository extends JpaRepository<Groups, Long> {
     @Query("FROM Groups WHERE course_id = ?1")
     List<Groups> getByCourse(@Param("id") Long id);
 
+    @Query("SELECT COUNT(*) AS assinged_times FROM Assignment WHERE isPastAssignment=false GROUP BY group HAVING group_id=?1")
+    Optional<Number> getAssignedAmount(Long groupId);
+
+    /**
+     * PLAIN SQL QUERY: SELECT group_id, COUNT(*) assinged_times FROM assignment
+     * WHERE is_past_assignment=0 GROUP BY group_id HAVING group_id IN (:ids)")
+     * 
+     * @param groupIds list of groups ids
+     * @return list of objects arrays where first object is Groups instance and
+     *         second is Long that is taken places value
+     */
+    @Query("SELECT group, COUNT(*) AS assinged_times FROM Assignment a WHERE a.isPastAssignment=false GROUP BY a.group HAVING group_id IN (:ids)")
+    List<Object[]> getAssignedAmounts(@Param("ids") List<Long> groupIds);
+
 }