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 3c238f6be74199530d2e17a37d65ce7244858bab..d43eb07a82fde220e816f8e5b314900365a9c0fe 100644 --- a/gemeinsamforschen/src/main/java/unipotsdam/gf/core/management/Management.java +++ b/gemeinsamforschen/src/main/java/unipotsdam/gf/core/management/Management.java @@ -37,6 +37,8 @@ public interface Management { */ void create(Project project); + void create(Group group, String projectId); + /** * Delete a Project in the database * @@ -114,8 +116,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 a559037fcc211ab70ba7bec6c6bb1c60428c7ad6..1a65714f1dd012270d0a597085d84742e4ab746e 100644 --- a/gemeinsamforschen/src/main/java/unipotsdam/gf/core/management/ManagementImpl.java +++ b/gemeinsamforschen/src/main/java/unipotsdam/gf/core/management/ManagementImpl.java @@ -285,12 +285,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 ea56b43196cd93b3c87518dfa55ab58e2840c8b9..64c6c9926e17e9ca4abb1cc56d965f14f76df2a3 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) {