MORE-Platform#204: Added a removal of the observation seed property keys when an observation updates

Author: janoliver20

studymanager-services/src/main/java/io/redlink/more/studymanager/repository/ObservationRepository.java

@@ -51,6 +51,7 @@ public class ObservationRepository {
     private static final String GET_OBSERVATION_PROPERTIES_FOR_PARTICIPANT = "SELECT properties FROM participant_observation_properties WHERE  study_id = ? AND participant_id = ? AND observation_id = ?";
     private static final String GET_ALL_OBSERVATION_PROPERTIES_FOR_PARTICIPANT = "SELECT * FROM participant_observation_properties WHERE  study_id = ?";
     private static final String DELETE_OBSERVATION_PROPERTIES_FOR_PARTICIPANT = "DELETE FROM participant_observation_properties WHERE study_id = ? AND participant_id = ? AND observation_id = ?";
+    private static final String REMOVE_PARTICIPANT_PROPERTY_KEY = "UPDATE participant_observation_properties SET properties = properties - :key WHERE study_id = :study_id AND observation_id = :observation_id";
 
     private final JdbcTemplate template;
     private final NamedParameterJdbcTemplate namedTemplate;
@@ -203,6 +204,19 @@ public void mergeParticipantProperties(Long studyId, Integer participantId, Inte
         namedTemplate.update(SET_OBSERVATION_PROPERTIES_FOR_PARTICIPANT, data);
     }
 
+    public void removeParticipantsPropertyKey(Long studyId, Integer observationId, String keyToRemove) {
+        if (keyToRemove == null || keyToRemove.isBlank()) {
+            throw new BadRequestException("keyToRemove must not be null or blank");
+        }
+
+        MapSqlParameterSource params = new MapSqlParameterSource()
+                .addValue("study_id", studyId)
+                .addValue("observation_id", observationId)
+                .addValue("key", keyToRemove);
+
+        namedTemplate.update(REMOVE_PARTICIPANT_PROPERTY_KEY, params);
+    }
+
     @Transactional
     public List<ParticipantWithObservationProperties> getParticipantObservationProperties(Long studyId) {
         try {

studymanager-services/src/main/java/io/redlink/more/studymanager/service/ObservationService.java

@@ -23,6 +23,7 @@
 import io.redlink.more.studymanager.model.Study;
 import io.redlink.more.studymanager.repository.ObservationRepository;
 import io.redlink.more.studymanager.sdk.MoreSDK;
+import io.redlink.more.studymanager.utils.RandomSchedulerUtils;
 import org.springframework.stereotype.Service;
 
 import java.util.ArrayList;
@@ -88,7 +89,9 @@ public List<Observation> listObservationsForGroup(Long studyId, Integer studyGro
 
     public Observation updateObservation(Observation observation) {
         studyStateService.assertStudyNotInState(observation.getStudyId(), Study.Status.CLOSED);
-        return repository.updateObservation(validate(observation));
+        Observation updatedObservation = repository.updateObservation(validate(observation));
+        repository.removeParticipantsPropertyKey(observation.getStudyId(), observation.getObservationId(), RandomSchedulerUtils.OBSERVATION_SCHEDULE_SEED_KEY);
+        return updatedObservation;
     }
 
     public void alignObservationsWithStudyState(Study study) {