diff --git a/gemeinsamforschen/src/main/java/unipotsdam/gf/interfaces/ICommunication.java b/gemeinsamforschen/src/main/java/unipotsdam/gf/interfaces/ICommunication.java
index 60683f26df3391e962e0a08889f0e783387b77fb..8a07add14391adf6779942e0225e1c38e30e9b2f 100644
--- a/gemeinsamforschen/src/main/java/unipotsdam/gf/interfaces/ICommunication.java
+++ b/gemeinsamforschen/src/main/java/unipotsdam/gf/interfaces/ICommunication.java
@@ -1,10 +1,9 @@
package unipotsdam.gf.interfaces;
+import unipotsdam.gf.core.management.user.User;
+import unipotsdam.gf.modules.communication.model.Message;
import unipotsdam.gf.modules.communication.model.chat.ChatMessage;
import unipotsdam.gf.modules.communication.model.chat.ChatRoom;
-import unipotsdam.gf.modules.communication.model.user.User;
-import unipotsdam.gf.modules.communication.model.user.UserCredentials;
-import unipotsdam.gf.modules.communication.model.user.UserRegistrationInformation;
import java.util.List;
@@ -23,25 +22,27 @@ public interface ICommunication {
List<ChatMessage> getChatHistory(String roomId);
+ boolean sendMessageToChat(Message message);
+
/**
* endpoint: https://rocket.chat/docs/developer-guides/rest-api/groups/create/
* creates chatroom
*
- * @param name chat room name
- * @param userIds member of chat by id; can be empty
+ * @param name chat room name
+ * @param studentIdentifierList member of chat by id
* @return chat room id
*/
- String createChatRoom(String name, List<String> userIds);
+ String createChatRoom(String name, List<User> studentIdentifierList);
/**
* endpoint: https://rocket.chat/docs/developer-guides/rest-api/groups/invite/
*
* @param roomId chat room the user should be add to
- * @param userId userID to add
+ * @param user information about user
* @return if user was added successfully
*/
- boolean addUserToChatRoom(String roomId, String userId);
+ boolean addUserToChatRoom(String roomId, User user);
/**
* endpoint: https://rocket.chat/docs/developer-guides/rest-api/groups/settopic/
@@ -65,17 +66,17 @@ public interface ICommunication {
/**
* api: https://rocket.chat/docs/developer-guides/rest-api/authentication/login/
*
- * @param userCredentials username and password
+ * @param user username and password
* @return information about user, especially authtoken for later use of endpoints
*/
- User loginUser(UserCredentials userCredentials);
+ boolean loginUser(User user);
/**
* registers new user to rocket chat
*
- * @param userRegistrationInformation registers user to rocket.chat
+ * @param user registers user to rocket.chat
* @return user id
*/
- String registerUser(UserRegistrationInformation userRegistrationInformation);
+ boolean registerUser(User user);
}
diff --git a/gemeinsamforschen/src/main/java/unipotsdam/gf/modules/communication/model/Message.java b/gemeinsamforschen/src/main/java/unipotsdam/gf/modules/communication/model/Message.java
new file mode 100644
index 0000000000000000000000000000000000000000..d01a32710be40c2ac13b7203ea9dd9f9f6e2cab1
--- /dev/null
+++ b/gemeinsamforschen/src/main/java/unipotsdam/gf/modules/communication/model/Message.java
@@ -0,0 +1,38 @@
+package unipotsdam.gf.modules.communication.model;
+
+public class Message {
+
+ private String roomIdOrChannel;
+ private String message;
+
+ public Message() {}
+
+ public Message(String roomIdOrChannel, String message) {
+ this.roomIdOrChannel = roomIdOrChannel;
+ this.message = message;
+ }
+
+ public String getRoomIdOrChannel() {
+ return roomIdOrChannel;
+ }
+
+ public void setRoomIdOrChannel(String roomIdOrChannel) {
+ this.roomIdOrChannel = roomIdOrChannel;
+ }
+
+ public String getMessage() {
+ return message;
+ }
+
+ public void setMessage(String message) {
+ this.message = message;
+ }
+
+ @Override
+ public String toString() {
+ return "Message{" +
+ "roomIdOrChannel='" + roomIdOrChannel + '\'' +
+ ", message='" + message + '\'' +
+ '}';
+ }
+}
diff --git a/gemeinsamforschen/src/main/java/unipotsdam/gf/modules/communication/model/user/User.java b/gemeinsamforschen/src/main/java/unipotsdam/gf/modules/communication/model/user/User.java
deleted file mode 100644
index 92914711702ca737194fd2c15544f3b6f9ab0909..0000000000000000000000000000000000000000
--- a/gemeinsamforschen/src/main/java/unipotsdam/gf/modules/communication/model/user/User.java
+++ /dev/null
@@ -1,30 +0,0 @@
-package unipotsdam.gf.modules.communication.model.user;
-
-public class User {
-
- String id;
- String authToken;
-
- public User() {}
-
- public User(String id, String authToken) {
- this.id = id;
- this.authToken = authToken;
- }
-
- public String getId() {
- return id;
- }
-
- public void setId(String id) {
- this.id = id;
- }
-
- public String getAuthToken() {
- return authToken;
- }
-
- public void setAuthToken(String authToken) {
- this.authToken = authToken;
- }
-}
diff --git a/gemeinsamforschen/src/main/java/unipotsdam/gf/modules/communication/model/user/UserCredentials.java b/gemeinsamforschen/src/main/java/unipotsdam/gf/modules/communication/model/user/UserCredentials.java
deleted file mode 100644
index 97ec8969ce07f4268ed61496aefd6d4baf9a1f45..0000000000000000000000000000000000000000
--- a/gemeinsamforschen/src/main/java/unipotsdam/gf/modules/communication/model/user/UserCredentials.java
+++ /dev/null
@@ -1,30 +0,0 @@
-package unipotsdam.gf.modules.communication.model.user;
-
-public class UserCredentials {
-
- String username;
- String password;
-
- public UserCredentials() {}
-
- public UserCredentials(String username, String password) {
- this.username = username;
- this.password = password;
- }
-
- public String getUsername() {
- return username;
- }
-
- public void setUsername(String username) {
- this.username = username;
- }
-
- public String getPassword() {
- return password;
- }
-
- public void setPassword(String password) {
- this.password = password;
- }
-}
diff --git a/gemeinsamforschen/src/main/java/unipotsdam/gf/modules/communication/model/user/UserRegistrationInformation.java b/gemeinsamforschen/src/main/java/unipotsdam/gf/modules/communication/model/user/UserRegistrationInformation.java
deleted file mode 100644
index b109f1f66c64331254491af5eddaa50f35a6f032..0000000000000000000000000000000000000000
--- a/gemeinsamforschen/src/main/java/unipotsdam/gf/modules/communication/model/user/UserRegistrationInformation.java
+++ /dev/null
@@ -1,41 +0,0 @@
-package unipotsdam.gf.modules.communication.model.user;
-
-public class UserRegistrationInformation {
-
- private String username;
- private String email;
- private String pass;
- private String name;
-
- public String getUsername() {
- return username;
- }
-
- public void setUsername(String username) {
- this.username = username;
- }
-
- public String getEmail() {
- return email;
- }
-
- public void setEmail(String email) {
- this.email = email;
- }
-
- public String getPass() {
- return pass;
- }
-
- public void setPass(String pass) {
- this.pass = pass;
- }
-
- public String getName() {
- return name;
- }
-
- public void setName(String name) {
- this.name = name;
- }
-}