Merge branch 'import-assistants' into 'development'

Import assistants

Closes #202

See merge request !135

build.gradle

 buildscript {
 	ext {
-		springBootVersion = '1.5.22.RELEASE'
+		springBootVersion = '1.5.15.RELEASE'
 		//springBootVersion = '2.0.9.RELEASE'
 		queryDslVersion = '4.2.1'
 	}

src/main/java/nl/tudelft/ewi/queue/controller/CourseController.java

@@ -28,7 +28,32 @@ import javax.validation.Valid;
 import nl.tudelft.ewi.queue.annotation.AuthenticatedUser;
 import nl.tudelft.ewi.queue.forms.AssignmentListWrapperForm;
 import nl.tudelft.ewi.queue.forms.ParticipantForm;
+import nl.tudelft.ewi.queue.model.Assignment;
+import nl.tudelft.ewi.queue.model.Assistant;
+import nl.tudelft.ewi.queue.model.Course;
+import nl.tudelft.ewi.queue.model.Manager;
+import nl.tudelft.ewi.queue.model.QCourse;
+import nl.tudelft.ewi.queue.model.Request;
+import nl.tudelft.ewi.queue.model.Role;
+import nl.tudelft.ewi.queue.model.Student;
+import nl.tudelft.ewi.queue.model.Teacher;
+import nl.tudelft.ewi.queue.model.User;
 import nl.tudelft.ewi.queue.model.*;
+import nl.tudelft.ewi.queue.model.Assignment;
+import nl.tudelft.ewi.queue.model.Assistant;
+import nl.tudelft.ewi.queue.model.Course;
+import nl.tudelft.ewi.queue.model.Manager;
+import nl.tudelft.ewi.queue.model.QCourse;
+import nl.tudelft.ewi.queue.model.Request;
+import nl.tudelft.ewi.queue.model.Role;
+import nl.tudelft.ewi.queue.model.Student;
+import nl.tudelft.ewi.queue.model.Teacher;
+import nl.tudelft.ewi.queue.model.User;
+import nl.tudelft.ewi.queue.repository.AssignmentRepository;
+import nl.tudelft.ewi.queue.repository.CourseRepository;
+import nl.tudelft.ewi.queue.repository.FirstYearStudentRepository;
+import nl.tudelft.ewi.queue.repository.RoleRepository;
+import nl.tudelft.ewi.queue.repository.UserRepository;
 import nl.tudelft.ewi.queue.repository.AssignmentRepository;
 import nl.tudelft.ewi.queue.repository.CourseRepository;
 import nl.tudelft.ewi.queue.repository.RoleRepository;
@@ -39,7 +64,6 @@ import nl.tudelft.ewi.queue.service.LabService;
 import nl.tudelft.ewi.queue.service.RequestService;
 import nl.tudelft.ewi.queue.validator.ParticipantValidator;
 import nl.tudelft.ewi.queue.viewmodel.AssignmentViewModel;
-
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -60,8 +84,22 @@ import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.multipart.MultipartFile;
+import org.springframework.web.bind.annotation.InitBinder;
+import org.springframework.web.bind.annotation.ModelAttribute;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.multipart.MultipartFile;
 import org.springframework.web.servlet.mvc.support.RedirectAttributes;
 
+import javax.persistence.EntityNotFoundException;
+import javax.validation.Valid;
+import java.io.IOException;
+import java.time.LocalDateTime;
+import java.util.List;
+import java.util.Optional;
+import java.util.stream.Collectors;
 import com.querydsl.core.types.dsl.BooleanExpression;
 
 @Controller
@@ -103,7 +141,6 @@ public class CourseController {
     public static String page() {
         return "courses";
     }
-
 	@InitBinder("participantForm")
 	protected void initBinder(WebDataBinder binder) {
 		binder.addValidators(participantValidator);
@@ -131,17 +168,6 @@ public class CourseController {
 
 		return "course/view/info";
 	}
-
-	@RequestMapping(value = "/course/{id}/leave", method = RequestMethod.GET)
-	@PreAuthorize("@permissionService.canLeaveCourse(principal, #id)")
-	public String leave(@AuthenticatedUser User user, @PathVariable("id") Long id, Model model) {
-		Course course = getCourse(id);
-
-		model.addAttribute("course", course);
-
-		return "course/view/leave";
-	}
-
     @RequestMapping(value = "/course/{id}/leave", method = RequestMethod.POST)
     @PreAuthorize("@permissionService.canLeaveCourse(principal, #id)")
     public String leave(@AuthenticatedUser User user, @PathVariable("id") Long id) {
@@ -175,8 +201,7 @@ public class CourseController {
             List<Role> students = course.getStudents();
             if (filter.isPresent()) {
                 students = students.stream()
-						.filter(student -> student.getUser().getUsername().toLowerCase()
-								.contains(filter.get().toLowerCase()))
+                        .filter(student -> student.getUser().getUsername().toLowerCase().contains(filter.get().toLowerCase()))
                         .collect(Collectors.toList());
             }
             students.sort(CourseController::compareLexicographically);
@@ -244,8 +269,7 @@ public class CourseController {
 
     @RequestMapping(value = "/course/{courseId}/participants/{id}/remove", method = RequestMethod.GET)
     @PreAuthorize("@permissionService.canUpdateParticipant(principal, #courseId, #id)")
-	public String deleteParticipant(@PathVariable("courseId") Long courseId, @PathVariable("id") Long id,
-									Model model) {
+    public String deleteParticipant(@PathVariable("courseId") Long courseId, @PathVariable("id") Long id, Model model) {
         Role role = getRole(id);
 
         model.addAttribute("course", getCourse(courseId));
@@ -264,6 +288,16 @@ public class CourseController {
         return "redirect:/course/" + courseId + "/participants";
     }
 
+    @RequestMapping(value = "/course/{courseId}/participants/import", method =
+            RequestMethod.POST)
+    @PreAuthorize("@permissionService.canManageTeachers(principal, #courseId)")
+    public String importParticipants(@PathVariable("courseId") long courseId,
+                                     @RequestParam("file") MultipartFile csv) throws IOException {
+        Course course = courseRepository.findOne(courseId);
+        courseService.addCourseStaff(csv, course);
+        return "redirect:/course/" + courseId + "/participants";
+    }
+
     @RequestMapping(value = "/course/{id}/assignments", method = RequestMethod.GET)
     @PreAuthorize("@permissionService.canManageAssignments(principal, #id)")
     public String viewAssignments(@PathVariable("id") Long id,
@@ -281,8 +315,7 @@ public class CourseController {
         return "course/view/assignments";
     }
 
-	@RequestMapping(value = "/course/{id}/assignments", method = RequestMethod.POST, params = {
-			"addAssignment" })
+    @RequestMapping(value = "/course/{id}/assignments", method = RequestMethod.POST, params = {"addAssignment"})
     @PreAuthorize("@permissionService.canManageAssignments(principal, #id)")
     public String addAssignment(@PathVariable("id") Long id,
                                 @ModelAttribute("addAssignment") AssignmentListWrapperForm assignmentList,
@@ -301,8 +334,7 @@ public class CourseController {
         return "course/view/assignments";
     }
 
-	@RequestMapping(value = "/course/{id}/assignments", method = RequestMethod.POST, params = {
-			"removeAssignment" })
+    @RequestMapping(value = "/course/{id}/assignments", method = RequestMethod.POST, params = {"removeAssignment"})
     @PreAuthorize("@permissionService.canManageAssignments(principal, #id)")
     public String removeAssignment(@PathVariable("id") Long id,
                                    @RequestParam("removeAssignment") int assignmentID,
@@ -320,8 +352,7 @@ public class CourseController {
         return "redirect:/course/" + id + "/assignments";
     }
 
-	@RequestMapping(value = "/course/{id}/assignments", method = RequestMethod.POST, params = {
-			"storeAssignments" })
+    @RequestMapping(value = "/course/{id}/assignments", method = RequestMethod.POST, params = {"storeAssignments"})
     @PreAuthorize("@permissionService.canManageAssignments(principal, #id)")
     public String storeAssignments(@PathVariable("id") Long id,
                                    @ModelAttribute("storeAssignments") AssignmentListWrapperForm assignmentList,
@@ -354,8 +385,7 @@ public class CourseController {
     @PreAuthorize("@permissionService.canManageAssignments(principal, #id)")
     public String uploadEnqueue(@PathVariable("id") Long id,
                                 @RequestParam("csv") MultipartFile csv,
-								@RequestParam("uploadEnqueue") Long assignmentId)
-			throws IOException {
+                                @RequestParam("uploadEnqueue") Long assignmentId) throws IOException {
         Course course = getCourse(id);
         groupService.importCsv(course, csv);
 

src/main/java/nl/tudelft/ewi/queue/helper/CsvUserHelper.java

+/*
+ * Queue - A Queueing system that can be used to handle labs in higher education Copyright (C) 2016-2019 Delft
+ * University of Technology
+ *
+ * This program is free software: you can redistribute it and/or modify it under the terms of the GNU Affero
+ * General Public License as published by the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the
+ * implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Affero General Public
+ * License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License along with this program. If not,
+ * see <https://www.gnu.org/licenses/>.
+ */
+package nl.tudelft.ewi.queue.helper;
+
+import nl.tudelft.ewi.queue.model.DefaultRole;
+import org.springframework.web.multipart.MultipartFile;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.util.ArrayList;
+import java.util.Scanner;
+
+public class CsvUserHelper {
+
+    private String netid;
+
+    private DefaultRole role;
+
+    public CsvUserHelper(String netid, DefaultRole role) {
+        this.netid = netid;
+        this.role = role;
+
+    }
+
+    public String getNetId() {
+        return netid;
+    }
+
+    public DefaultRole getRole() {
+        return role;
+    }
+
+    public static ArrayList<CsvUserHelper> readCsv(MultipartFile csvFile) throws IOException {
+        InputStream content  = csvFile.getInputStream();
+        Scanner scanner = new Scanner(content).useDelimiter("\\A");
+        ArrayList<CsvUserHelper> csvUserHelpersSet = new ArrayList<>();
+
+        String csv = "";
+        if (scanner.hasNext()) {
+            csv = scanner.next();
+        }
+        String[] lines = csv.split("\n");
+        for (String line : lines) {
+            String[] currLine = line.split(",");
+            if (currLine[1].contains("\r")) {
+                currLine[1] = currLine[1].substring(0, currLine[1].length()-1);
+            }
+            csvUserHelpersSet.add(new CsvUserHelper(currLine[0],
+                    DefaultRole.valueOfExt(currLine[1])));
+        }
+        content.close();
+        return csvUserHelpersSet;
+    }
+}

src/main/java/nl/tudelft/ewi/queue/model/DefaultRole.java

@@ -26,6 +26,12 @@ public enum DefaultRole implements GrantedAuthority {
     ),
     ROLE_ADMIN(
             "Admin"
+    ),
+    ROLE_ASSISTANT(
+            "Assistant"
+    ),
+    ROLE_MANAGER(
+            "Manager"
     );
 
 	private final String displayName;
@@ -42,4 +48,16 @@ public enum DefaultRole implements GrantedAuthority {
 	public String getAuthority() {
         return name();
     }
+
+
+    public static DefaultRole valueOfExt(String role) {
+        switch (role.toLowerCase()) {
+            case "ta": return DefaultRole.ROLE_ASSISTANT;
+            case "assistant": return DefaultRole.ROLE_ASSISTANT;
+            case "manager": return DefaultRole.ROLE_MANAGER;
+            case "teacher": return DefaultRole.ROLE_TEACHER;
+            case "admin": return DefaultRole.ROLE_ADMIN;
+            default: return DefaultRole.ROLE_STUDENT;
+        }
+    }
 }

src/main/java/nl/tudelft/ewi/queue/model/User.java

@@ -100,6 +100,10 @@ public class User extends RequestEntity {
 		this.subscription = subscription;
 	}
 
+	public void setStudentNumber(int number) {
+		this.studentNumber = number;
+	}
+
 	public NotificationList getNotifications() {
 		return new NotificationList(notifications);
 	}

src/main/java/nl/tudelft/ewi/queue/service/CourseService.java

@@ -15,29 +15,71 @@
  */
 package nl.tudelft.ewi.queue.service;
 
+import com.google.common.collect.Lists;
+import com.querydsl.core.types.dsl.BooleanExpression;
+import nl.tudelft.ewi.queue.helper.CsvUserHelper;
+import nl.tudelft.ewi.queue.repository.CourseRepository;
+import nl.tudelft.ewi.queue.model.Assistant;
+import nl.tudelft.ewi.queue.model.Course;
+import nl.tudelft.ewi.queue.model.DefaultRole;
+import nl.tudelft.ewi.queue.model.Manager;
+import nl.tudelft.ewi.queue.model.QRequest;
+import nl.tudelft.ewi.queue.model.Request;
+import nl.tudelft.ewi.queue.model.Student;
+import nl.tudelft.ewi.queue.model.Teacher;
+import nl.tudelft.ewi.queue.model.User;
+import com.google.common.collect.Lists;
+import com.querydsl.core.types.dsl.BooleanExpression;
+import nl.tudelft.ewi.queue.helper.CsvUserHelper;
 import java.time.LocalDateTime;
 import java.util.HashMap;
 import java.util.List;
 
 import nl.tudelft.ewi.queue.model.*;
+import nl.tudelft.ewi.queue.repository.CourseRepository;
 import nl.tudelft.ewi.queue.repository.RequestRepository;
+import nl.tudelft.ewi.queue.repository.RoleRepository;
 import nl.tudelft.ewi.queue.repository.UserRepository;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
+import org.springframework.web.multipart.MultipartFile;
 
+import java.io.IOException;
+import java.time.LocalDateTime;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Optional;
 import com.google.common.collect.Lists;
 import com.querydsl.core.types.dsl.BooleanExpression;
+import java.io.IOException;
+import java.time.LocalDateTime;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Optional;
 
 @Service
 public class CourseService {
 
+
+    private static final Logger logger = LoggerFactory.getLogger(CourseService.class);
+
     @Autowired
     private UserRepository userRepository;
 
 	@Autowired
 	private RequestRepository requestRepository;
 
+    @Autowired
+    private CourseRepository courseRepository;
+
+    @Autowired
+    private RoleRepository roleRepository;
+
     /**
      * Enroll user for course
      *
@@ -67,4 +109,42 @@ public class CourseService {
 		return feedbackCount;
 	}
 
+    public void addCourseStaff(MultipartFile csv, Course course) throws IOException {
+        ArrayList<CsvUserHelper> users = CsvUserHelper.readCsv(csv);
+        for (CsvUserHelper csvUser : users) {
+            User staff = findUser(csvUser.getNetId());
+            Optional<Role> oldRole = staff.getRole(course);
+
+            oldRole.ifPresent(r -> {
+                staff.getRoles().remove(r);
+
+                userRepository.save(staff);
+                roleRepository.delete(r);
+            });
+
+            Role role = null;
+            switch (csvUser.getRole()) {
+                case ROLE_ASSISTANT: role = new Assistant(staff, course);
+                        break;
+                case ROLE_TEACHER: role = new Teacher(staff, course);
+                        break;
+                case ROLE_MANAGER: role = new Manager(staff, course);
+            }
+            staff.addRole(role);
+            course.addRole(role);
+            userRepository.save(staff);
+            courseRepository.save(course);
+        }
+    }
+
+    private User findUser(String netid) {
+        User user = userRepository.findByUsername(netid+"@tudelft.nl");
+        if (user == null) {
+            user = new User(netid+"@tudelft.nl","", netid, "",
+                    DefaultRole.ROLE_STUDENT, 0);
+            userRepository.save(user);
+        }
+        return user;
+    }
+
 }

src/main/java/nl/tudelft/ewi/queue/service/SAMLUserDetailsServiceImpl.java

@@ -97,6 +97,14 @@ public class SAMLUserDetailsServiceImpl implements SAMLUserDetailsService {
 			user.setDisplayName(displayName);
 			saveUserWithCheck(user);
 		}
+		if (user.getDefaultRole() == DefaultRole.ROLE_STUDENT) {
+            int studentNumber =
+                    Integer.parseUnsignedInt(credential.getAttributeAsString(TUD_STUDENT_NUMBER));
+            if (studentNumber != user.getStudentNumber()) {
+                user.setStudentNumber(studentNumber);
+                saveUserWithCheck(user);
+            }
+        }
 
 		AttachUserToFirstYearStudent(user);
 		return new UserPrincipal(user);

src/main/resources/templates/course/create/participant.html

@@ -59,6 +59,39 @@
             </div>
         </div>
     </form>
+    <div class="row">
+        <div class="col-sm-12">
+            <h4>Import TA's</h4>
+            <p class="lead">You can upload a CSV with TA netid's</p>
+            <th:block th:if="${@permissionService.canManageTeachers(#authentication.principal, course.id)}">
+                <form action="#"
+                      th:action="@{/course/{id}/participants/import(id=${course.id})}"
+                      enctype="multipart/form-data" class="form-horizontal" method="post">
+                    <div class="form-group">
+                        <div class="col-sm-offset-2 col-sm-8">
+                            <label class="custom-file">
+                                <input type="file" id="csv" name="file" class="csvfile" />
+                                <span class="csvfile"></span>
+                            </label>
+                        </div>
+                    </div>
+
+                    <div class="form-group">
+                        <div class="col-sm-offset-2 col-sm-8">
+                            <button type="submit" class="btn btn-primary"
+                                    name="storeTA">Import
+                                Assistants/Managers/Teachers</button>
+                        </div>
+                    </div>
+                    <div class="col-sm-8">
+                        The csv should look like: <br>
+                        "netid1","role1" <br>
+                        "netid2",role2" <br>
+                        The following roles can be applied: <i>ta, assistant, manager, teacher</i>
+                    </div>
+                </form>
+            </th:block>
+        </div>
 </section>
 </body>
 </html>