Merge pull request 'ZPI-277' (#49) from ZPI-277 into master

Reviewed-on: http://git.plannaplan.pl/filipizydorczyk/backend/pulls/49

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;
     }
 
     /**

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<List<? extends CommisionResponse>> 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<? extends CommisionResponse> result;
 
+                final List<Commision> commisions = this.commisionService.getUsersCommisions(user);
                 if (!groups) {
-                        result = CommisionResponseMappers.mapToResponse(this.commisionService.getUsersCommisions(user));
+                        result = CommisionResponseMappers.mapToResponse(commisions);
                 } else {
-                        result = CommisionResponseMappers
+                        if (extraInfo) {
-                                        .mapToResponseWithGroups(this.commisionService.getUsersCommisions(user));
+                                result = CommisionResponseMappers.mapToResponseWithExtraInforGroups(commisions);
+                        } else {
+                                result = CommisionResponseMappers.mapToResponseWithGroups(commisions);
+                        }
                 }
 
                 return new ResponseEntity<>(result, HttpStatus.OK);

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<ConfigTourResponse> 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<ConfigTourResponse> getTourDate() {
         final ConfigTourResponse response = new ConfigTourResponse(this.contrl.getCurrentConfig().getCurrentState());
         return new ResponseEntity<>(response, HttpStatus.OK);

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);
         }
 

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

@@ -36,19 +36,19 @@ public class AssignmentResponseMappers {
     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<>();
+        HashMap<Course, List<Assignment>> 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<Course, List<Groups>> entry : courses.entrySet()) {
+        for (Map.Entry<Course, List<Assignment>> entry : courses.entrySet()) {
             final Course course = entry.getKey();
-            final List<Groups> courseGroups = entry.getValue();
+            final List<Assignment> 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()
+                final Assignment lecture = courseGroups.stream()
-                        .filter(o -> GroupType.isLectureOrClass(o.getType()) == GroupType.LECTURE).findFirst().get();
+                        .filter(o -> GroupType.isLectureOrClass(o.getGroup().getType()) == GroupType.LECTURE)
-                final Groups classes = courseGroups.stream()
+                        .findFirst().get();
-                        .filter(o -> GroupType.isLectureOrClass(o.getType()) == GroupType.CLASS).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));

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<CommisionWithAcceptedGroupsResponse> mapToResponseWithExtraInforGroups(
+            List<Commision> commisions) {
+        return commisions.stream().filter(Objects::nonNull).map(CommisionWithAcceptedGroupsResponse::new)
+                .collect(Collectors.toList());
+    }
 }

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.lecturer = group.getLecturer().toString();
-	this.type = group.getType().toString();
+        this.type = GroupType.isLectureOrClass(group.getType()).toString();
     }
 
     /**
      * @return type of the lecture
      */
     public String getType() {
-	return type;
+        return type;
     }
 
     /**

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<Long, Integer> 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<Long, Integer> 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
      */

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;
+    }
+
+}

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<AssignmentsSingleResponse> 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<Assignment, AssignmentsSingleResponse>() {
+
+                    @Override
+                    public AssignmentsSingleResponse apply(Assignment arg0) {
+                        return new AssignmentsSingleResponse(arg0);
+                    }
+                }).collect(Collectors.toList());
+    }
+
+    /**
+     * @return lsit of fetured groups informations
+     */
+    public List<AssignmentsSingleResponse> getGroups() {
+        return groups;
+    }
+
+}

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;
 	}
 
 	/**

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)
      */

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);
     }
 
     /**

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/**");
     }