Skip to content

Commit

Permalink
Merge pull request Onlineberatung#690 from Onlineberatung/OB-10583-fi…
Browse files Browse the repository at this point in the history 
…x-pagination-issue

fix: delete inactive groups
  • Loading branch information
@tkuzynow
tkuzynow authored Mar 22, 2024
2 parents d6b5ef9 + 95425a7 commit b62828d
Show file tree
Hide file tree
Showing 3 changed files with 138 additions and 19 deletions.
78 changes: 62 additions & 16 deletions src/main/java/de/caritas/cob/userservice/api/adapters/rocketchat/RocketChatService.java
View file
Original file line number Diff line number Diff line change
@@ -1,10 +1,12 @@
package de.caritas.cob.userservice.api.adapters.rocketchat;

import static de.caritas.cob.userservice.api.helper.CustomLocalDateTime.nowInUtc;
import static java.util.Arrays.asList;
import static java.util.Objects.isNull;
import static java.util.Objects.nonNull;
import static org.apache.commons.lang3.ArrayUtils.isNotEmpty;

import com.google.common.collect.Lists;
import com.mongodb.DBObject;
import com.mongodb.QueryBuilder;
import com.mongodb.client.MongoClient;
Expand Down Expand Up @@ -59,7 +61,6 @@
import java.time.LocalDateTime;
import java.time.format.DateTimeFormatter;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Iterator;
import java.util.List;
import java.util.Map;
Expand Down Expand Up @@ -132,6 +133,7 @@ public class RocketChatService implements MessageClient {
private static final String USERS_LIST_ERROR_MESSAGE =
"Could not get users list from Rocket.Chat";
private static final String USER_LIST_GET_FIELD_SELECTION = "{\"_id\":1}";
private static final Integer PAGE_SIZE = 100;
private final LocalDateTime localDateTime1900 = LocalDateTime.of(1900, 1, 1, 0, 0);

private final LocalDateTime localDateTimeFuture = nowInUtc().plusYears(1L);
Expand Down Expand Up @@ -809,7 +811,7 @@ public List<GroupMemberDTO> getMembersOfGroup(String rcGroupId)
}

