fixing issue #86

gemeinsamforschen/src/main/java/unipotsdam/gf/process/GroupFormationProcess.java

@@ -13,8 +13,6 @@ import unipotsdam.gf.modules.group.GroupFormationMechanism;
 import unipotsdam.gf.modules.group.preferences.database.ProfileDAO;
 import unipotsdam.gf.modules.project.Project;
 import unipotsdam.gf.modules.project.ProjectDAO;
-import unipotsdam.gf.modules.user.User;
-import unipotsdam.gf.modules.user.UserDAO;
 import unipotsdam.gf.process.phases.Phase;
 import unipotsdam.gf.process.tasks.Progress;
 import unipotsdam.gf.process.tasks.Task;
@@ -112,6 +110,7 @@ public class GroupFormationProcess {
             List<Group> groups = groupfinding.getGroupFormationAlgorithm(project).calculateGroups(project);
             groupfinding.persistGroups(groups, project);
             groupfinding.persistOriginalGroups(groups, project, groupdao.getGroupFormationMechanism(project));
+            taskDAO.persistTeacherTask(project, TaskName.CLOSE_GROUP_FINDING_PHASE, Phase.GroupFormation);
             return new GroupData(groups);
         } else {
             return new GroupData(groups1);

gemeinsamforschen/src/main/java/unipotsdam/gf/process/ProjectCreationProcess.java

@@ -7,16 +7,12 @@ import unipotsdam.gf.exceptions.UserExistsInRocketChatException;
 import unipotsdam.gf.interfaces.ICommunication;
 import unipotsdam.gf.modules.communication.model.RocketChatUser;
 import unipotsdam.gf.modules.group.GroupDAO;
-import unipotsdam.gf.modules.group.GroupFormationMechanism;
 import unipotsdam.gf.modules.group.preferences.database.ProfileDAO;
 import unipotsdam.gf.modules.project.Management;
 import unipotsdam.gf.modules.project.Project;
 import unipotsdam.gf.modules.user.User;
 import unipotsdam.gf.process.constraints.ConstraintsImpl;
-import unipotsdam.gf.process.phases.Phase;
-import unipotsdam.gf.process.tasks.Task;
 import unipotsdam.gf.process.tasks.TaskDAO;
-import unipotsdam.gf.process.tasks.TaskName;
 import unipotsdam.gf.session.GFContexts;
 
 import javax.inject.Inject;
@@ -24,8 +20,6 @@ import javax.inject.Singleton;
 import javax.servlet.http.HttpServletRequest;
 import javax.ws.rs.WebApplicationException;
 
-import static unipotsdam.gf.modules.group.GroupFormationMechanism.SingleUser;
-
 
 @Singleton
 public class ProjectCreationProcess {
@@ -158,23 +152,8 @@ public class ProjectCreationProcess {
      */
     public void updateProjCreaProcTasks(Project project, User user) throws RocketChatDownException, UserDoesNotExistInRocketChatException {
         // create info for student
-        Task task = taskDao.createWaitingForGroupFormationTask(project, user);
-
-        // ev. notifity teacher for new student
-        // ev. send email that he is now part of project and will be notified if something happens
+        taskDao.createWaitingForGroupFormationTask(project, user);
 
-        Boolean groupsCanBeFormed = constraintsImpl.checkIfGroupsCanBeFormed(project);
-        if (groupsCanBeFormed) {
-            GroupFormationMechanism groupFormationMechanism = groupDAO.getGroupFormationMechanism(project);
-            if (!groupFormationMechanism.equals(SingleUser) && !groupFormationMechanism
-                    .equals(GroupFormationMechanism.Manual)) {
-                taskDao.persistTeacherTask(project, TaskName.EDIT_FORMED_GROUPS, Phase.GroupFormation);
-            }
-            taskDao.persistTeacherTask(project, TaskName.CLOSE_GROUP_FINDING_PHASE, Phase.GroupFormation);
-            taskDao.updateForAll(task);
-            //phases.endPhase(Phase.GroupFormation, project);
-
-        }
         iCommunication.addUserToChatRoom(user, project.getName());
     }