Added default users for dev, fixed wrong param names "roles"

Author: open-schnick

src/main/java/de/filefighter/rest/configuration/PrepareDataBase.java

@@ -32,7 +32,7 @@ CommandLineRunner cleanDataBase(UserRepository userRepository, FileSystemReposit
 
     @Bean
     @Profile("prod")
-    CommandLineRunner initUserDataBase(UserRepository repository) {
+    CommandLineRunner initUserDataBaseProd(UserRepository repository) {
 
         //Note: when the admin user changes his/her password, a new refreshToken will be created.
         return args -> {
@@ -42,9 +42,35 @@ CommandLineRunner initUserDataBase(UserRepository repository) {
                     .username("admin")
                     .password("admin")
                     .refreshToken("refreshToken1234")
-                    .roleIds(new long[]{0, 1})
+                    .groupIds(new long[]{0, 1})
                     .build()));
-            LOG.info("Loading Users" + (repository.findAll().size() == 1 ? " was successful." : " failed."));
+            LOG.info("Inserting Users" + (repository.findAll().size() == 1 ? " was successful." : " failed."));
+        };
+    }
+
+    @Bean
+    @Profile("dev")
+    CommandLineRunner initUserDataBaseDev(UserRepository repository) {
+
+        return args -> {
+            LOG.info("Preloading default users: " +
+                    repository.save(UserEntity
+                            .builder()
+                            .userId(0L)
+                            .username("user")
+                            .password("1234")
+                            .refreshToken("refreshToken1234")
+                            .groupIds(new long[]{0})
+                            .build()) +
+                    repository.save(UserEntity
+                            .builder()
+                            .userId(0L)
+                            .username("user1")
+                            .password("12345")
+                            .refreshToken("refreshToken1234")
+                            .groupIds(new long[]{0})
+                            .build()));
+            LOG.info("Inserting Users" + (repository.findAll().size() == 2 ? " was successful." : " failed."));
         };
     }
 }

src/main/java/de/filefighter/rest/domain/user/business/UserDtoService.java

@@ -0,0 +1,20 @@
+package de.filefighter.rest.domain.user.business;
+
+import de.filefighter.rest.domain.common.DtoServiceInterface;
+import de.filefighter.rest.domain.user.data.dto.User;
+import de.filefighter.rest.domain.user.data.persistance.UserEntity;
+import org.springframework.stereotype.Service;
+
+@Service
+public class UserDtoService implements DtoServiceInterface<User, UserEntity> {
+
+    @Override
+    public User createDto(UserEntity entity) {
+        return null;
+    }
+
+    @Override
+    public UserEntity createEntity(User dto) {
+        return null;
+    }
+}

src/main/java/de/filefighter/rest/domain/user/data/persistance/UserEntity.java

@@ -16,7 +16,6 @@ public class UserEntity {
     private String username;
     private String password;
     private String refreshToken; //TODO: add valid_until for refreshToken
-    private long[] roleIds;
-
+    private long[] groupIds;
 
 }

src/main/java/de/filefighter/rest/domain/user/role/GroupRepository.java

@@ -9,7 +9,7 @@ public class GroupRepository {
     //TODO: test this.
     public Groups getRoleById(long id) {
         for (Groups role : roles) {
-            if (role.getRoleId() == id) {
+            if (role.getGroupId() == id) {
                 return role;
             }
         }

src/main/java/de/filefighter/rest/domain/user/role/Groups.java

@@ -5,16 +5,16 @@ public enum Groups {
     FAMILY(0, "Family"),
     ADMIN(1, "Admin");
 
-    private final long roleId;
+    private final long groupId;
     private final String displayName;
 
     Groups(long roleId, String displayName) {
-        this.roleId = roleId;
+        this.groupId = roleId;
         this.displayName = displayName;
     }
 
-    public long getRoleId() {
-        return roleId;
+    public long getGroupId() {
+        return groupId;
     }
 
     public String getDisplayName() {