if (response.getStatusCode() == HttpStatus.OK && nonNull(response.getBody())) {
return Arrays.asList(response.getBody().getMembers());
return asList(response.getBody().getMembers());
} else {
var error = "Could not get Rocket.Chat group members for room id %s";
throw new RocketChatGetGroupMembersException(String.format(error, rcGroupId));
Expand Down Expand Up @@ -908,7 +910,7 @@ public List<SubscriptionsUpdateDTO> getSubscriptionsOfUser(
}

if (response.getStatusCode() == HttpStatus.OK && nonNull(response.getBody())) {
return Arrays.asList(response.getBody().getUpdate());
return asList(response.getBody().getUpdate());
} else {
var error = "Could not get Rocket.Chat subscriptions for user id %s";
throw new InternalServerErrorException(error, LogService::logRocketChatError);
Expand Down Expand Up @@ -967,7 +969,7 @@ public List<RoomsUpdateDTO> getRoomsOfUser(RocketChatCredentials rocketChatCrede
}

if (response.getStatusCode() == HttpStatus.OK && nonNull(response.getBody())) {
return Arrays.asList(response.getBody().getUpdate());
return asList(response.getBody().getUpdate());
} else {
var error =
String.format(CHAT_ROOM_ERROR_MESSAGE, rocketChatCredentials.getRocketChatUserId());
Expand Down Expand Up @@ -1188,28 +1190,72 @@ public List<GroupDTO> fetchAllInactivePrivateGroupsSinceGivenDate(
private List<GroupDTO> getGroupsListAll(DBObject mongoDbQuery)
throws RocketChatGetGroupsListAllException {

ResponseEntity<GroupsListAllResponseDTO> response;
try {
var technicalUser = rcCredentialHelper.getTechnicalUser();
var header = getStandardHttpHeaders(technicalUser);
HttpEntity<GroupAddUserBodyDTO> request = new HttpEntity<>(header);
var url = rocketChatConfig.getApiUrl(ENDPOINT_GROUP_LIST) + "?query={query}";
response =
restTemplate.exchange(
url,
HttpMethod.GET,
request,
GroupsListAllResponseDTO.class,
mongoDbQuery.toString());

return getGroupListAllCombiningPages(mongoDbQuery, request);
} catch (Exception ex) {
log.error("Rocket.Chat Error: Could not get Rocket.Chat groups list all. Reason: ", ex);
throw new RocketChatGetGroupsListAllException(GROUPS_LIST_ALL_ERROR_MESSAGE, ex);
}
}

if (response.getStatusCode() == HttpStatus.OK && nonNull(response.getBody())) {
return Arrays.asList(response.getBody().getGroups());
} else {
private List<GroupDTO> getGroupListAllCombiningPages(
DBObject mongoDbQuery, HttpEntity<GroupAddUserBodyDTO> request)
throws RocketChatGetGroupsListAllException {
List<GroupDTO> result = Lists.newArrayList();
int currentOffset = 0;
var pageResponse =
getGroupsListAllResponseDTOResponseEntityForCurrentOffset(
mongoDbQuery, request, currentOffset);

var totalResultSize = 0;
if (isResponseSuccessful(pageResponse)) {
totalResultSize = pageResponse.getBody().getTotal();
}

while (isResponseSuccessful(pageResponse) && currentOffset < totalResultSize) {
result.addAll(asList(pageResponse.getBody().getGroups()));
currentOffset += PAGE_SIZE;
pageResponse =
getGroupsListAllResponseDTOResponseEntityForCurrentOffset(
mongoDbQuery, request, currentOffset);
}
if (pageResponse.getStatusCode() != HttpStatus.OK || isNull(pageResponse.getBody())) {
log.error(
"Could not get Rocket.Chat groups list all. Reason {} {}. Url {}",
pageResponse.getStatusCode(),
pageResponse.getBody(),
getGroupAllPaginatedUrl(currentOffset));
throw new RocketChatGetGroupsListAllException(GROUPS_LIST_ALL_ERROR_MESSAGE);
}

return result;
}

private boolean isResponseSuccessful(ResponseEntity<GroupsListAllResponseDTO> pageResponse) {
return pageResponse.getStatusCode() == HttpStatus.OK && nonNull(pageResponse.getBody());
}

private ResponseEntity<GroupsListAllResponseDTO>
getGroupsListAllResponseDTOResponseEntityForCurrentOffset(
DBObject mongoDbQuery, HttpEntity<GroupAddUserBodyDTO> request, int currentOffset) {
ResponseEntity<GroupsListAllResponseDTO> response;
var url = getGroupAllPaginatedUrl(currentOffset);
response =
restTemplate.exchange(
url, HttpMethod.GET, request, GroupsListAllResponseDTO.class, mongoDbQuery.toString());
return response;
}

private String getGroupAllPaginatedUrl(int currentOffset) {
return rocketChatConfig.getApiUrl(ENDPOINT_GROUP_LIST)
+ "?query={query}&offset="
+ currentOffset
+ "&count="
+ PAGE_SIZE;
}

/**
Expand Down
4 changes: 4 additions & 0 deletions ...e/caritas/cob/userservice/api/adapters/rocketchat/dto/group/GroupsListAllResponseDTO.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,4 +18,8 @@ public class GroupsListAllResponseDTO {

@JsonProperty("groups")
private GroupDTO[] groups;

private Integer offset;
private Integer count;
private Integer total;
}
75 changes: 72 additions & 3 deletions src/test/java/de/caritas/cob/userservice/api/service/RocketChatServiceTest.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -165,9 +165,16 @@ public class RocketChatServiceTest {
new UsersListReponseDTO(
new RocketChatUserDTO[] {ROCKET_CHAT_USER_DTO, ROCKET_CHAT_USER_DTO_2});
private final GroupsListAllResponseDTO GROUPS_LIST_ALL_RESPONSE_DTO_EMPTY =
new GroupsListAllResponseDTO(new GroupDTO[0]);
new GroupsListAllResponseDTO(new GroupDTO[0], 1, 0, 0);
private final GroupsListAllResponseDTO GROUPS_LIST_ALL_RESPONSE_DTO =
new GroupsListAllResponseDTO(new GroupDTO[] {GROUP_DTO, GROUP_DTO_2});
new GroupsListAllResponseDTO(new GroupDTO[] {GROUP_DTO, GROUP_DTO_2}, 0, 2, 10);

private final GroupsListAllResponseDTO GROUPS_LIST_ALL_RESPONSE_DTO_PAGINATED =
new GroupsListAllResponseDTO(new GroupDTO[] {GROUP_DTO, GROUP_DTO_2}, 0, 100, 1000);

private final GroupsListAllResponseDTO
GROUPS_LIST_ALL_RESPONSE_DTO_PAGINATED_WITH_TOTAL_ZERO_ELEMENTS =
new GroupsListAllResponseDTO(new GroupDTO[] {GROUP_DTO, GROUP_DTO_2}, 0, 0, 0);
private final LocalDateTime DATETIME_OLDEST = nowInUtc();
private final LocalDateTime DATETIME_LATEST = nowInUtc();
private final String PASSWORD = "password";
Expand Down Expand Up @@ -738,7 +745,7 @@ public void removeAllMessages_Should_NotThrowException_WhenRemoveMessagesSucceed
List<GroupMemberDTO> result = rocketChatService.getStandardMembersOfGroup(GROUP_ID);

assertEquals(1, result.size());
assertEquals(result.get(0).get_id(), "a");
assertEquals("a", result.get(0).get_id());
}

/** Method: getUserInfo */
Expand Down Expand Up @@ -1096,6 +1103,68 @@ public void fetchAllInactivePrivateGroupsSinceGivenDate_Should_UseCorrectMongoQu

this.rocketChatService.fetchAllInactivePrivateGroupsSinceGivenDate(dateToCheck);

String correctMongoQuery =
"{\"lm\": {\"$lt\": {\"$date\": \"2021-01-01T00:00:00.000Z\"}},"
+ " \"$and\": [{\"t\": \"p\"}]}";
verify(restTemplate, times(2))
.exchange(
anyString(),
eq(HttpMethod.GET),
any(),
eq(GroupsListAllResponseDTO.class),
eq(correctMongoQuery));
}

@Test
public void
fetchAllInactivePrivateGroupsSinceGivenDate_Should_CallRocketChatApiMultipleTimes_When_ResultIsPaginated()
throws RocketChatUserNotInitializedException, RocketChatGetGroupsListAllException {

LocalDateTime dateToCheck = LocalDateTime.of(2021, 1, 1, 0, 0, 0);

when(rcCredentialsHelper.getTechnicalUser()).thenReturn(RC_CREDENTIALS_TECHNICAL_A);
when(restTemplate.exchange(
anyString(),
eq(HttpMethod.GET),
any(),
eq(GroupsListAllResponseDTO.class),
anyString()))
.thenReturn(new ResponseEntity<>(GROUPS_LIST_ALL_RESPONSE_DTO_PAGINATED, HttpStatus.OK));

this.rocketChatService.fetchAllInactivePrivateGroupsSinceGivenDate(dateToCheck);

String correctMongoQuery =
"{\"lm\": {\"$lt\": {\"$date\": \"2021-01-01T00:00:00.000Z\"}},"
+ " \"$and\": [{\"t\": \"p\"}]}";
verify(restTemplate, times(11))
.exchange(
anyString(),
eq(HttpMethod.GET),
any(),
eq(GroupsListAllResponseDTO.class),
eq(correctMongoQuery));
}

@Test
public void
fetchAllInactivePrivateGroupsSinceGivenDate_Should_CallRocketChatApiOnlyOnce_When_ResponseContainsTotalOfZeroElements()
throws RocketChatUserNotInitializedException, RocketChatGetGroupsListAllException {

LocalDateTime dateToCheck = LocalDateTime.of(2021, 1, 1, 0, 0, 0);

when(rcCredentialsHelper.getTechnicalUser()).thenReturn(RC_CREDENTIALS_TECHNICAL_A);
when(restTemplate.exchange(
anyString(),
eq(HttpMethod.GET),
any(),
eq(GroupsListAllResponseDTO.class),
anyString()))
.thenReturn(
new ResponseEntity<>(
GROUPS_LIST_ALL_RESPONSE_DTO_PAGINATED_WITH_TOTAL_ZERO_ELEMENTS, HttpStatus.OK));

this.rocketChatService.fetchAllInactivePrivateGroupsSinceGivenDate(dateToCheck);

String correctMongoQuery =
"{\"lm\": {\"$lt\": {\"$date\": \"2021-01-01T00:00:00.000Z\"}},"
+ " \"$and\": [{\"t\": \"p\"}]}";
Expand Down

0 comments on commit b62828d

Please sign in to comment.