diff --git a/gemeinsamforschen/src/main/java/unipotsdam/gf/interfaces/IReflectionService.java b/gemeinsamforschen/src/main/java/unipotsdam/gf/interfaces/IReflectionService.java index e889868d502a1bf52f78bac100eafc3d92e316f0..26918a20310908abacd7c08128ed94a3ae4b798c 100644 --- a/gemeinsamforschen/src/main/java/unipotsdam/gf/interfaces/IReflectionService.java +++ b/gemeinsamforschen/src/main/java/unipotsdam/gf/interfaces/IReflectionService.java @@ -1,12 +1,12 @@ package unipotsdam.gf.interfaces; +import unipotsdam.gf.modules.group.Group; import unipotsdam.gf.modules.project.Project; -import unipotsdam.gf.modules.user.User; import unipotsdam.gf.process.phases.Phase; public interface IReflectionService { - void startOptionalPortfolioTask(Project project, User target, Phase phase); + void startOptionalPortfolioTask(Project project, Group group, Phase phase); - void finishOptionalPortfolioTask(Project project, User target, Phase phase); + void finishOptionalPortfolioTask(Project project, Group group, Phase phase); } diff --git a/gemeinsamforschen/src/main/java/unipotsdam/gf/modules/group/GroupDAO.java b/gemeinsamforschen/src/main/java/unipotsdam/gf/modules/group/GroupDAO.java index acfd6c3e2bf976f5bc5d8ef689fe5a14f4e7ca0a..71e0913fdf74dcdb2754438c4dc4c459b158a11b 100644 --- a/gemeinsamforschen/src/main/java/unipotsdam/gf/modules/group/GroupDAO.java +++ b/gemeinsamforschen/src/main/java/unipotsdam/gf/modules/group/GroupDAO.java @@ -185,6 +185,10 @@ public class GroupDAO { return groupId; } + public Group getMyGroup(User user, Project project) { + int groupId = getMyGroupId(user, project); + return getGroupByGroupId(groupId); + } private void fillGroupFromResultSet(ArrayList<Group> groups, VereinfachtesResultSet vereinfachtesResultSet, Boolean withRocketChatId) { diff --git a/gemeinsamforschen/src/main/java/unipotsdam/gf/modules/reflection/service/ReflectionService.java b/gemeinsamforschen/src/main/java/unipotsdam/gf/modules/reflection/service/ReflectionService.java index 2150a0273ee56a924d47c1a4bcf2a6757440533c..8329a231ca6a121db9b9937aaa01a5cd1b256419 100644 --- a/gemeinsamforschen/src/main/java/unipotsdam/gf/modules/reflection/service/ReflectionService.java +++ b/gemeinsamforschen/src/main/java/unipotsdam/gf/modules/reflection/service/ReflectionService.java @@ -1,6 +1,7 @@ package unipotsdam.gf.modules.reflection.service; import unipotsdam.gf.interfaces.IReflectionService; +import unipotsdam.gf.modules.group.Group; import unipotsdam.gf.modules.project.Project; import unipotsdam.gf.modules.user.User; import unipotsdam.gf.process.phases.Phase; @@ -21,12 +22,17 @@ public class ReflectionService implements IReflectionService { @Inject private TaskDAO taskDAO; - public void startOptionalPortfolioTask(Project project, User target, Phase phase) { - persistOptionalEntryTask(project, target, Progress.JUSTSTARTED, phase); + public void startOptionalPortfolioTask(Project project, Group group, Phase phase) { + group.getMembers().forEach(target -> { + persistOptionalEntryTask(project, target, Progress.JUSTSTARTED, phase); + }); + } - public void finishOptionalPortfolioTask(Project project, User target, Phase phase) { - persistOptionalEntryTask(project, target, Progress.FINISHED, phase); + public void finishOptionalPortfolioTask(Project project, Group group, Phase phase) { + group.getMembers().forEach(target -> { + persistOptionalEntryTask(project, target, Progress.FINISHED, phase); + }); } private void persistOptionalEntryTask(Project project, User target, Progress progress, Phase phase) { diff --git a/gemeinsamforschen/src/main/java/unipotsdam/gf/process/DossierCreationProcess.java b/gemeinsamforschen/src/main/java/unipotsdam/gf/process/DossierCreationProcess.java index 0b1eb3403df232264173750daadad18662d1946b..7f76959b2fd4eb71d8a182dcf54887688c96709e 100644 --- a/gemeinsamforschen/src/main/java/unipotsdam/gf/process/DossierCreationProcess.java +++ b/gemeinsamforschen/src/main/java/unipotsdam/gf/process/DossierCreationProcess.java @@ -76,7 +76,8 @@ public class DossierCreationProcess { // this triggers the annotate task taskDAO.persistTaskGroup(project, user, TaskName.ANNOTATE_DOSSIER, Phase.DossierFeedback); - reflectionService.startOptionalPortfolioTask(project, user, Phase.DossierFeedback); + Group group = groupDAO.getMyGroup(user, project); + reflectionService.startOptionalPortfolioTask(project, group, Phase.DossierFeedback); }