From 72bdc775a9a1c043b13af43ecf088cb2d1f4bb52 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Martin=20St=C3=A4hr?= <software@mstaehr.net>
Date: Thu, 21 Jun 2018 12:28:38 +0200
Subject: [PATCH] fix: rename createGroup to create for save naming
---
.../unipotsdam/gf/core/management/Management.java | 4 ++--
.../unipotsdam/gf/core/management/ManagementImpl.java | 6 +++++-
.../unipotsdam/gf/core/management/group/Group.java | 11 ++++++++---
3 files changed, 15 insertions(+), 6 deletions(-)
diff --git a/gemeinsamforschen/src/main/java/unipotsdam/gf/core/management/Management.java b/gemeinsamforschen/src/main/java/unipotsdam/gf/core/management/Management.java
index 73c0b1e6..34882f8c 100644
--- a/gemeinsamforschen/src/main/java/unipotsdam/gf/core/management/Management.java
+++ b/gemeinsamforschen/src/main/java/unipotsdam/gf/core/management/Management.java
@@ -36,6 +36,8 @@ public interface Management {
*/
void create(Project project);
+ void create(Group group, String projectId);
+
/**
* Delete a Project in the database
*
@@ -113,8 +115,6 @@ public interface Management {
*/
Project getProjectById(String id);
- void createGroup(Group group, String projectId);
-
void addGroupMember(User groupMember, int groupId);
void deleteGroupMember(User groupMember, int groupId);
diff --git a/gemeinsamforschen/src/main/java/unipotsdam/gf/core/management/ManagementImpl.java b/gemeinsamforschen/src/main/java/unipotsdam/gf/core/management/ManagementImpl.java
index 1cecac2d..48161720 100644
--- a/gemeinsamforschen/src/main/java/unipotsdam/gf/core/management/ManagementImpl.java
+++ b/gemeinsamforschen/src/main/java/unipotsdam/gf/core/management/ManagementImpl.java
@@ -236,12 +236,16 @@ public class ManagementImpl implements Management {
@Override
- public void createGroup(Group group, String projectId) {
+ public void create(Group group, String projectId) {
MysqlConnect connect = new MysqlConnect();
connect.connect();
Project project = getProjectById(projectId);
+ Group newGroup = new Group(projectId);
+ String mysqlRequestGroup = "INSERT INTO groups (`projectId`,`chatRoomId`) values (?,?)";
+ connect.issueInsertOrDeleteStatement(mysqlRequestGroup, newGroup.getProjectId(), newGroup.getChatRoomId());
+
for (User groupMember : group.getMembers()) {
String mysqlRequest2 = "INSERT INTO groupuser (`userEmail`, `groupId`) values (?,?)";
connect.issueInsertOrDeleteStatement(mysqlRequest2, groupMember.getEmail(), project.getId());
diff --git a/gemeinsamforschen/src/main/java/unipotsdam/gf/core/management/group/Group.java b/gemeinsamforschen/src/main/java/unipotsdam/gf/core/management/group/Group.java
index ea56b431..64c6c992 100644
--- a/gemeinsamforschen/src/main/java/unipotsdam/gf/core/management/group/Group.java
+++ b/gemeinsamforschen/src/main/java/unipotsdam/gf/core/management/group/Group.java
@@ -2,6 +2,7 @@ package unipotsdam.gf.core.management.group;
import unipotsdam.gf.core.management.user.User;
+import java.util.ArrayList;
import java.util.List;
public class Group {
@@ -14,10 +15,14 @@ public class Group {
public Group() {
}
+ public Group(String projectId) {
+ this(new ArrayList<>(), projectId);
+
+
+ }
+
public Group(List<User> members, String projectId) {
- this.members = members;
- this.projectId = projectId;
- this.chatRoomId = "";
+ this(members, projectId, "");
}
public Group(List<User> members, String projectId, String chatRoomId) {
--
GitLab