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

fix: Refactor getting string property value, fix getting system property

parent 766ce8ac
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
src/main/java/no/nibio/vips/logic/service/ObservationService.java
+ 122
− 103
View file @ 0396437e
...@@ -919,128 +919,131 @@ public class ObservationService { ...@@ -919,128 +919,131 @@ public class ObservationService {
}); });
LOGGER.info("Syncing for user {} with roles {}. mapFromApp.get(\"userId\")={}", user.getUserId(), user.getVipsLogicRoles(), mapFromApp.get("userId")); LOGGER.info("Syncing for user {} with roles {}. mapFromApp.get(\"userId\")={}", user.getUserId(), user.getVipsLogicRoles(), mapFromApp.get("userId"));
// Check if it is marked as deleted or not // Check if it is marked as deleted or not
if (mapFromApp.get("deleted") != null && ((Boolean) mapFromApp.get("deleted").equals(true))) { if (mapFromApp.get("deleted") != null && ((Boolean) mapFromApp.get("deleted").equals(true))) {
if (observationBean.getObservation((Integer) mapFromApp.get("observationId")) != null) { if (observationBean.getObservation((Integer) mapFromApp.get("observationId")) != null) {
observationBean.deleteObservation((Integer) mapFromApp.get("observationId")); observationBean.deleteObservation((Integer) mapFromApp.get("observationId"));
return Response.ok().build(); return Response.ok().build();
} else {
return Response.status(Status.NOT_FOUND).build();
}
} else { } else {
return Response.status(Status.NOT_FOUND).build(); Integer observationId = (Integer) mapFromApp.get("observationId");
} Date now = new Date(); // For setting timestamps
} else {
Integer observationId = (Integer) mapFromApp.get("observationId");
Date now = new Date(); // For setting timestamps
Observation mergeObs; Observation mergeObs;
if (observationId > 0) { // Observation already in database if (observationId > 0) { // Observation already in database
mergeObs = observationBean.getObservation(observationId); mergeObs = observationBean.getObservation(observationId);
if (mergeObs == null) { if (mergeObs == null) {
LOGGER.warn("Observation with id {} not found", observationId); LOGGER.warn("Observation with id {} not found", observationId);
return Response.status(Status.NOT_FOUND).build(); return Response.status(Status.NOT_FOUND).build();
}
} else { // New observation!
mergeObs = new Observation("APP");
} }
} else { // New observation!
mergeObs = new Observation("APP");
}
// Observation time series // Observation time series
if (mapFromApp.get("observationTimeSeriesId") != null) { if (mapFromApp.get("observationTimeSeriesId") != null) {
Integer observationTimeSeriesId = (Integer) mapFromApp.get("observationTimeSeriesId"); Integer observationTimeSeriesId = (Integer) mapFromApp.get("observationTimeSeriesId");
mergeObs.setObservationTimeSeries(observationTimeSeriesBean.getObservationTimeSeries(observationTimeSeriesId)); mergeObs.setObservationTimeSeries(observationTimeSeriesBean.getObservationTimeSeries(observationTimeSeriesId));
} }
// Pest organism // Pest organism
mergeObs.setOrganism(organismBean.getOrganism((Integer) mapFromApp.get("organismId"))); mergeObs.setOrganism(organismBean.getOrganism((Integer) mapFromApp.get("organismId")));
// Crop organism // Crop organism
mergeObs.setCropOrganism(organismBean.getOrganism((Integer) mapFromApp.get("cropOrganismId"))); mergeObs.setCropOrganism(organismBean.getOrganism((Integer) mapFromApp.get("cropOrganismId")));
// Other properties // Other properties
mergeObs.setTimeOfObservation(oM.convertValue(mapFromApp.get("timeOfObservation"), new TypeReference<Date>() { mergeObs.setTimeOfObservation(oM.convertValue(mapFromApp.get("timeOfObservation"), new TypeReference<Date>() {
})); }));
mergeObs.setIsPositive(mapFromApp.get("isPositive") != null ? (Boolean) mapFromApp.get("isPositive") : false); mergeObs.setIsPositive(mapFromApp.get("isPositive") != null ? (Boolean) mapFromApp.get("isPositive") : false);
mergeObs.setUserId(mapFromApp.get("userId") != null ? (Integer) mapFromApp.get("userId") : user.getUserId()); mergeObs.setUserId(mapFromApp.get("userId") != null ? (Integer) mapFromApp.get("userId") : user.getUserId());
mergeObs.setGeoinfo((String) mapFromApp.get("geoinfo")); mergeObs.setGeoinfo((String) mapFromApp.get("geoinfo"));
mergeObs.setLocationPointOfInterestId(mapFromApp.get("locationPointOfInterestId") != null ? (Integer) mapFromApp.get("locationPointOfInterestId") : null); mergeObs.setLocationPointOfInterestId(mapFromApp.get("locationPointOfInterestId") != null ? (Integer) mapFromApp.get("locationPointOfInterestId") : null);
mergeObs.setObservationHeading(mapFromApp.get("observationHeading") != null ? (String) mapFromApp.get("observationHeading") : null);
mergeObs.setObservationText(mapFromApp.get("observationText") != null ? (String) mapFromApp.get("observationText") : null);
mergeObs.setBroadcastMessage(mapFromApp.get("broadcastMessage") != null ? (Boolean) mapFromApp.get("broadcastMessage") : false);
mergeObs.setIsQuantified(mapFromApp.get("isQuantified") != null ? (Boolean) mapFromApp.get("isQuantified") : false); mergeObs.setObservationHeading(getStringPropertyOrNull(mapFromApp, "observationHeading"));
mergeObs.setLocationIsPrivate(mapFromApp.get("locationIsPrivate") != null ? (Boolean) mapFromApp.get("locationIsPrivate") : false); mergeObs.setObservationText(getStringPropertyOrNull(mapFromApp, "observationText"));
Object polygonServiceValue = mapFromApp.get("polygonService"); mergeObs.setBroadcastMessage(mapFromApp.get("broadcastMessage") != null ? (Boolean) mapFromApp.get("broadcastMessage") : false);
if (polygonServiceValue != null && !polygonServiceValue.toString().isBlank()) {
PolygonService polygonService = oM.convertValue(mapFromApp.get("polygonService"), PolygonService.class); mergeObs.setIsQuantified(mapFromApp.get("isQuantified") != null ? (Boolean) mapFromApp.get("isQuantified") : false);
mergeObs.setPolygonService(polygonService); mergeObs.setLocationIsPrivate(mapFromApp.get("locationIsPrivate") != null ? (Boolean) mapFromApp.get("locationIsPrivate") : false);
} Object polygonServiceValue = mapFromApp.get("polygonService");
if (polygonServiceValue != null && !polygonServiceValue.toString().isBlank()) {
PolygonService polygonService = oM.convertValue(mapFromApp.get("polygonService"), PolygonService.class);
mergeObs.setPolygonService(polygonService);
}
mergeObs.setObservationDataSchema(observationBean.getObservationDataSchema(user.getOrganization_id(), mergeObs.getOrganismId())); mergeObs.setObservationDataSchema(observationBean.getObservationDataSchema(user.getOrganization_id(), mergeObs.getOrganismId()));
mergeObs.setObservationData(mapFromApp.get("observationData") != null ? mapFromApp.get("observationData").toString() : null);
mergeObs.setLastEditedBy(user.getUserId());
mergeObs.setLastEditedTime(now);
boolean sendNotification = false; // Notification should be sent if status is set to approved mergeObs.setObservationData(getStringPropertyOrNull(mapFromApp, "observationData"));
boolean newRegistration = mergeObs.getObservationId() == null || mergeObs.getObservationId() <= 0; mergeObs.setLastEditedBy(user.getUserId());
boolean automaticApproval = userBean.authorizeUser(user, VipsLogicRole.OBSERVATION_AUTHORITY, VipsLogicRole.ORGANIZATION_ADMINISTRATOR, VipsLogicRole.SUPERUSER); mergeObs.setLastEditedTime(now);
if (newRegistration) {
if (automaticApproval) { boolean sendNotification = false; // Notification should be sent if status is set to approved
LOGGER.info("Set status to approved for new observation registered by user {}", user.getUserId()); boolean newRegistration = mergeObs.getObservationId() == null || mergeObs.getObservationId() <= 0;
mergeObs.setStatusChangedByUserId(user.getUserId()); boolean automaticApproval = userBean.authorizeUser(user, VipsLogicRole.OBSERVATION_AUTHORITY, VipsLogicRole.ORGANIZATION_ADMINISTRATOR, VipsLogicRole.SUPERUSER);
mergeObs.setStatusChangedTime(now); if (newRegistration) {
mergeObs.setStatusTypeId(ObservationStatusType.STATUS_APPROVED); if (automaticApproval) {
sendNotification = mergeObs.getBroadcastMessage(); // Only send for approved observations LOGGER.info("Set status to approved for new observation registered by user {}", user.getUserId());
mergeObs.setStatusChangedByUserId(user.getUserId());
mergeObs.setStatusChangedTime(now);
mergeObs.setStatusTypeId(ObservationStatusType.STATUS_APPROVED);
sendNotification = mergeObs.getBroadcastMessage(); // Only send for approved observations
} else {
LOGGER.info("Set status to pending for new observation registered by user {}", user.getUserId());
mergeObs.setStatusTypeId(Observation.STATUS_TYPE_ID_PENDING);
}
} else { } else {
LOGGER.info("Set status to pending for new observation registered by user {}", user.getUserId()); // Existing observation
mergeObs.setStatusTypeId(Observation.STATUS_TYPE_ID_PENDING); Integer newStatusTypeId = (Integer) mapFromApp.get("statusTypeId");
} Integer originalStatusTypeId = mergeObs.getStatusTypeId();
} else { if (automaticApproval && ObservationStatusType.STATUS_PENDING.equals(newStatusTypeId) && ObservationStatusType.STATUS_PENDING.equals(originalStatusTypeId)) {
// Existing observation LOGGER.info("Set status to approved for existing observation {} and user {}", mergeObs.getObservationId(), user.getUserId());
Integer newStatusTypeId = (Integer) mapFromApp.get("statusTypeId"); mergeObs.setStatusChangedByUserId(user.getUserId());
Integer originalStatusTypeId = mergeObs.getStatusTypeId(); mergeObs.setStatusChangedTime(now);
if (automaticApproval && ObservationStatusType.STATUS_PENDING.equals(newStatusTypeId) && ObservationStatusType.STATUS_PENDING.equals(originalStatusTypeId)) { mergeObs.setStatusTypeId(ObservationStatusType.STATUS_APPROVED);
LOGGER.info("Set status to approved for existing observation {} and user {}", mergeObs.getObservationId(), user.getUserId()); sendNotification = mergeObs.getBroadcastMessage(); // Only send for approved observations
mergeObs.setStatusChangedByUserId(user.getUserId()); }
mergeObs.setStatusChangedTime(now); // No option for changing the status in registration form in app
mergeObs.setStatusTypeId(ObservationStatusType.STATUS_APPROVED);
sendNotification = mergeObs.getBroadcastMessage(); // Only send for approved observations
} }
// No option for changing the status in registration form in app
}
// Input check before storing, location must be set // Input check before storing, location must be set
if ((mergeObs.getGeoinfo() == null || mergeObs.getGeoinfo().trim().isEmpty()) && mergeObs.getLocationPointOfInterestId() == null) { if ((mergeObs.getGeoinfo() == null || mergeObs.getGeoinfo().trim().isEmpty()) && mergeObs.getLocationPointOfInterestId() == null) {
LOGGER.error("The observation is missing location data, return bad request."); LOGGER.error("The observation is missing location data, return bad request.");
return Response.status(Status.BAD_REQUEST).entity("{\"error\": \"The observation is missing location data.\"}").type(MediaType.APPLICATION_JSON).build(); return Response.status(Status.BAD_REQUEST).entity("{\"error\": \"The observation is missing location data.\"}").type(MediaType.APPLICATION_JSON).build();
} }
// We need to get an observation Id before storing the illustrations! // We need to get an observation Id before storing the illustrations!
mergeObs = observationBean.storeObservation(mergeObs); mergeObs = observationBean.storeObservation(mergeObs);
// ObservationIllustrationSet // ObservationIllustrationSet
// Including data that may need to be stored // Including data that may need to be stored
if (mapFromApp.get("observationIllustrationSet") != null) { if (mapFromApp.get("observationIllustrationSet") != null) {
List<Map<Object, Object>> illusMaps = (List<Map<Object, Object>>) mapFromApp.get("observationIllustrationSet"); List<Map<Object, Object>> illusMaps = (List<Map<Object, Object>>) mapFromApp.get("observationIllustrationSet");
for (Map<Object, Object> illusMap : illusMaps) { for (Map<Object, Object> illusMap : illusMaps) {
ObservationIllustrationPK pk = oM.convertValue(illusMap.get("observationIllustrationPK"), new TypeReference<ObservationIllustrationPK>() { ObservationIllustrationPK pk = oM.convertValue(illusMap.get("observationIllustrationPK"), new TypeReference<ObservationIllustrationPK>() {
}); });
if (illusMap.get("deleted") != null && ((Boolean) illusMap.get("deleted")) == true) { if (illusMap.get("deleted") != null && ((Boolean) illusMap.get("deleted")) == true) {
observationBean.deleteObservationIllustration(mergeObs, new String[]{pk.getFileName()}); observationBean.deleteObservationIllustration(mergeObs, new String[]{pk.getFileName()});
} else if (illusMap.get("uploaded") != null && ((Boolean) illusMap.get("uploaded")) == false && illusMap.get("imageTextData") != null) { } else if (illusMap.get("uploaded") != null && ((Boolean) illusMap.get("uploaded")) == false && illusMap.get("imageTextData") != null) {
mergeObs = observationBean.storeObservationIllustration(mergeObs, pk.getFileName(), (String) illusMap.get("imageTextData")); mergeObs = observationBean.storeObservationIllustration(mergeObs, pk.getFileName(), (String) illusMap.get("imageTextData"));
}
} }
} }
} String disableMessagingSystemProperty = System.getProperty("no.nibio.vips.logic.DISABLE_MESSAGING_SYSTEM");
boolean messagingSystemDisabled = System.getProperty("DISABLE_MESSAGING_SYSTEM") != null && System.getProperty("DISABLE_MESSAGING_SYSTEM").equals("true"); boolean messagingSystemDisabled = disableMessagingSystemProperty != null && disableMessagingSystemProperty.equals("true");
LOGGER.info("Notification should be sent? " + sendNotification);
LOGGER.info("System property DISABLE_MESSAGING_SYSTEM = " + System.getProperty("DISABLE_MESSAGING_SYSTEM"));
LOGGER.info("Messaging system is disabled? " + messagingSystemDisabled);
// All transactions finished, we can send notifications LOGGER.info("Send notification? " + sendNotification);
// if conditions are met LOGGER.info("Messaging system enabled? " + !messagingSystemDisabled);
if (sendNotification && !messagingSystemDisabled) {
LOGGER.info("Sending the message!");
messagingBean.sendUniversalMessage(mergeObs);
}
return Response.ok().entity(mergeObs).build(); // All transactions finished, we can send notifications
} // if conditions are met
if (sendNotification && !messagingSystemDisabled) {
LOGGER.info("Send message");
messagingBean.sendUniversalMessage(mergeObs);
}
return Response.ok().entity(mergeObs).build();
}
} catch (IOException e) { } catch (IOException e) {
return Response.serverError().entity(e).build(); return Response.serverError().entity(e).build();
} }
...@@ -1069,4 +1072,20 @@ public class ObservationService { ...@@ -1069,4 +1072,20 @@ public class ObservationService {
.collect(Collectors.toList()); .collect(Collectors.toList());
} }
/**
* Utility method for getting the string value of a given property in a given map.
*
* @param map The map from which to retrieve the value
* @param propertyName The name of the property
* @return The value of the given property, null if not existing or empty
*/
private String getStringPropertyOrNull(Map<Object, Object> map, String propertyName) {
Object mapValue = map.get(propertyName);
if (mapValue == null) {
return null;
}
String strMapValue = (String) mapValue;
return !strMapValue.isBlank() ? strMapValue : null;
}
} }
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment