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

Part 2 has been ended. The Part 3: chanaged test

Browse Source
This commit is contained in:
Marcin Woźniak
2020-11-08 17:20:00 +01:00
parent a30c3af09c
commit 035de011f2
16 changed files with 82 additions and 82 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
restservice/src/main/java/com/plannaplan/responses/models/GetCurrentAssignmentsResponse.java → restservice/src/main/java/com/plannaplan/responses/models/AssignmentResponse.java
View File

@ -6,30 +6,30 @@ import com.plannaplan.types.GroupType;
import io.swagger.annotations.ApiModel;
@ApiModel(description = "Response shows information about given assigment to course.", value = "GetCurrentAssignmentsResponse")
public class GetCurrentAssignmentsResponse {
@ApiModel(description = "Response shows information about given assigment to course.", value = "AssignmentResponse")
public class AssignmentResponse {
private Long id;
private String name;
private WithCapacityGroupResponse classes;
private WithCapacityGroupResponse lecture;
private GroupWithCapacityResponse classes;
private GroupWithCapacityResponse lecture;
public GetCurrentAssignmentsResponse(Course course, Groups lecture, Groups classes) {
public AssignmentResponse(Course course, Groups lecture, Groups classes) {
this.id = course.getId();
this.name = course.getName();
this.lecture = lecture == null ? null : new WithCapacityGroupResponse(lecture);
this.classes = classes == null ? null : new WithCapacityGroupResponse(classes);
this.lecture = lecture == null ? null : new GroupWithCapacityResponse(lecture);
this.classes = classes == null ? null : new GroupWithCapacityResponse(classes);
}
public GetCurrentAssignmentsResponse(Course course, Groups group) {
public AssignmentResponse(Course course, Groups group) {
this(course, group.getType() == GroupType.LECTURE ? group : null,
group.getType() == GroupType.CLASS ? group : null);
}
public WithCapacityGroupResponse getLecture() {
public GroupWithCapacityResponse getLecture() {
return this.lecture;
}
public WithCapacityGroupResponse getClasses() {
public GroupWithCapacityResponse getClasses() {
return this.classes;
}

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

@ -7,7 +7,7 @@ import com.plannaplan.entities.Commision;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
@ApiModel(description = "Response shows information about commision", value = "CommisionResponse")
@ApiModel(description = "Response shows information about commision.", value = "CommisionResponse")
public class CommisionResponse {
@ApiModelProperty(value = "ID created by database")
private Long id;

6
restservice/src/main/java/com/plannaplan/responses/models/GetCourseGroupsResponse.java → restservice/src/main/java/com/plannaplan/responses/models/CourseWithGroupsResponse.java
View File

@ -5,13 +5,13 @@ import java.util.List;
import io.swagger.annotations.ApiModel;
@ApiModel(description = "Response shows information about groups to given course.", value = "DefaultGroupResponse")
public class GetCourseGroupsResponse <T> {
@ApiModel(description = "Response shows information about groups to given course.", value = "CourseWithGroupsResponse")
public class CourseWithGroupsResponse <T> {
private List<T> lectures = new ArrayList<>();
private List<T> classes = new ArrayList<>();
public GetCourseGroupsResponse(List<T> classes, List<T> lectures ){
public CourseWithGroupsResponse(List<T> classes, List<T> lectures ){
this.lectures = lectures;
this.classes = classes;
}

6
restservice/src/main/java/com/plannaplan/responses/models/GetCoursesResponse.java → restservice/src/main/java/com/plannaplan/responses/models/CoursesDefaultResponse.java
View File

@ -5,10 +5,10 @@ import com.plannaplan.responses.models.abstracts.CoursesResponse;
import io.swagger.annotations.ApiModel;
@ApiModel(description = "Response shows information about course.", value = "DefaultGroupResponse")
public class GetCoursesResponse extends CoursesResponse {
@ApiModel(description = "Response shows information about course.", value = "CoursesDefaultResponse")
public class CoursesDefaultResponse extends CoursesResponse {
public GetCoursesResponse(Course course) {
public CoursesDefaultResponse(Course course) {
super(course);
}

18
restservice/src/main/java/com/plannaplan/responses/models/GetCoursesWithGroupsResponse.java → restservice/src/main/java/com/plannaplan/responses/models/CoursesWithGroupsResponse.java
View File

@ -9,28 +9,28 @@ import com.plannaplan.types.GroupType;
import io.swagger.annotations.ApiModel;
@ApiModel(description = "Response shows information about groups to given course.", value = "GetCoursesWithGroupsResponse")
public class GetCoursesWithGroupsResponse extends CoursesResponse {
@ApiModel(description = "Response shows information about groups to given course.", value = "CoursesWithGroupsResponse")
public class CoursesWithGroupsResponse extends CoursesResponse {
private List<DefaultGroupResponse> lectures = new ArrayList<>();
private List<DefaultGroupResponse> classes = new ArrayList<>();
private List<GroupDefaultResponse> lectures = new ArrayList<>();
private List<GroupDefaultResponse> classes = new ArrayList<>();
public GetCoursesWithGroupsResponse(Course course) {
public CoursesWithGroupsResponse(Course course) {
super(course);
course.getGroups().stream().forEach(group -> {
if (group.getType() == GroupType.CLASS) {
this.classes.add(new DefaultGroupResponse(group));
this.classes.add(new GroupDefaultResponse(group));
} else {
this.lectures.add(new DefaultGroupResponse(group));
this.lectures.add(new GroupDefaultResponse(group));
}
});
}
public List<DefaultGroupResponse> getClasses() {
public List<GroupDefaultResponse> getClasses() {
return this.classes;
}
public List<DefaultGroupResponse> getLectures() {
public List<GroupDefaultResponse> getLectures() {
return this.lectures;
}

8
restservice/src/main/java/com/plannaplan/responses/models/DefaultGroupResponse.java → restservice/src/main/java/com/plannaplan/responses/models/GroupDefaultResponse.java
View File

@ -7,8 +7,8 @@ import com.plannaplan.types.GroupType;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
@ApiModel(description = "Response shows information about given group", value = "DefaultGroupResponse")
public class DefaultGroupResponse {
@ApiModel(description = "Response shows information about given group.", value = "GroupDefaultResponse")
public class GroupDefaultResponse {
@ApiModelProperty(value = "ID created by database.")
private Long id;
@ -28,7 +28,7 @@ public class DefaultGroupResponse {
@ApiModelProperty(value = "Value shows kind of group. The types are LECTURE or CLASS.")
private GroupType type;
public DefaultGroupResponse(Groups group) {
public GroupDefaultResponse(Groups group) {
this.id = group.getId() != null ? group.getId() : null;
this.day = group.getDay() != null ? group.getDay().label : -1;
this.time = group.getTimeString() != null ? group.getTimeString() : "";
@ -37,7 +37,7 @@ public class DefaultGroupResponse {
this.type = group.getType() != null ? group.getType() : null;
}
public DefaultGroupResponse(Assignment assignment) {
public GroupDefaultResponse(Assignment assignment) {
this(assignment.getGroup());
}

8
restservice/src/main/java/com/plannaplan/responses/models/WithCapacityGroupResponse.java → restservice/src/main/java/com/plannaplan/responses/models/GroupWithCapacityResponse.java
View File

@ -4,17 +4,17 @@ import com.plannaplan.entities.Assignment;
import com.plannaplan.entities.Groups;
import io.swagger.annotations.ApiModel;
@ApiModel(description = "Response shows information about group with included capacity.", value = "WithCapacityGroupResponse")
public class WithCapacityGroupResponse extends DefaultGroupResponse {
@ApiModel(description = "Response shows information about group with included capacity.", value = "GroupWithCapacityResponse")
public class GroupWithCapacityResponse extends GroupDefaultResponse {
private int capacity;
public WithCapacityGroupResponse(Groups group) {
public GroupWithCapacityResponse(Groups group) {
super(group);
this.capacity = group.getCapacity();
}
public WithCapacityGroupResponse(Assignment assignment) {
public GroupWithCapacityResponse(Assignment assignment) {
this(assignment.getGroup());
}

6
restservice/src/main/java/com/plannaplan/responses/models/SearchForStudentsResponse.java → restservice/src/main/java/com/plannaplan/responses/models/UserResponse.java
View File

@ -4,15 +4,15 @@ import com.plannaplan.entities.User;
import io.swagger.annotations.ApiModel;
@ApiModel(description = "Response shows information about user.", value = "SearchForStudentsResponse")
public class SearchForStudentsResponse {
@ApiModel(description = "Response shows information about user.", value = "UserResponse")
public class UserResponse {
private Long id;
private String name;
private String surname;
private String email;
public SearchForStudentsResponse(User user) {
public UserResponse(User user) {
this.id = user.getId();
this.name = user.getName();
this.surname = user.getSurname();