Skip to content
Snippets Groups Projects
Commit 2b948662 authored by Lene Wasskog's avatar Lene Wasskog
Browse files

feat(timeseries): Ensure POI is set for all users

parent f498117c
Branches feature/time-series-in-vipsweb
No related tags found
No related merge requests found
...@@ -107,15 +107,14 @@ public class ObservationTimeSeriesService { ...@@ -107,15 +107,14 @@ public class ObservationTimeSeriesService {
if (requester == null && userUUID != null) { if (requester == null && userUUID != null) {
requester = userBean.findVipsLogicUser(UUID.fromString(userUUID)); requester = userBean.findVipsLogicUser(UUID.fromString(userUUID));
} }
observationTimeSeriesBean.enrichObservationTimeSeriesWithPointOfInterest(ots);
boolean requesterNotValidUser = requester == null; boolean requesterNotValidUser = requester == null;
boolean requesterRegularUser = requester != null && !requester.isSuperUser() && !requester.isOrganizationAdmin(); boolean requesterRegularUser = requester != null && !requester.isSuperUser() && !requester.isOrganizationAdmin();
boolean requesterNotCreator = requester != null && !ots.getUserId().equals(requester.getUserId()); boolean requesterNotCreator = requester != null && !ots.getUserId().equals(requester.getUserId());
if (requesterNotValidUser || requesterRegularUser) { if (requesterNotValidUser || requesterRegularUser) {
// Mask for all users except creator, super and orgadmin // Mask for all users except creator, super and orgadmin
if (!(ots.getLocationIsPrivate() && (requesterNotValidUser || requesterNotCreator)) && ots.getPolygonService() != null) { if (!(ots.getLocationIsPrivate() && (requesterNotValidUser || requesterNotCreator)) && ots.getPolygonService() != null) {
observationTimeSeriesBean.enrichObservationTimeSeriesWithPointOfInterest(ots);
this.maskLocation(ots.getPolygonService(), ots); this.maskLocation(ots.getPolygonService(), ots);
} }
} }
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment