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 73c0b1e608c2ea6dc3821ad703904162908d9577..34882f8c1226548141f986b551868b028544ca7a 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 1cecac2de82d93e049cbc159843b7f91334fb6ec..48161720c1e5119b5c05b53ed8e145c77075f584 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 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) {