fix: mysql queries

gemeinsamforschen/src/main/java/unipotsdam/gf/modules/user/UserDAO.java

@@ -30,7 +30,7 @@ public class UserDAO {
         connect.connect();
         String mysqlRequest = "INSERT INTO users (`name`, `password`, `email`, `isStudent`," +
                 "`rocketChatUserId`,`rocketChatUsername`,`rocketChatAuthToken`,`rocketChatPersonalAccessToken`) " +
-                "values (?,?,?,?,?,?,?,?,?)";
+                "values (?,?,?,?,?,?,?,?)";
         connect.issueInsertOrDeleteStatement(mysqlRequest, user.getName(), user.getPassword(), user.getEmail(),
                 user.getStudent(), user.getRocketChatUserId(), user.getRocketChatUsername(), user.getRocketChatAuthToken(),
                 user.getRocketChatPersonalAccessToken());

gemeinsamforschen/src/main/java/unipotsdam/gf/util/ResultSetUtil.java

 package unipotsdam.gf.util;
 
-import unipotsdam.gf.mysql.VereinfachtesResultSet;
 import unipotsdam.gf.modules.user.User;
+import unipotsdam.gf.mysql.VereinfachtesResultSet;
 
 public class ResultSetUtil {
 
@@ -9,7 +9,7 @@ public class ResultSetUtil {
         String name = vereinfachtesResultSet.getString("name");
         String password = vereinfachtesResultSet.getString("password");
         String email = vereinfachtesResultSet.getString("email");
-        String rocketChatId = vereinfachtesResultSet.getString("rocketChatId");
+        String rocketChatId = vereinfachtesResultSet.getString("rocketChatUserId");
         String rocketChatAuthToken = vereinfachtesResultSet.getString("rocketChatAuthToken");
         String rocketChatPersonalAccessToken = vereinfachtesResultSet.getString("rocketChatPersonalAccessToken");
         String rocketChatUserId = vereinfachtesResultSet.getString("rocketChatUserId");

gemeinsamforschen/src/test/resources/database/fltrail.sql

@@ -68,9 +68,9 @@ CREATE TABLE `groupfindingmechanismselected` (
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8;
 
 CREATE TABLE `groups` (
-  `id` int(11) NOT NULL,
+  `id`          int(11) NOT NULL,
   `projectName` varchar(400) NOT NULL,
-  `chatRoomId` varchar(400) NOT NULL
+  `chatRoomId`  varchar(400)
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8;
 
 CREATE TABLE `groupuser` (
@@ -142,14 +142,14 @@ CREATE TABLE `tasks` (
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8;
 
 CREATE TABLE `users` (
-  `name` varchar(100) NOT NULL,
-  `password` varchar(200) NOT NULL,
-  `email` varchar(255) NOT NULL,
-  `rocketChatId` varchar(400) NOT NULL,
+  `name`                          varchar(100) NOT NULL,
+  `password`                      varchar(200) NOT NULL,
+  `email`                         varchar(255) NOT NULL,
+  `rocketChatUserId`              varchar(400) NOT NULL,
   `rocketChatPersonalAccessToken` varchar(400) NOT NULL,
-  `rocketChatUserId` varchar(400) NOT NULL,
-  `rocketChatAuthToken` varchar(800) NOT NULL,
-  `isStudent` tinyint(1) DEFAULT '1'
+  `rocketChatUsername`            varchar(400) NOT NULL,
+  `rocketChatAuthToken`           varchar(800) NOT NULL,
+  `isStudent`                     tinyint(1) DEFAULT '1'
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8;
 
 CREATE TABLE `workrating` (

gemeinsamforschen/src/test/resources/database/testuser.sql

-INSERT IGNORE INTO users (name, password, email, rocketChatId, rocketChatAuthToken, isStudent) values ("Julian Dehne",
+INSERT IGNORE INTO users (name, password, email, rocketChatUserId, rocketChatAuthToken, isStudent) values ("Julian Dehne",
 "egal", "vodkas@yolo.com", "egal", "egal", 1);
 
-INSERT IGNORE INTO users (name, password, email, rocketChatId, rocketChatAuthToken, isStudent) values ("Axel Wiepke",
+INSERT IGNORE INTO users (name, password, email, rocketChatUserId, rocketChatAuthToken, isStudent) values ("Axel Wiepke",
 "egal", "vodkass@yolo.com", "egal", "egal", 1);
 
-INSERT IGNORE INTO users (name, password, email, rocketChatId, rocketChatAuthToken, isStudent) values ("Herr Lehrer",
+INSERT IGNORE INTO users (name, password, email, rocketChatUserId, rocketChatAuthToken, isStudent) values ("Herr Lehrer",
 "egal", "vodka@yolo.com", "egal", "egal", 0);