added parent id to group exists method

Author: dwasinge

src/main/java/com/redhat/labs/omp/service/EngagementService.java

@@ -140,7 +140,7 @@ private Project createProjectStucture(Engagement engagement) {
 
     private Group getOrCreateGroup(String groupName, Group groupToCreate) {
 
-        Optional<Group> optional = groupService.getGitLabGroupByName(groupName);
+        Optional<Group> optional = groupService.getGitLabGroupByName(groupName, groupToCreate.getParentId());
 
         if (!optional.isPresent()) {
 

src/main/java/com/redhat/labs/omp/service/GroupService.java

@@ -24,7 +24,8 @@ public class GroupService {
     GitLabService gitLabService;
 
     // get a group
-    public Optional<Group> getGitLabGroupByName(String name) throws UnexpectedGitLabResponseException {
+    public Optional<Group> getGitLabGroupByName(String name, Integer parentId)
+            throws UnexpectedGitLabResponseException {
 
         Optional<Group> optional = Optional.empty();
 
@@ -35,8 +36,8 @@ public Optional<Group> getGitLabGroupByName(String name) throws UnexpectedGitLab
         }
 
         // look for a match between returned name and provided path
-        for(Group group : groupList) {
-            if(name.equals(group.getPath())) {
+        for (Group group : groupList) {
+            if (name.equals(group.getPath()) && parentId.equals(group.getParentId())) {
                 return Optional.of(group);
             }
         }
@@ -45,15 +46,16 @@ public Optional<Group> getGitLabGroupByName(String name) throws UnexpectedGitLab
 
     }
 
-    public  List<Group> getAllGroups(Integer engagementRepositoryId) {
+    public List<Group> getAllGroups(Integer engagementRepositoryId) {
 
-        //FIRST LEVEL
+        // FIRST LEVEL
         List<Group> customerGroups = gitLabService.getSubGroups(engagementRepositoryId);
 
         List<Group> customerEngagementGroups = new ArrayList<>();
-        customerGroups.stream().forEach(group -> customerEngagementGroups.addAll(gitLabService.getSubGroups(group.getId())));
+        customerGroups.stream()
+                .forEach(group -> customerEngagementGroups.addAll(gitLabService.getSubGroups(group.getId())));
 
-        if(LOGGER.isDebugEnabled()) {
+        if (LOGGER.isDebugEnabled()) {
             customerEngagementGroups.stream().forEach(group -> LOGGER.debug("Group -> {}", group.getName()));
         }