diff --git a/buisnesslogic/src/main/java/com/plannaplan/entities/User.java b/buisnesslogic/src/main/java/com/plannaplan/entities/User.java index 8758a24..08b15f4 100755 --- a/buisnesslogic/src/main/java/com/plannaplan/entities/User.java +++ b/buisnesslogic/src/main/java/com/plannaplan/entities/User.java @@ -165,7 +165,7 @@ public class User { public void setToken(String token) { this.tokenUsageDate = new Timestamp(System.currentTimeMillis()); this.token = token; - this.refreshToken = UUID.randomUUID().toString(); + this.refreshToken = this.refreshToken == null ? UUID.randomUUID().toString() : this.refreshToken; } /** diff --git a/restservice/src/main/java/com/plannaplan/controllers/CommisionController.java b/restservice/src/main/java/com/plannaplan/controllers/CommisionController.java index 1d9a7cd..b96da7b 100755 --- a/restservice/src/main/java/com/plannaplan/controllers/CommisionController.java +++ b/restservice/src/main/java/com/plannaplan/controllers/CommisionController.java @@ -160,17 +160,22 @@ public class CommisionController extends TokenBasedController { @GetMapping("/user") @ApiOperation("Return list of user all commisions (history of schedules)") public ResponseEntity> getAlCommisions( - @RequestParam(name = "groups", defaultValue = "false") @ApiParam(value = "Boolean if we want to display wiht commision's group ids") Boolean groups) + @RequestParam(name = "groups", defaultValue = "false") @ApiParam(value = "Boolean if we want to display wiht commision's group ids") Boolean groups, + @RequestParam(name = "extraInfo", defaultValue = "false") @ApiParam(value = "Boolean if we want to display extra info about listed groups. Works only if we have groups set top true") Boolean extraInfo) throws UserNotFoundException { User user = this.getCurrentUser().orElseThrow(() -> new NullPointerException()); List result; + final List commisions = this.commisionService.getUsersCommisions(user); if (!groups) { - result = CommisionResponseMappers.mapToResponse(this.commisionService.getUsersCommisions(user)); + result = CommisionResponseMappers.mapToResponse(commisions); } else { - result = CommisionResponseMappers - .mapToResponseWithGroups(this.commisionService.getUsersCommisions(user)); + if (extraInfo) { + result = CommisionResponseMappers.mapToResponseWithExtraInforGroups(commisions); + } else { + result = CommisionResponseMappers.mapToResponseWithGroups(commisions); + } } return new ResponseEntity<>(result, HttpStatus.OK); diff --git a/restservice/src/main/java/com/plannaplan/controllers/ConfigController.java b/restservice/src/main/java/com/plannaplan/controllers/ConfigController.java index 59a5bdd..4bee96a 100755 --- a/restservice/src/main/java/com/plannaplan/controllers/ConfigController.java +++ b/restservice/src/main/java/com/plannaplan/controllers/ConfigController.java @@ -173,9 +173,20 @@ public class ConfigController { /** * @return api response entity */ + @GetMapping(path = "/config/tour") + @ApiOperation("It will return what tour is currently on.") + public ResponseEntity getCurrentTourDate() { + final ConfigTourResponse response = new ConfigTourResponse(this.contrl.getCurrentConfig().getCurrentState()); + return new ResponseEntity<>(response, HttpStatus.OK); + } + + /** + * @return api response entity + */ + @Deprecated @GetMapping(path = "/admin/tour") @PreAuthorize("hasRole('ROLE_ADMIN')") - @ApiOperation("It will return what tour is currently on. You need to provide admin token.") + @ApiOperation("It will return what tour is currently on. You need to provide admin token. It is depreaceted use /configurator/config/tour isntead.") public ResponseEntity getTourDate() { final ConfigTourResponse response = new ConfigTourResponse(this.contrl.getCurrentConfig().getCurrentState()); return new ResponseEntity<>(response, HttpStatus.OK); diff --git a/restservice/src/main/java/com/plannaplan/controllers/ExchangeController.java b/restservice/src/main/java/com/plannaplan/controllers/ExchangeController.java index d063e0b..9b2edce 100755 --- a/restservice/src/main/java/com/plannaplan/controllers/ExchangeController.java +++ b/restservice/src/main/java/com/plannaplan/controllers/ExchangeController.java @@ -16,6 +16,7 @@ import com.plannaplan.responses.models.ExchangeResponse; import com.plannaplan.services.AssignmentService; import com.plannaplan.services.ExchangeService; import com.plannaplan.services.GroupService; +import com.plannaplan.types.GroupType; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.http.HttpStatus; @@ -89,13 +90,14 @@ public class ExchangeController extends TokenBasedController { final Groups groupInstance = group.get(); if (assignmentInstance.getGroup().getCourseId() != null - && ! assignmentInstance.getGroup().getCourseId().getId().equals(groupInstance.getCourseId().getId())) { + && !assignmentInstance.getGroup().getCourseId().getId().equals(groupInstance.getCourseId().getId())) { System.out.println(assignmentInstance.getGroup().getCourseId().getId()); System.out.println(groupInstance.getCourseId().getId()); return new ResponseEntity<>("You can performe exchange only within one course.", HttpStatus.BAD_REQUEST); } - if (assignmentInstance.getGroup().getType() != groupInstance.getType()) { + if (GroupType.isLectureOrClass(assignmentInstance.getGroup().getType()) != GroupType + .isLectureOrClass(groupInstance.getType())) { return new ResponseEntity<>("You can't exchange lecture to class and otherwise.", HttpStatus.BAD_REQUEST); } diff --git a/restservice/src/main/java/com/plannaplan/responses/mappers/AssignmentResponseMappers.java b/restservice/src/main/java/com/plannaplan/responses/mappers/AssignmentResponseMappers.java index 1434b65..1084ef8 100755 --- a/restservice/src/main/java/com/plannaplan/responses/mappers/AssignmentResponseMappers.java +++ b/restservice/src/main/java/com/plannaplan/responses/mappers/AssignmentResponseMappers.java @@ -36,19 +36,19 @@ public class AssignmentResponseMappers { public static final List mapToResponse(List assignments, HashMap ammounts) { List response = new ArrayList<>(); - HashMap> courses = new HashMap<>(); + HashMap> courses = new HashMap<>(); assignments.stream().forEach((Assignment assignment) -> { final Groups group = assignment.getGroup(); final Course course = group.getCourseId(); if (courses.get(course) == null) { courses.put(course, new ArrayList<>()); } - courses.get(course).add(group); + courses.get(course).add(assignment); }); - for (Map.Entry> entry : courses.entrySet()) { + for (Map.Entry> entry : courses.entrySet()) { final Course course = entry.getKey(); - final List courseGroups = entry.getValue(); + final List courseGroups = entry.getValue(); if (courseGroups.size() == 1) { if (ammounts != null) { response.add(new AssignmentResponse(course, courseGroups.get(0), ammounts)); @@ -57,10 +57,12 @@ public class AssignmentResponseMappers { } } if (courseGroups.size() == 2) { - 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(); + final Assignment lecture = courseGroups.stream() + .filter(o -> GroupType.isLectureOrClass(o.getGroup().getType()) == GroupType.LECTURE) + .findFirst().get(); + final Assignment classes = courseGroups.stream() + .filter(o -> GroupType.isLectureOrClass(o.getGroup().getType()) == GroupType.CLASS).findFirst() + .get(); if (ammounts != null) { response.add(new AssignmentResponse(course, lecture, classes, ammounts)); diff --git a/restservice/src/main/java/com/plannaplan/responses/mappers/CommisionResponseMappers.java b/restservice/src/main/java/com/plannaplan/responses/mappers/CommisionResponseMappers.java index 1962a4f..9c8ce6e 100755 --- a/restservice/src/main/java/com/plannaplan/responses/mappers/CommisionResponseMappers.java +++ b/restservice/src/main/java/com/plannaplan/responses/mappers/CommisionResponseMappers.java @@ -6,6 +6,7 @@ import java.util.stream.Collectors; import com.plannaplan.entities.Commision; import com.plannaplan.responses.models.CommisionResponse; +import com.plannaplan.responses.models.CommisionWithAcceptedGroupsResponse; import com.plannaplan.responses.models.CommisionWithGroupsResponse; /** @@ -28,4 +29,14 @@ public class CommisionResponseMappers { return commisions.stream().filter(Objects::nonNull).map(CommisionWithGroupsResponse::new) .collect(Collectors.toList()); } + + /** + * @param commisions list of commisions to be mapped + * @return list of api responses + */ + public static final List mapToResponseWithExtraInforGroups( + List commisions) { + return commisions.stream().filter(Objects::nonNull).map(CommisionWithAcceptedGroupsResponse::new) + .collect(Collectors.toList()); + } } diff --git a/restservice/src/main/java/com/plannaplan/responses/models/AssignmentDetailedResponse.java b/restservice/src/main/java/com/plannaplan/responses/models/AssignmentDetailedResponse.java index bbb2490..7328495 100755 --- a/restservice/src/main/java/com/plannaplan/responses/models/AssignmentDetailedResponse.java +++ b/restservice/src/main/java/com/plannaplan/responses/models/AssignmentDetailedResponse.java @@ -2,6 +2,7 @@ package com.plannaplan.responses.models; import com.plannaplan.entities.Assignment; import com.plannaplan.entities.Groups; +import com.plannaplan.types.GroupType; /** * Assignment detailed response for api @@ -25,15 +26,15 @@ public class AssignmentDetailedResponse { this.day = group.getDay().label; this.time = group.getTimeString(); this.endTime = group.getEndTimeString(); - this.lecturer = group.getLecturer().toString(); - this.type = group.getType().toString(); + this.lecturer = group.getLecturer().toString(); + this.type = GroupType.isLectureOrClass(group.getType()).toString(); } /** * @return type of the lecture */ public String getType() { - return type; + return type; } /** 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 04078da..b20e2a1 100755 --- a/restservice/src/main/java/com/plannaplan/responses/models/AssignmentResponse.java +++ b/restservice/src/main/java/com/plannaplan/responses/models/AssignmentResponse.java @@ -2,6 +2,7 @@ package com.plannaplan.responses.models; import java.util.HashMap; +import com.plannaplan.entities.Assignment; import com.plannaplan.entities.Course; import com.plannaplan.entities.Groups; import com.plannaplan.types.GroupType; @@ -65,6 +66,51 @@ public class AssignmentResponse { GroupType.isLectureOrClass(group.getType()) == GroupType.CLASS ? group : null, ammounts); } + /** + * @param course course entity + * @param group class/lecture entity + * @param ammounts map with ammounts key - group id, value - ammounts of taken + * places + */ + public AssignmentResponse(Course course, Assignment group, HashMap ammounts) { + this(course, GroupType.isLectureOrClass(group.getGroup().getType()) == GroupType.LECTURE ? group : null, + GroupType.isLectureOrClass(group.getGroup().getType()) == GroupType.CLASS ? group : null, ammounts); + } + + /** + * + * @param course course entity + * @param group class/lecture entity + */ + public AssignmentResponse(Course course, Assignment group) { + this(course, GroupType.isLectureOrClass(group.getGroup().getType()) == GroupType.LECTURE ? group : null, + GroupType.isLectureOrClass(group.getGroup().getType()) == GroupType.CLASS ? group : null); + } + + /** + * @param course course entity + * @param lecture lecture Groups entity + * @param classes class Groups entity + * @param ammounts map with ammounts key - group id, value - ammounts of taken + * places + */ + public AssignmentResponse(Course course, Assignment lecture, Assignment classes, HashMap ammounts) { + this.name = course.getName(); + this.classes = new GroupWithCapacityResponse(classes, ammounts.get(classes.getGroup().getId())); + this.lecture = new GroupWithCapacityResponse(lecture, ammounts.get(lecture.getGroup().getId())); + } + + /** + * @param course course entity + * @param lecture lecture Groups entity + * @param classes class Groups entity + */ + public AssignmentResponse(Course course, Assignment lecture, Assignment classes) { + this.name = course.getName(); + this.classes = new GroupWithCapacityResponse(classes); + this.lecture = new GroupWithCapacityResponse(lecture); + } + /** * @return Lecture in api response forms */ diff --git a/restservice/src/main/java/com/plannaplan/responses/models/AssignmentsSingleResponse.java b/restservice/src/main/java/com/plannaplan/responses/models/AssignmentsSingleResponse.java new file mode 100755 index 0000000..1699f05 --- /dev/null +++ b/restservice/src/main/java/com/plannaplan/responses/models/AssignmentsSingleResponse.java @@ -0,0 +1,34 @@ +package com.plannaplan.responses.models; + +import com.plannaplan.entities.Assignment; + +/** + * Repsonse for single assignment to use in commision repsonse + */ +public class AssignmentsSingleResponse { + private Long id; + private boolean isAccepted; + + /** + * @param assignment to map to response + */ + public AssignmentsSingleResponse(Assignment assignment) { + this.id = assignment.getGroup().getId(); + this.isAccepted = assignment.isAccepted(); + } + + /** + * @return id of assigned group + */ + public Long getId() { + return id; + } + + /** + * @return is group already accepted or not + */ + public boolean isAccepted() { + return isAccepted; + } + +} diff --git a/restservice/src/main/java/com/plannaplan/responses/models/CommisionWithAcceptedGroupsResponse.java b/restservice/src/main/java/com/plannaplan/responses/models/CommisionWithAcceptedGroupsResponse.java new file mode 100755 index 0000000..f0450a1 --- /dev/null +++ b/restservice/src/main/java/com/plannaplan/responses/models/CommisionWithAcceptedGroupsResponse.java @@ -0,0 +1,43 @@ +package com.plannaplan.responses.models; + +import java.util.List; +import java.util.Objects; +import java.util.function.Function; +import java.util.stream.Collectors; + +import com.plannaplan.entities.Assignment; +import com.plannaplan.entities.Commision; + +import io.swagger.annotations.ApiModel; + +/** + * Commision With Groups api Response. It extends CommisionResponse repsone + */ +@ApiModel(description = "Response shows information about commision and its groups. It also has info about group state (is accepted or not)", value = "CommisionWithGroupsResponse") +public class CommisionWithAcceptedGroupsResponse extends CommisionResponse { + + private List groups; + + /** + * @param commision commision to map to api response + */ + public CommisionWithAcceptedGroupsResponse(Commision commision) { + super(commision); + this.groups = commision.getAssignments().stream().filter(Objects::nonNull) + .map(new Function() { + + @Override + public AssignmentsSingleResponse apply(Assignment arg0) { + return new AssignmentsSingleResponse(arg0); + } + }).collect(Collectors.toList()); + } + + /** + * @return lsit of fetured groups informations + */ + public List getGroups() { + return groups; + } + +} diff --git a/restservice/src/main/java/com/plannaplan/responses/models/ExchangeResponse.java b/restservice/src/main/java/com/plannaplan/responses/models/ExchangeResponse.java index 4a02a83..8e8d50a 100755 --- a/restservice/src/main/java/com/plannaplan/responses/models/ExchangeResponse.java +++ b/restservice/src/main/java/com/plannaplan/responses/models/ExchangeResponse.java @@ -16,6 +16,7 @@ public class ExchangeResponse { private GroupDefaultResponse ownedAssignment; @ApiModelProperty(value = "Group that user want to get") private GroupDefaultResponse desiredGroup; + private String courseName; /** * creat new instance @@ -26,6 +27,16 @@ public class ExchangeResponse { this.id = exchange.getId(); this.ownedAssignment = new GroupDefaultResponse(exchange.getOwnedAssignment().getGroup()); this.desiredGroup = new GroupDefaultResponse(exchange.getDesiredAssignment()); + this.courseName = exchange.getOwnedAssignment().getGroup().getCourseId() != null + ? exchange.getOwnedAssignment().getGroup().getCourseId().getName() + : ""; + } + + /** + * @return name of course related to exchange + */ + public String getCourseName() { + return courseName; } /** diff --git a/restservice/src/main/java/com/plannaplan/responses/models/GroupDefaultResponse.java b/restservice/src/main/java/com/plannaplan/responses/models/GroupDefaultResponse.java index 5dce6da..7743560 100755 --- a/restservice/src/main/java/com/plannaplan/responses/models/GroupDefaultResponse.java +++ b/restservice/src/main/java/com/plannaplan/responses/models/GroupDefaultResponse.java @@ -39,6 +39,9 @@ public class GroupDefaultResponse { @ApiModelProperty(value = "Value shows how many places is already taken by other students.") private Integer takenPlaces; + @ApiModelProperty(value = "Used only in resposnes realted to user assignments. For example in /api/v1/users/schedule.") + private Boolean isAccepted; + /** * creat new entity * @@ -54,6 +57,13 @@ public class GroupDefaultResponse { this.type = group.getType() != null ? GroupType.isLectureOrClass(group.getType()) : null; } + /** + * @return is group accepted if its related to assignmetn + */ + public Boolean getIsAccepted() { + return isAccepted; + } + /** * * @param group entity to map to api response @@ -73,6 +83,16 @@ public class GroupDefaultResponse { this(assignment.getGroup()); } + /** + * + * @param assignment entity to map to api response + * @param takenPlaces map with ammounts of taken places + */ + public GroupDefaultResponse(Assignment assignment, int takenPlaces) { + this(assignment.getGroup(), takenPlaces); + this.isAccepted = assignment.isAccepted(); + } + /** * @return what typew of group is this (lecture or class) */ diff --git a/restservice/src/main/java/com/plannaplan/responses/models/GroupWithCapacityResponse.java b/restservice/src/main/java/com/plannaplan/responses/models/GroupWithCapacityResponse.java index 881dcfe..acb2e77 100755 --- a/restservice/src/main/java/com/plannaplan/responses/models/GroupWithCapacityResponse.java +++ b/restservice/src/main/java/com/plannaplan/responses/models/GroupWithCapacityResponse.java @@ -49,7 +49,7 @@ public class GroupWithCapacityResponse extends GroupDefaultResponse { * @param takenPlaces group taken places */ public GroupWithCapacityResponse(Assignment assignment, int takenPlaces) { - this(assignment.getGroup(), takenPlaces); + super(assignment, takenPlaces); } /** diff --git a/restservice/src/main/java/com/plannaplan/security/WebSecurityConfig.java b/restservice/src/main/java/com/plannaplan/security/WebSecurityConfig.java index a5bbce8..420be63 100755 --- a/restservice/src/main/java/com/plannaplan/security/WebSecurityConfig.java +++ b/restservice/src/main/java/com/plannaplan/security/WebSecurityConfig.java @@ -40,7 +40,8 @@ public class WebSecurityConfig extends WebSecurityConfigurerAdapter { @Override public void configure(final WebSecurity webSecurity) { webSecurity.ignoring().antMatchers("/token**").antMatchers("/token/refresh**") - .antMatchers("/api/v1/courses/all").antMatchers("/api/v1/groups/course/{id}") + .antMatchers("/api/v1/courses/all") + .antMatchers("/api/v1/groups/course/{id}", "/api/v1/configurator/config/tour") .antMatchers("/v2/api-docs", "/configuration/ui", "/swagger-resources/**", "/configuration/security", "/swagger-ui.html", "/webjars/**"); }