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

brigning down group tpes

Browse Source
This commit is contained in:
Filip Izydorczyk
2021-01-19 10:44:35 +01:00
parent 06fb41b5dd
commit 6a4ea45900
7 changed files with 99 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
restservice/src/main/java/com/plannaplan/controllers/CoursesController.java
View File

@ -68,7 +68,7 @@ public class CoursesController {
final HashMap<Long, Integer> ammounts = this.groupService.getTakenPlaces(course.getGroups());
course.getGroups().stream().forEach(group -> {
if (group.getType() == GroupType.CLASS) {
if (GroupType.isLectureOrClass(group.getType()) == GroupType.CLASS) {
classes.add(new GroupWithCapacityResponse(group, ammounts.get(group.getId())));
} else {
lectures.add(new GroupWithCapacityResponse(group, ammounts.get(group.getId())));

8
restservice/src/main/java/com/plannaplan/responses/mappers/AssignmentResponseMappers.java
View File

@ -57,10 +57,10 @@ public class AssignmentResponseMappers {
}
}
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();
final Groups lecture = courseGroups.stream()
.filter(o -> GroupType.isLectureOrClass(o.getType()) == GroupType.LECTURE).findFirst().get();
final Groups classes = courseGroups.stream()
.filter(o -> GroupType.isLectureOrClass(o.getType()) == GroupType.CLASS).findFirst().get();
if (ammounts != null) {
response.add(new AssignmentResponse(course, lecture, classes, ammounts));

4
restservice/src/main/java/com/plannaplan/responses/mappers/GroupsMappers.java
View File

@ -83,7 +83,7 @@ public class GroupsMappers {
List<GroupDefaultResponse> classes = new ArrayList<>();
groups.stream().forEach(group -> {
if (group.getType() == GroupType.CLASS) {
if (GroupType.isLectureOrClass(group.getType()) == GroupType.CLASS) {
if (taken != null) {
classes.add(new GroupDefaultResponse(group, taken.get(group.getId())));
} else {
@ -122,7 +122,7 @@ public class GroupsMappers {
List<GroupWithCapacityResponse> classes = new ArrayList<>();
groups.stream().forEach(group -> {
if (group.getType() == GroupType.CLASS) {
if (GroupType.isLectureOrClass(group.getType()) == GroupType.CLASS) {
if (taken != null) {
classes.add(new GroupWithCapacityResponse(group, taken.get(group.getId())));
} else {

8
restservice/src/main/java/com/plannaplan/responses/models/AssignmentResponse.java
View File

@ -50,8 +50,8 @@ public class AssignmentResponse {
* @param group class/lecture entity
*/
public AssignmentResponse(Course course, Groups group) {
this(course, group.getType() == GroupType.LECTURE ? group : null,
group.getType() == GroupType.CLASS ? group : null);
this(course, GroupType.isLectureOrClass(group.getType()) == GroupType.LECTURE ? group : null,
GroupType.isLectureOrClass(group.getType()) == GroupType.CLASS ? group : null);
}
/**
@ -61,8 +61,8 @@ public class AssignmentResponse {
* places
*/
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);
this(course, GroupType.isLectureOrClass(group.getType()) == GroupType.LECTURE ? group : null,
GroupType.isLectureOrClass(group.getType()) == GroupType.CLASS ? group : null, ammounts);
}
/**

2
restservice/src/main/java/com/plannaplan/responses/models/CoursesWithGroupsResponse.java
View File

@ -30,7 +30,7 @@ public class CoursesWithGroupsResponse extends CoursesResponse {
public CoursesWithGroupsResponse(Course course) {
super(course);
course.getGroups().stream().forEach(group -> {
if (group.getType() == GroupType.CLASS) {
if (GroupType.isLectureOrClass(group.getType()) == GroupType.CLASS) {
this.classes.add(new GroupWithCapacityResponse(group));
} else {
this.lectures.add(new GroupWithCapacityResponse(group));