[SELC-7737] feat: modify addMembersToUserGroupWithParentInstitutionId to create a group if it doesn't exist (#305)

giulia-tremolada · web-flow · commit eb2fa80750db · 2025-10-10T17:43:43.000+02:00
diff --git a/apps/user-group-ms/src/main/docs/openapi.json b/apps/user-group-ms/src/main/docs/openapi.json
@@ -869,9 +869,13 @@
     "schemas" : {
       "AddMembersToUserGroupDto" : {
         "title" : "AddMembersToUserGroupDto",
-        "required" : [ "institutionId", "members", "parentInstitutionId", "productId" ],
+        "required" : [ "description", "institutionId", "members", "name", "parentInstitutionId", "productId" ],
         "type" : "object",
         "properties" : {
+          "description" : {
+            "type" : "string",
+            "description" : "Users group's description"
+          },
           "institutionId" : {
             "type" : "string",
             "description" : "Users group's institutionId"
@@ -885,6 +889,10 @@
               "format" : "uuid"
             }
           },
+          "name" : {
+            "type" : "string",
+            "description" : "Users group's name"
+          },
           "parentInstitutionId" : {
             "type" : "string",
             "description" : "Users group's parent institutionId"
@@ -921,10 +929,6 @@
             "type" : "string",
             "description" : "Users group's name"
           },
-          "parentInstitutionId" : {
-            "type" : "string",
-            "description" : "Users group's parent institutionId"
-          },
           "productId" : {
             "type" : "string",
             "description" : "Users group's productId"
diff --git a/apps/user-group-ms/src/main/java/it/pagopa/selfcare/user_group/controller/UserGroupV1Controller.java b/apps/user-group-ms/src/main/java/it/pagopa/selfcare/user_group/controller/UserGroupV1Controller.java
@@ -238,7 +238,7 @@ public void addMembersToUserGroupWithParentInstitutionId(@RequestBody
         log.trace("addMembersToUserGroup start");
         log.debug("addMembersToUserGroup institutionId = {}, parentInstitutionId = {}, productId = {}",
                 Encode.forJava(groupDto.getInstitutionId()), Encode.forJava(groupDto.getParentInstitutionId()), Encode.forJava(groupDto.getProductId()));
-        groupService.addMembers(groupDto.getInstitutionId(), groupDto.getParentInstitutionId(), groupDto.getProductId(), groupDto.getMembers());
+        groupService.createGroupOrAddMembers(userGroupMapper.toUserGroupOperations(groupDto));
         log.trace("addMemberToUserGroup end");
     }
 
diff --git a/apps/user-group-ms/src/main/java/it/pagopa/selfcare/user_group/model/AddMembersToUserGroupDto.java b/apps/user-group-ms/src/main/java/it/pagopa/selfcare/user_group/model/AddMembersToUserGroupDto.java
@@ -27,6 +27,16 @@ public class AddMembersToUserGroupDto {
     @NotBlank
     private String productId;
 
+    @ApiModelProperty(value = "${swagger.user-group.model.name}", required = true)
+    @JsonProperty(required = true)
+    @NotBlank
+    private String name;
+
+    @ApiModelProperty(value = "${swagger.user-group.model.description}", required = true)
+    @JsonProperty(required = true)
+    @NotBlank
+    private String description;
+
     @ApiModelProperty(value = "${swagger.user-group.model.members}", required = true)
     @JsonProperty(required = true)
     @NotEmpty
diff --git a/apps/user-group-ms/src/main/java/it/pagopa/selfcare/user_group/model/CreateUserGroupDto.java b/apps/user-group-ms/src/main/java/it/pagopa/selfcare/user_group/model/CreateUserGroupDto.java
@@ -19,9 +19,6 @@ public class CreateUserGroupDto {
     @NotBlank
     private String institutionId;
 
-    @ApiModelProperty(value = "${swagger.user-group.model.parentInstitutionId}")
-    private String parentInstitutionId;
-
     @ApiModelProperty(value = "${swagger.user-group.model.productId}", required = true)
     @JsonProperty(required = true)
     @NotBlank
diff --git a/apps/user-group-ms/src/main/java/it/pagopa/selfcare/user_group/model/UserGroupEntity.java b/apps/user-group-ms/src/main/java/it/pagopa/selfcare/user_group/model/UserGroupEntity.java
@@ -40,7 +40,9 @@ public UserGroupEntity(UserGroupOperations userGroup) {
     private String parentInstitutionId;
     @FieldNameConstants.Include
     private String productId;
+    @FieldNameConstants.Include
     private String name;
+    @FieldNameConstants.Include
     private String description;
     @FieldNameConstants.Include
     private UserGroupStatus status;
diff --git a/apps/user-group-ms/src/main/java/it/pagopa/selfcare/user_group/model/mapper/UserGroupMapper.java b/apps/user-group-ms/src/main/java/it/pagopa/selfcare/user_group/model/mapper/UserGroupMapper.java
@@ -1,10 +1,7 @@
 package it.pagopa.selfcare.user_group.model.mapper;
 
 import it.pagopa.selfcare.user_group.api.UserGroupOperations;
-import it.pagopa.selfcare.user_group.model.CreateUserGroupDto;
-import it.pagopa.selfcare.user_group.model.GroupDto;
-import it.pagopa.selfcare.user_group.model.UpdateUserGroupDto;
-import it.pagopa.selfcare.user_group.model.UserGroupResource;
+import it.pagopa.selfcare.user_group.model.*;
 import org.mapstruct.Mapper;
 import org.mapstruct.Mapping;
 import org.mapstruct.Named;
@@ -20,31 +17,25 @@ public interface UserGroupMapper {
     @Mapping(source = ".", target = "members", qualifiedByName = "getMembersUUID")
     UserGroupResource toResource(UserGroupOperations entity);
 
-    @Mapping(source = ".", target = "members", qualifiedByName = "getMembers")
+    @Mapping(target = "members", expression = "java(getMembers(dto.getMembers()))")
     GroupDto fromDto(CreateUserGroupDto dto);
 
-    @Mapping(source = ".", target = "members", qualifiedByName = "getOperationMembers")
+    @Mapping(target = "members", expression = "java(getMembers(dto.getMembers()))")
     GroupDto toUserGroupOperations(UpdateUserGroupDto dto);
 
+    @Mapping(target = "members", expression = "java(getMembers(dto.getMembers()))")
+    GroupDto toUserGroupOperations(AddMembersToUserGroupDto dto);
+
     @Named("getMembersUUID")
     default List<UUID> getMembersUUID(UserGroupOperations entity) {
         return entity.getMembers()
                 .stream()
                 .map(UUID::fromString)
-                .collect(Collectors.toList());
-    }
-
-    @Named("getMembers")
-    default Set<String> getMembers(CreateUserGroupDto entity) {
-        return entity.getMembers()
-                .stream()
-                .map(UUID::toString)
-                .collect(Collectors.toSet());
+                .toList();
     }
 
-    @Named("getOperationMembers")
-    default Set<String> getOperationMembers(UpdateUserGroupDto entity) {
-        return entity.getMembers()
+    default Set<String> getMembers(Set<UUID> members) {
+        return members
                 .stream()
                 .map(UUID::toString)
                 .collect(Collectors.toSet());
diff --git a/apps/user-group-ms/src/main/java/it/pagopa/selfcare/user_group/service/UserGroupService.java b/apps/user-group-ms/src/main/java/it/pagopa/selfcare/user_group/service/UserGroupService.java
@@ -14,7 +14,7 @@ public interface UserGroupService {
 
     void addMember(String id, UUID memberId);
 
-    void addMembers(String institutionId, String parentInstitutionId, String productId, Set<UUID> members);
+    void createGroupOrAddMembers(UserGroupOperations group);
 
     void deleteMembersWithParentInstitutionId(String institutionId, String parentInstitutionId, String productId, Set<UUID> members);
 
diff --git a/apps/user-group-ms/src/main/java/it/pagopa/selfcare/user_group/service/UserGroupServiceImpl.java b/apps/user-group-ms/src/main/java/it/pagopa/selfcare/user_group/service/UserGroupServiceImpl.java
@@ -19,6 +19,7 @@
 import org.springframework.data.domain.AuditorAware;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Pageable;
+import org.springframework.data.mongodb.core.FindAndModifyOptions;
 import org.springframework.data.mongodb.core.MongoTemplate;
 import org.springframework.data.mongodb.core.query.Criteria;
 import org.springframework.data.mongodb.core.query.Query;
@@ -43,9 +44,11 @@ public class UserGroupServiceImpl implements UserGroupService {
     private static final String USER_GROUP_INSTITUTION_ID_REQUIRED_MESSAGE = "A user group institution id is required";
     private static final String USER_GROUP_PARENT_INSTITUTION_ID_REQUIRED_MESSAGE = "A user group parent institution id is required";
     private static final String MEMBERS_REQUIRED = "Members are required";
+    private static final String GROUP_NAME_REQUIRED = "A group name is required";
     private static final String MEMBER_ID_REQUIRED = "A member id is required";
+    private static final String GROUP_NAME_FORBIDDEN = "Group name cannot start with 'Ente Aggregatore'";
     private static final String GROUP_NAME_ALREADY_EXISTS = "A group with the same name already exists in ACTIVE or SUSPENDED state";
-    private static final String GROUP_PARENT_ALREADY_EXISTS = "A group with the same institutionId-parentInstitutionId-productId already exists in ACTIVE or SUSPENDED state";
+    private static final String ENTE_AGGREGATORE_PLACEHOLDER = "Ente Aggregatore ";
     private final List<String> allowedSortingParams;
     private final UserGroupRepository repository;
     private final MongoTemplate mongoTemplate;
@@ -70,7 +73,7 @@ public UserGroupOperations createGroup(UserGroupOperations group) {
         Assert.state(authentication.getPrincipal() instanceof SelfCareUser, "Not SelfCareUser principal");
         Assert.notNull(group, "A group is required");
 
-        checkGroupUniqueness(group.getId(), group.getName(), group.getProductId(), group.getInstitutionId(), group.getParentInstitutionId());
+        checkGroupUniqueness(group.getId(), group.getName(), group.getProductId(), group.getInstitutionId());
         return insertUserGroupEntity(group);
     }
 
@@ -89,21 +92,30 @@ public void addMember(String id, UUID memberId) {
     }
 
     @Override
-    public void addMembers(String institutionId, String parentInstitutionId, String productId, Set<UUID> members) {
-        log.trace("addMembers start");
-        log.debug("addMembers institutionId = {}, parentInstitutionId = {}, members = {}",
-                Encode.forJava(institutionId), Encode.forJava(parentInstitutionId), Encode.forJava(members.toString()));
-        Assert.notNull(institutionId, USER_GROUP_INSTITUTION_ID_REQUIRED_MESSAGE);
-        Assert.notNull(parentInstitutionId, USER_GROUP_PARENT_INSTITUTION_ID_REQUIRED_MESSAGE);
-        Assert.notNull(members, MEMBERS_REQUIRED);
-        UserGroupFilter userGroupFilter = UserGroupFilter.builder()
-                .institutionId(institutionId)
-                .parentInstitutionId(parentInstitutionId)
-                .productId(productId)
-                .build();
-        String groupId = findGroupId(userGroupFilter);
-        insertMembers(groupId, members);
-        log.trace("addMembers end");
+    public void createGroupOrAddMembers(UserGroupOperations userGroupOperations) {
+        log.trace("createGroupOrAddMembers start");
+        log.debug("createGroupOrAddMembers institutionId = {}, parentInstitutionId = {}, members = {}",
+                Encode.forJava(userGroupOperations.getInstitutionId()), Encode.forJava(userGroupOperations.getParentInstitutionId()), Encode.forJava(userGroupOperations.getMembers().toString()));
+        Assert.notNull(userGroupOperations.getInstitutionId(), USER_GROUP_INSTITUTION_ID_REQUIRED_MESSAGE);
+        Assert.notNull(userGroupOperations.getParentInstitutionId(), USER_GROUP_PARENT_INSTITUTION_ID_REQUIRED_MESSAGE);
+        Assert.notNull(userGroupOperations.getMembers(), MEMBERS_REQUIRED);
+
+        Query query = new Query(Criteria.where(UserGroupEntity.Fields.institutionId).is(userGroupOperations.getInstitutionId())
+                .and(UserGroupEntity.Fields.productId).is(userGroupOperations.getProductId())
+                .and(UserGroupEntity.Fields.parentInstitutionId).is(userGroupOperations.getParentInstitutionId())
+                .and(UserGroupEntity.Fields.status).in(List.of(UserGroupStatus.ACTIVE, UserGroupStatus.SUSPENDED)));
+
+        Update update = new Update()
+                .setOnInsert(UserGroupEntity.Fields.name, ENTE_AGGREGATORE_PLACEHOLDER + userGroupOperations.getName())
+                .setOnInsert(UserGroupEntity.Fields.description, userGroupOperations.getDescription())
+                .setOnInsert(UserGroupEntity.Fields.status, UserGroupStatus.ACTIVE)
+                .addToSet(UserGroupEntity.Fields.members).each(userGroupOperations.getMembers());
+
+        FindAndModifyOptions options = FindAndModifyOptions.options()
+                .upsert(true);
+
+        mongoTemplate.findAndModify(query, update, options, UserGroupEntity.class);
+        log.trace("createGroupOrAddMembers end");
     }
 
     @Override
@@ -213,7 +225,8 @@ public UserGroupOperations updateGroup(String id, UserGroupOperations group) {
         if (UserGroupStatus.SUSPENDED.equals(foundGroup.getStatus())) {
             throw new ResourceUpdateException(TRYING_TO_MODIFY_SUSPENDED_GROUP);
         }
-        checkGroupUniqueness(id, group.getName(), foundGroup.getProductId(), foundGroup.getInstitutionId(), foundGroup.getParentInstitutionId());
+
+        checkGroupUniqueness(id, group.getName(), foundGroup.getProductId(), foundGroup.getInstitutionId());
 
         foundGroup.setMembers(group.getMembers());
         foundGroup.setName(group.getName());
@@ -238,36 +251,26 @@ private UserGroupEntity insertUserGroupEntity(UserGroupOperations group) {
         return insert;
     }
 
-    private void checkGroupUniqueness(String currentGroupId, String groupName, String productId, String institutionId, String parentInstitutionId) {
-        UserGroupFilter filter = new UserGroupFilter();
-        filter.setProductId(productId);
-        filter.setInstitutionId(institutionId);
-        filter.setStatus(Arrays.asList(UserGroupStatus.ACTIVE, UserGroupStatus.SUSPENDED));
+    private void checkGroupUniqueness(String currentGroupId, String groupName, String productId, String institutionId) {
 
-        Page<UserGroupOperations> existingGroups = findAll(filter, Pageable.unpaged());
+        Assert.notNull(groupName, GROUP_NAME_REQUIRED);
+        Assert.isTrue(!groupName.startsWith(ENTE_AGGREGATORE_PLACEHOLDER), GROUP_NAME_FORBIDDEN);
 
-        // verify if there's no other group with the same name (but different groupId)
-        boolean isSameName = existingGroups.stream().anyMatch(g ->
-                g.getName().equals(groupName) && !g.getId().equals(currentGroupId));
+        Query query = new Query(
+                Criteria.where(UserGroupEntity.Fields.institutionId).is(institutionId)
+                        .and(UserGroupEntity.Fields.productId).is(productId)
+                        .and(UserGroupEntity.Fields.status).in(List.of(UserGroupStatus.ACTIVE, UserGroupStatus.SUSPENDED))
+        );
 
-        // when parentInsitutionId is not null, verify if there's no other group with same institutionId-parentInstitutionId-productId (but different groupId)
-        boolean isDuplicate = parentInstitutionId != null && existingGroups.stream().anyMatch(g ->
-                Objects.equals(g.getInstitutionId(), institutionId)
-                        && Objects.equals(g.getProductId(), productId)
-                        && Objects.equals(g.getParentInstitutionId(), parentInstitutionId)
-                        && !g.getId().equals(currentGroupId));
+        List<UserGroupEntity> foundGroups = mongoTemplate.find(query, UserGroupEntity.class);
+
+        boolean isSameName = foundGroups.stream().anyMatch(g ->
+                g.getName().equals(groupName) && !g.getId().equals(currentGroupId));
 
         if (isSameName) {
             log.warn("Attempted to create/update group with duplicate name: {}", groupName);
             throw new ResourceAlreadyExistsException(GROUP_NAME_ALREADY_EXISTS);
-        }
-
-        if (isDuplicate) {
-            log.warn("Attempted to create/update group with duplicate institutionId: {}, parentInstitutionId: {} and productId: {}",
-                    institutionId, parentInstitutionId, productId);
-            throw new ResourceAlreadyExistsException(GROUP_PARENT_ALREADY_EXISTS);
-        }
-    }
+        }    }
 
     private Query createActiveGroupQuery(String id) {
         return Query.query(Criteria.where(UserGroupEntity.Fields.ID).is(id)
@@ -303,26 +306,6 @@ private String findGroupId(UserGroupFilter userGroupFilter) {
         return foundGroups.getContent().get(0).getId();
     }
 
-    private void insertMembers(String id, Set<UUID> memberIds) {
-        log.trace("insertMembers start");
-        log.debug("insertMembers id = {}, memberIds = {}", Encode.forJava(id), Encode.forJava(memberIds.toString()));
-
-        // convert UUIDs
-        Object[] userIdsAsStrings = memberIds.stream()
-                .map(UUID::toString)
-                .toArray();
-
-        mongoTemplate.updateFirst(
-                createActiveGroupQuery(id),
-                new Update()
-                        .addToSet(UserGroupEntity.Fields.members).each(userIdsAsStrings)
-                        .set(UserGroupEntity.Fields.modifiedBy, auditorAware.getCurrentAuditor().orElse(null))
-                        .currentDate(UserGroupEntity.Fields.modifiedAt),
-                UserGroupEntity.class);
-
-        log.trace("insertMembers end");
-    }
-
     private void removeMembersWithParentInstitutionId(String id, Set<UUID> memberIds) {
         log.trace("removeMembersWithParentInstitutionId start");
         log.debug("removeMembersWithParentInstitutionId id = {}, memberIds = {}", Encode.forJava(id), Encode.forJava(memberIds.toString()));
diff --git a/apps/user-group-ms/src/test/java/it/pagopa/selfcare/user_group/controller/UserGroupV1ControllerTest.java b/apps/user-group-ms/src/test/java/it/pagopa/selfcare/user_group/controller/UserGroupV1ControllerTest.java
@@ -384,7 +384,7 @@ void addMembers() throws Exception {
         //then
         assertEquals(0, result.getResponse().getContentLength());
         verify(groupServiceMock, times(1))
-                .addMembers(anyString(), anyString(), anyString(), anySet());
+                .createGroupOrAddMembers(any());
         Mockito.verifyNoMoreInteractions(groupServiceMock);
     }
 
diff --git a/apps/user-group-ms/src/test/java/it/pagopa/selfcare/user_group/integration_test/steps/RetrieveUserGroupSteps.java b/apps/user-group-ms/src/test/java/it/pagopa/selfcare/user_group/integration_test/steps/RetrieveUserGroupSteps.java
@@ -13,7 +13,6 @@
 import io.restassured.response.Response;
 import io.restassured.response.ResponseOptions;
 import io.restassured.specification.RequestSpecification;
-import it.pagopa.selfcare.user_group.model.AddMembersToUserGroupDto;
 import it.pagopa.selfcare.user_group.model.DeleteMembersFromUserGroupDto;
 import it.pagopa.selfcare.user_group.model.UserGroupEntity;
 import it.pagopa.selfcare.user_group.model.UserGroupStatus;
@@ -39,23 +38,6 @@ public void afterFeature() {
         userGroupRepository.deleteAllById(userGroupsIds);
     }
 
-    @DataTableType
-    public AddMembersToUserGroupDto convertAddMembersRequest(Map<String, String> entry) {
-        AddMembersToUserGroupDto request = new AddMembersToUserGroupDto();
-        request.setInstitutionId(entry.get("institutionId"));
-        request.setParentInstitutionId(entry.get("parentInstitutionId"));
-        request.setProductId(entry.get("productId"));
-
-        Set<UUID> members = Optional.ofNullable(entry.get("members"))
-                .map(s -> Arrays.stream(s.split(","))
-                        .map(UUID::fromString)
-                        .collect(Collectors.toSet()))
-                .orElse(Set.of());
-        request.setMembers(members);
-
-        return request;
-    }
-
     @DataTableType
     public DeleteMembersFromUserGroupDto convertDeleteMembersRequest(Map<String, String> entry) {
         DeleteMembersFromUserGroupDto request = new DeleteMembersFromUserGroupDto();
@@ -273,5 +255,10 @@ public void iShouldReceiveAResponseWithStatusCode(int expectedStatusCode) {
     public void createUserLoginWithUsernameAndPassword(String user, String pass) {
         super.login(user, pass);
     }
+
+    @Then("[RETRIEVE] the response should contain a valid user group resource with name {string}")
+    public void verifyUserGroupName(String expectedName) {
+        Assertions.assertEquals(expectedName, userGroupEntityResponse.getName());
+    }
 }
 
diff --git a/apps/user-group-ms/src/test/java/it/pagopa/selfcare/user_group/integration_test/steps/UserGroupMemberSteps.java b/apps/user-group-ms/src/test/java/it/pagopa/selfcare/user_group/integration_test/steps/UserGroupMemberSteps.java
@@ -2,6 +2,7 @@
 
 import io.cucumber.java.After;
 import io.cucumber.java.Before;
+import io.cucumber.java.DataTableType;
 import io.cucumber.java.en.Given;
 import io.cucumber.java.en.Then;
 import io.cucumber.java.en.When;
@@ -16,11 +17,30 @@
 import org.apache.commons.lang3.StringUtils;
 
 import java.io.IOException;
-import java.util.List;
-import java.util.UUID;
+import java.util.*;
+import java.util.stream.Collectors;
 
 public class UserGroupMemberSteps extends UserGroupSteps {
 
+    @DataTableType
+    public AddMembersToUserGroupDto convertAddMembersRequest(Map<String, String> entry) {
+        AddMembersToUserGroupDto request = new AddMembersToUserGroupDto();
+        request.setInstitutionId(entry.get("institutionId"));
+        request.setParentInstitutionId(entry.get("parentInstitutionId"));
+        request.setProductId(entry.get("productId"));
+        request.setName(entry.get("name"));
+        request.setDescription(entry.get("description"));
+
+        Set<UUID> members = Optional.ofNullable(entry.get("members"))
+                .map(s -> Arrays.stream(s.split(","))
+                        .map(UUID::fromString)
+                        .collect(Collectors.toSet()))
+                .orElse(Set.of());
+        request.setMembers(members);
+
+        return request;
+    }
+
     @Before("@FirstGroupMembersScenario")
     public void beforeFeature() throws IOException {
         initializeCollection();
diff --git a/apps/user-group-ms/src/test/java/it/pagopa/selfcare/user_group/model/DummyAddMembersToUserGroupDto.java b/apps/user-group-ms/src/test/java/it/pagopa/selfcare/user_group/model/DummyAddMembersToUserGroupDto.java
diff --git a/apps/user-group-ms/src/test/java/it/pagopa/selfcare/user_group/service/UserGroupServiceImplTest.java b/apps/user-group-ms/src/test/java/it/pagopa/selfcare/user_group/service/UserGroupServiceImplTest.java
diff --git a/apps/user-group-ms/src/test/resources/features/createGroup.feature b/apps/user-group-ms/src/test/resources/features/createGroup.feature
diff --git a/apps/user-group-ms/src/test/resources/features/userGroupMembers.feature b/apps/user-group-ms/src/test/resources/features/userGroupMembers.feature

Original file line number	Diff line number	Diff line change
`@@ -238,7 +238,7 @@ public void addMembersToUserGroupWithParentInstitutionId(@RequestBody`
`238`	`238`	`log.trace("addMembersToUserGroup start");`
`239`	`239`	`log.debug("addMembersToUserGroup institutionId = {}, parentInstitutionId = {}, productId = {}",`
`240`	`240`	`Encode.forJava(groupDto.getInstitutionId()), Encode.forJava(groupDto.getParentInstitutionId()), Encode.forJava(groupDto.getProductId()));`
`241`		`- groupService.addMembers(groupDto.getInstitutionId(), groupDto.getParentInstitutionId(), groupDto.getProductId(), groupDto.getMembers());`
	`241`	`+ groupService.createGroupOrAddMembers(userGroupMapper.toUserGroupOperations(groupDto));`
`242`	`242`	`log.trace("addMemberToUserGroup end");`
`243`	`243`	`}`
`244`	`244`
Original file line number	Diff line number	Diff line change
`@@ -384,7 +384,7 @@ void addMembers() throws Exception {`
`384`	`384`	`//then`
`385`	`385`	`assertEquals(0, result.getResponse().getContentLength());`
`386`	`386`	`verify(groupServiceMock, times(1))`
`387`		`- .addMembers(anyString(), anyString(), anyString(), anySet());`
	`387`	`+ .createGroupOrAddMembers(any());`
`388`	`388`	`Mockito.verifyNoMoreInteractions(groupServiceMock);`
`389`	`389`	`}`
`390`	`390`