Merge branch 'fix-user-inserting' into 'development'

Change the name to be changed from userName to displayName

See merge request EIP/queue!87

src/main/java/nl/tudelft/ewi/queue/DatabaseLoader.java

 package nl.tudelft.ewi.queue;
 
-import nl.tudelft.ewi.queue.model.*;
-import nl.tudelft.ewi.queue.repository.*;
+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.DefaultRole;
+import nl.tudelft.ewi.queue.model.Direction;
+import nl.tudelft.ewi.queue.model.Lab;
+import nl.tudelft.ewi.queue.model.LabSlot;
+import nl.tudelft.ewi.queue.model.Manager;
+import nl.tudelft.ewi.queue.model.Request;
+import nl.tudelft.ewi.queue.model.RequestType;
+import nl.tudelft.ewi.queue.model.Room;
+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.CourseRepository;
+import nl.tudelft.ewi.queue.repository.LabRepository;
+import nl.tudelft.ewi.queue.repository.RequestRepository;
+import nl.tudelft.ewi.queue.repository.RequestTypeRepository;
+import nl.tudelft.ewi.queue.repository.RoomRepository;
+import nl.tudelft.ewi.queue.repository.UserRepository;
+import org.apache.commons.lang3.StringUtils;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.Profile;
 import org.springframework.stereotype.Service;
@@ -32,6 +53,8 @@ public class DatabaseLoader {
     @Autowired
     private RoomRepository roomRepository;
 
+    private static final Logger logger = LoggerFactory.getLogger(DatabaseLoader.class);
+
     public DatabaseLoader() {
     }
 
@@ -39,12 +62,21 @@ public class DatabaseLoader {
      * Create a new user with the given name as username, password and displayname
      *
      * @param name
+     *
      * @return
      */
     private static User dummyUser(String name, DefaultRole defaultRole) {
         return new User(name, name, name, "a@b.c", defaultRole, -2);
     }
 
+    private void saveUserWithCheck(User user) {
+        String newName = StringUtils.stripAccents(user.getDisplayName());
+        logger.info("inserted: {}", newName);
+        user.setDisplayName(newName);
+        userRepository.save(user);
+
+    }
+
     @PostConstruct
     private void initDatabase() {
         // Users
@@ -58,6 +90,8 @@ public class DatabaseLoader {
         User student7 = userRepository.save(dummyUser("student7", DefaultRole.ROLE_STUDENT));
         User student8 = userRepository.save(dummyUser("student8", DefaultRole.ROLE_STUDENT));
         User student9 = userRepository.save(dummyUser("student9", DefaultRole.ROLE_STUDENT));
+
+
         User student10 = userRepository.save(dummyUser("student10", DefaultRole.ROLE_STUDENT));
         User student11 = userRepository.save(dummyUser("student11", DefaultRole.ROLE_STUDENT));
 
@@ -66,6 +100,11 @@ public class DatabaseLoader {
                 DefaultRole.ROLE_STUDENT,
                 -2));
 
+        User student13 = new User("imusic", "", "***REMOVED*** Mušić",
+                "imusic@tudelft.net", DefaultRole.ROLE_STUDENT, -2);
+        saveUserWithCheck(student13);
+
+
         User manager1 = userRepository.save(dummyUser("manager1", DefaultRole.ROLE_STUDENT));
         User manager2 = userRepository.save(dummyUser("manager2", DefaultRole.ROLE_STUDENT));
         User manager3 = userRepository.save(dummyUser("manager3", DefaultRole.ROLE_STUDENT));
@@ -83,6 +122,7 @@ public class DatabaseLoader {
         Assignment assignment1 = new Assignment(course1, "Assembly programming");
         course1.addAssignment(assignment1);
 
+
         courseRepository.save(course1);
 
         Course course2 = new Course("Concepts of Programming Languages", "TI2606");
@@ -115,6 +155,7 @@ public class DatabaseLoader {
         student3.addRole(new Student(student3, course1, LocalDateTime.now()));
         student4.addRole(new Student(student4, course1, LocalDateTime.now()));
         student5.addRole(new Student(student5, course1, LocalDateTime.now()));
+        student13.addRole(new Student(student13, course1, LocalDateTime.now()));
 
         student6.addRole(new Assistant(student6, course1));
         student7.addRole(new Assistant(student7, course1));
@@ -143,6 +184,7 @@ public class DatabaseLoader {
         userRepository.save(student10);
         userRepository.save(student11);
         userRepository.save(student12);
+        saveUserWithCheck(student13);
 
         userRepository.save(manager1);
         userRepository.save(manager2);

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

@@ -94,7 +94,7 @@ public class SAMLUserDetailsServiceImpl implements SAMLUserDetailsService {
 		try {
 			userRepository.save(user);
 		} catch (Exception e) {
-			String newName = StringUtils.stripAccents(user.getUsername());
+			String newName = StringUtils.stripAccents(user.getDisplayName());
 			user.setDisplayName(newName);
 			userRepository.save(user);
 		}