Skip to content
Snippets Groups Projects
Commit abe64fbe authored by Tor-Einar Skog's avatar Tor-Einar Skog
Browse files

Remove duplicate observations in result list

parent 2233f5fe
Branches
No related tags found
No related merge requests found
...@@ -803,8 +803,10 @@ public class ObservationService { ...@@ -803,8 +803,10 @@ public class ObservationService {
LOGGER.info("Return {} masked public observations for unregistered user", retVal.size()); LOGGER.info("Return {} masked public observations for unregistered user", retVal.size());
return sortObservationsByDateAndId(retVal); return sortObservationsByDateAndId(retVal);
} }
// Else: This is a registered user without special privileges. Show public observations + user's own // Else: This is a registered user without special privileges. Show public observations + user's own
retVal.addAll(observationBean.getObservationsForUser(user)); // Making sure we don't add duplicates
Set<Integer> obsIds = retVal.stream().map(o->o.getObservationId()).collect(Collectors.toSet());
retVal.addAll(observationBean.getObservationsForUser(user).stream().filter(o->!obsIds.contains(o.getObservationId())).collect(Collectors.toList()));
LOGGER.info("Return {} masked public observations and user's own observations for registered user {}", retVal.size(), user.getUserId()); LOGGER.info("Return {} masked public observations and user's own observations for registered user {}", retVal.size(), user.getUserId());
return sortObservationsByDateAndId(retVal); return sortObservationsByDateAndId(retVal);
} }
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment