diff --git a/BackEnd/src/main/java/studycave/studycaverestservice/model/studyGroup/GroupService.java b/BackEnd/src/main/java/studycave/studycaverestservice/model/studyGroup/GroupService.java index e88e204..ee0caeb 100644 --- a/BackEnd/src/main/java/studycave/studycaverestservice/model/studyGroup/GroupService.java +++ b/BackEnd/src/main/java/studycave/studycaverestservice/model/studyGroup/GroupService.java @@ -292,7 +292,19 @@ public class GroupService { entityManager.detach(set); set.setId(null); set.setPermission("GROUP"); - set.setStatus("UNVERIFIED"); + StudyGroupMember groupLeader = null; + for (StudyGroupMember studyGroupMember : group.getMembers()){ + if (studyGroupMember.getIsGroupLeader()) + { + groupLeader = studyGroupMember; + break; + } + } + if (groupLeader != null && groupLeader.getUser().getId() == user.getId()){ + set.setStatus("VERIFIED"); + } else { + set.setStatus("UNVERIFIED"); + } set.setGroup(group); this.setRepository.save(set); this.userActivityService.saveActivity("addedResource", 0, null, user, null, group, null, set, null); @@ -316,7 +328,19 @@ public class GroupService { entityManager.detach(material); material.setId(null); material.setPermission("GROUP"); - material.setStatus("UNVERIFIED"); + StudyGroupMember groupLeader = null; + for (StudyGroupMember studyGroupMember : group.getMembers()){ + if (studyGroupMember.getIsGroupLeader()) + { + groupLeader = studyGroupMember; + break; + } + } + if (groupLeader != null && groupLeader.getUser().getId() == user.getId()){ + material.setStatus("VERIFIED"); + } else { + material.setStatus("UNVERIFIED"); + } material.setGroup(group); this.materialRepository.save(material); this.userActivityService.saveActivity("addedResource", 0, null, user, null, group, material, null, null); @@ -368,7 +392,19 @@ public class GroupService { entityManager.detach(test); test.setId(null); test.setPermission("GROUP"); - test.setStatus("UNVERIFIED"); + StudyGroupMember groupLeader = null; + for (StudyGroupMember studyGroupMember : group.getMembers()){ + if (studyGroupMember.getIsGroupLeader()) + { + groupLeader = studyGroupMember; + break; + } + } + if (groupLeader != null && groupLeader.getUser().getId() == user.getId()){ + test.setStatus("VERIFIED"); + } else { + test.setStatus("UNVERIFIED"); + } test.setGroup(group); this.testRepository.save(test); this.userActivityService.saveActivity("addedResource", 0, null, user, null, group, null, null, test);