task: Remove storedBy from tracker objects [DHIS2-21537]

dhis-2/dhis-api/src/main/java/org/hisp/dhis/common/BaseTrackerObject.java

@@ -29,7 +29,6 @@
  */
 package org.hisp.dhis.common;
 
-import com.fasterxml.jackson.annotation.JsonProperty;
 import jakarta.persistence.Column;
 import jakarta.persistence.MappedSuperclass;
 import jakarta.persistence.Temporal;
@@ -61,10 +60,6 @@ public class BaseTrackerObject {
   @Setter
   protected Date lastUpdated;
 
-  @Column(name = "storedby", length = 255)
-  @Setter
-  protected String storedBy;
-
   // -------------------------------------------------------------------------------------------
   // Getters
   // -------------------------------------------------------------------------------------------
@@ -86,9 +81,4 @@ public Date getCreated() {
   public Date getLastUpdated() {
     return lastUpdated;
   }
-
-  @JsonProperty
-  public String getStoredBy() {
-    return storedBy;
-  }
 }

dhis-2/dhis-services/dhis-service-core/src/main/resources/org/hisp/dhis/program/hibernate/SingleEvent.hbm.xml

@@ -36,8 +36,6 @@
 
     <property name="deleted" column="deleted" />
 
-    <property name="storedBy" />
-
     <property name="occurredDate" column="occurreddate" type="timestamp" />
 
     <many-to-one name="organisationUnit" class="org.hisp.dhis.organisationunit.OrganisationUnit" column="organisationunitid"

dhis-2/dhis-services/dhis-service-core/src/main/resources/org/hisp/dhis/program/hibernate/TrackerEvent.hbm.xml

@@ -39,8 +39,6 @@
 
     <property name="deleted" column="deleted" />
 
-    <property name="storedBy" />
-
     <property name="scheduledDate" column="scheduleddate" />
 
     <property name="occurredDate" column="occurreddate" type="timestamp" />

dhis-2/dhis-support/dhis-support-db-migration/src/main/resources/org/hisp/dhis/db/migration/2.44/V2_44_8__drop_stored_by_from_tracked_entities_enrollments_and_events_by.sql

@@ -0,0 +1,4 @@
+alter table trackedentity drop column if exists storedby;
+alter table enrollment drop column if exists storedby;
+alter table trackerevent drop column if exists storedby;
+alter table singleevent drop column if exists storedby;

dhis-2/dhis-test-e2e/src/test/java/org/hisp/dhis/tracker/export/TrackerExportFileTest.java

@@ -278,22 +278,22 @@ private void assertTrackedEntityCsv(String[] record) {
                 POLYGON,
                 record[10],
                 String.format("Expected polygon %s but got %s", POLYGON, record[10])), // polygon
-        () -> assertNotNull(record[14], "Expected createdBy to be not null"), // createdBy
-        () -> assertNotNull(record[15], "Expected updatedBy to be not null"), // updatedBy
+        () -> assertNotNull(record[13], "Expected createdBy to be not null"), // createdBy
+        () -> assertNotNull(record[14], "Expected updatedBy to be not null"), // updatedBy
         () ->
             assertEquals(
                 ATTRIBUTE,
-                record[18],
+                record[17],
                 String.format(
                     "Expected attribute  %s but got %s",
-                    ATTRIBUTE, record[18])), // attributes -> attribute
+                    ATTRIBUTE, record[17])), // attributes -> attribute
         () ->
             assertEquals(
                 ATTRIBUTE_VALUE,
-                record[20],
+                record[19],
                 String.format(
                     "Expected attribute value %s but got %s",
-                    ATTRIBUTE_VALUE, record[20])) // attributes -> value
+                    ATTRIBUTE_VALUE, record[19])) // attributes -> value
         );
   }
 

dhis-2/dhis-test-integration/src/test/java/org/hisp/dhis/tracker/export/OrderAndPaginationExporterTest.java

@@ -1577,16 +1577,14 @@ private static Stream<Arguments> orderByFieldInDescendingOrderWhenModeDescendant
     return Stream.of(
         Arguments.of("programStage.uid", "gvULMgNiAfN", "gvULMgNiAfM"),
         Arguments.of("scheduledDate", "gvULMgNiAfM", "gvULMgNiAfN"),
-        Arguments.of("status", "gvULMgNiAfM", "gvULMgNiAfN"),
-        Arguments.of("storedBy", "gvULMgNiAfN", "gvULMgNiAfM"));
+        Arguments.of("status", "gvULMgNiAfM", "gvULMgNiAfN"));
   }
 
   private static Stream<Arguments> orderByFieldInAscendingOrderWhenModeDescendants() {
     return Stream.of(
         Arguments.of("programStage.uid", "gvULMgNiAfM", "gvULMgNiAfN"),
         Arguments.of("scheduledDate", "gvULMgNiAfN", "gvULMgNiAfM"),
-        Arguments.of("status", "gvULMgNiAfN", "gvULMgNiAfM"),
-        Arguments.of("storedBy", "gvULMgNiAfM", "gvULMgNiAfN"));
+        Arguments.of("status", "gvULMgNiAfN", "gvULMgNiAfM"));
   }
 
   @ParameterizedTest

dhis-2/dhis-test-integration/src/test/java/org/hisp/dhis/tracker/export/trackedentity/TrackedEntityServiceTest.java

@@ -56,7 +56,6 @@
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertFalse;
 import static org.junit.jupiter.api.Assertions.assertNotNull;
-import static org.junit.jupiter.api.Assertions.assertNull;
 import static org.junit.jupiter.api.Assertions.assertThrows;
 import static org.junit.jupiter.api.Assertions.assertTrue;
 
@@ -1473,9 +1472,7 @@ void shouldReturnTrackedEntityMappedCorrectly()
         () -> checkDate(currentTime, trackedEntity.getCreated()),
         () -> checkDate(currentTime, trackedEntity.getCreatedAtClient()),
         () -> checkDate(currentTime, trackedEntity.getLastUpdatedAtClient()),
-        () -> checkDate(currentTime, trackedEntity.getLastUpdated()),
-        // get stored by is always null
-        () -> assertNull(trackedEntity.getStoredBy()));
+        () -> checkDate(currentTime, trackedEntity.getLastUpdated()));
   }
 
   @Test
@@ -1514,8 +1511,7 @@ void shouldReturnEnrollmentMappedCorrectly()
         () -> checkDate(currentTime, enrollment.getLastUpdated()),
         () -> checkDate(currentTime, enrollment.getLastUpdatedAtClient()),
         () -> checkDate(currentTime, enrollment.getEnrollmentDate()),
-        () -> checkDate(currentTime, enrollment.getOccurredDate()),
-        () -> assertNull(enrollment.getStoredBy()));
+        () -> checkDate(currentTime, enrollment.getOccurredDate()));
   }
 
   @Test

dhis-2/dhis-test-web-api/src/test/java/org/hisp/dhis/webapi/controller/tracker/FieldFilterSerializationTest.java

@@ -301,7 +301,6 @@ private static Event createEvent() {
                             .build())
                     .build()))
         .scheduledAt(DATE)
-        .storedBy("fred")
         .followUp(true)
         .createdAt(DATE)
         .attributeOptionCombo(UID.generate().getValue())

dhis-2/dhis-test-web-api/src/test/java/org/hisp/dhis/webapi/controller/tracker/export/relationship/RelationshipsExportControllerTest.java

@@ -536,8 +536,7 @@ void shouldGetRelationshipsByEnrollmentWithNotes() {
             "expected to find relationship " + relationship2.getUID());
 
     JsonList<JsonNote> notes = jsonRelationship.getTo().getEnrollment().getNotes();
-    notes.forEach(
-        note -> assertHasOnlyMembers(note, "note", "value", "storedAt", "storedBy", "createdBy"));
+    notes.forEach(note -> assertHasOnlyMembers(note, "note", "value", "storedAt", "createdBy"));
   }
 
   @Test

dhis-2/dhis-test-web-api/src/test/java/org/hisp/dhis/webapi/controller/tracker/export/trackedentity/TrackedEntitiesExportControllerTest.java

@@ -576,7 +576,7 @@ void getTrackedEntityCsvById() {
     assertTrue(response.header("content-disposition").contains("filename=trackedEntity.csv"));
     assertStartsWith(
         """
-    trackedEntity,trackedEntityType,createdAt,createdAtClient,updatedAt,updatedAtClient,orgUnit,inactive,deleted,potentialDuplicate,geometry,latitude,longitude,storedBy,createdBy,updatedBy,attrCreatedAt,attrUpdatedAt,attribute,displayName,value,valueType
+    trackedEntity,trackedEntityType,createdAt,createdAtClient,updatedAt,updatedAtClient,orgUnit,inactive,deleted,potentialDuplicate,geometry,latitude,longitude,createdBy,updatedBy,attrCreatedAt,attrUpdatedAt,attribute,displayName,value,valueType
     """,
         csvResponse);
     // TEAV order is not deterministic
@@ -601,7 +601,7 @@ String trackedEntityToCsv(TrackedEntity te, TrackedEntityAttributeValue attribut
             Boolean.toString(te.isInactive()),
             Boolean.toString(te.isDeleted()),
             Boolean.toString(te.isPotentialDuplicate()),
-            ",,,",
+            ",,",
             importUser.getUsername(),
             importUser.getUsername())
         + ","

dhis-2/dhis-test-web-api/src/test/java/org/hisp/dhis/webapi/controller/tracker/imports/TrackerEventSMSTest.java

@@ -467,7 +467,6 @@ void shouldCreateEvent() throws SmsCompressionException, NotFoundException {
         () -> assertEqualUids(submission.getProgramStage(), actual.getProgramStage()),
         () ->
             assertEqualUids(submission.getAttributeOptionCombo(), actual.getAttributeOptionCombo()),
-        () -> assertEquals(user1.getUsername(), actual.getStoredBy()),
         () -> assertEquals(submission.getEventDate(), actual.getOccurredDate()),
         () -> assertEquals(submission.getDueDate(), actual.getScheduledDate()),
         () -> assertEquals(EventStatus.COMPLETED, actual.getStatus()),
@@ -534,7 +533,6 @@ void shouldUpdateEvent() throws SmsCompressionException, NotFoundException {
         () -> assertEqualUids(submission.getProgramStage(), actual.getProgramStage()),
         () ->
             assertEqualUids(submission.getAttributeOptionCombo(), actual.getAttributeOptionCombo()),
-        () -> assertNull(actual.getStoredBy()),
         () -> assertEquals(event.getOccurredDate(), actual.getOccurredDate()),
         () -> assertEquals(event.getScheduledDate(), actual.getScheduledDate()),
         () -> assertEquals(EventStatus.COMPLETED, actual.getStatus()),
@@ -604,10 +602,8 @@ void shouldCreateEventInEventProgram() throws SmsCompressionException, NotFoundE
         () -> assertEqualUids(submission.getOrgUnit(), actual.getOrganisationUnit()),
         () ->
             assertEqualUids(submission.getAttributeOptionCombo(), actual.getAttributeOptionCombo()),
-        () -> assertEquals(user1.getUsername(), actual.getStoredBy()),
         () -> assertEquals(submission.getEventDate(), actual.getOccurredDate()),
         () -> assertEquals(EventStatus.ACTIVE, actual.getStatus()),
-        () -> assertEquals(user1.getUsername(), actual.getStoredBy()),
         () -> assertNull(actual.getCompletedDate()),
         () -> assertGeometry(submission.getCoordinates(), actual.getGeometry()),
         () -> {
@@ -669,9 +665,7 @@ void shouldCreateEventInEventProgramViaEventRegistrationParserCommand()
         () -> assertEqualUids(orgUnit, actual.getOrganisationUnit()),
         () -> assertEqualUids(eventProgram, actual.getProgramStage().getProgram()),
         () -> assertEqualUids(eventProgramStage, actual.getProgramStage()),
-        () -> assertEquals(user1.getUsername(), actual.getStoredBy()),
         () -> assertEquals(EventStatus.ACTIVE, actual.getStatus()),
-        () -> assertEquals(user1.getUsername(), actual.getStoredBy()),
         () -> {
           EventDataValue expected = new EventDataValue(de.getUid(), "hello");
           expected.setStoredBy(user1.getUsername());
@@ -751,9 +745,7 @@ void shouldCreateEventAndEnrollmentInTrackerProgramViaProgramStageDataEntryComma
         () -> assertEqualUids(trackerProgram, actualEvent.getEnrollment().getProgram()),
         () -> assertEqualUids(trackerProgramStage, actualEvent.getProgramStage()),
         () -> assertEqualUids(actualEnrollment, actualEvent.getEnrollment()),
-        () -> assertEquals(user1.getUsername(), actualEvent.getStoredBy()),
         () -> assertEquals(EventStatus.ACTIVE, actualEvent.getStatus()),
-        () -> assertEquals(user1.getUsername(), actualEvent.getStoredBy()),
         () -> {
           EventDataValue expected = new EventDataValue(de.getUid(), "hello");
           expected.setStoredBy(user1.getUsername());
@@ -818,9 +810,7 @@ void shouldCreateEventInExistingEnrollmentInTrackerProgramViaProgramStageDataEnt
         () -> assertEqualUids(trackerProgram, actual.getEnrollment().getProgram()),
         () -> assertEqualUids(trackerProgramStage, actual.getProgramStage()),
         () -> assertEqualUids(enrollment, actual.getEnrollment()),
-        () -> assertEquals(user2.getUsername(), actual.getStoredBy()),
         () -> assertEquals(EventStatus.ACTIVE, actual.getStatus()),
-        () -> assertEquals(user2.getUsername(), actual.getStoredBy()),
         () -> {
           EventDataValue expected = new EventDataValue(de.getUid(), "hello");
           expected.setStoredBy(user2.getUsername());

dhis-2/dhis-tracker/src/main/java/org/hisp/dhis/tracker/export/enrollment/JdbcEnrollmentStore.java

@@ -168,7 +168,7 @@ private void addSelect(StringBuilder sql, EnrollmentQueryParams params) {
         """
             select e.enrollmentid, e.uid, e.created, e.createdatclient, e.createdbyuserinfo,
             e.lastupdated, e.lastupdatedatclient, e.lastupdatedbyuserinfo, e.occurreddate,
-            e.enrollmentdate, e.completeddate, e.followup, e.completedby, e.storedby, e.deleted, e.status,
+            e.enrollmentdate, e.completeddate, e.followup, e.completedby, e.deleted, e.status,
             ST_AsBinary(e.geometry) as geometry,
         """);
 
@@ -629,7 +629,6 @@ public Enrollment mapRow(ResultSet rs, int rowNum) throws SQLException {
       enrollment.setCompletedDate(formatDate(rs.getTimestamp("completeddate")));
       enrollment.setFollowup(rs.getBoolean("followup"));
       enrollment.setCompletedBy(rs.getString("completedby"));
-      enrollment.setStoredBy(rs.getString("storedby"));
       enrollment.setDeleted(rs.getBoolean("deleted"));
       enrollment.setStatus(EnrollmentStatus.valueOf(rs.getString("status")));
       enrollment.setGeometry(Geometries.fromWkb(rs.getBytes("geometry")));

dhis-2/dhis-tracker/src/main/java/org/hisp/dhis/tracker/export/relationship/RelationshipItemMapper.java

@@ -199,7 +199,6 @@ default Enrollment map(
     result.setStatus(enrollment.getStatus());
     result.setDeleted(enrollment.isDeleted());
     result.setGeometry(enrollment.getGeometry());
-    result.setStoredBy(enrollment.getStoredBy());
     if (fields.isIncludesTrackedEntity() || fields.isIncludesAttributes()) {
       result.setTrackedEntity(mapTrackedEntityForEnrollment(enrollment.getTrackedEntity()));
     }
@@ -254,7 +253,6 @@ Set<TrackedEntityAttributeValue> mapTrackedEntityAttributeValues(
   @Mapping(target = "status")
   @Mapping(target = "eventDataValues")
   @Mapping(target = "notes")
-  @Mapping(target = "storedBy")
   @Mapping(target = "deleted")
   @Mapping(target = "completedBy")
   @Mapping(target = "assignedUser")
@@ -277,7 +275,6 @@ Set<TrackedEntityAttributeValue> mapTrackedEntityAttributeValues(
   @Mapping(target = "status")
   @Mapping(target = "eventDataValues")
   @Mapping(target = "notes")
-  @Mapping(target = "storedBy")
   @Mapping(target = "deleted")
   @Mapping(target = "completedBy")
   @Mapping(target = "assignedUser")

dhis-2/dhis-tracker/src/main/java/org/hisp/dhis/tracker/export/singleevent/JdbcSingleEventStore.java

@@ -131,7 +131,6 @@ class JdbcSingleEventStore {
           entry("organisationUnit.uid", "orgunit_uid"),
           entry("occurredDate", "ev_occurreddate"),
           entry("status", "ev_status"),
-          entry("storedBy", "ev_storedby"),
           entry("lastUpdatedBy", "ev_lastupdatedbyuserinfo"),
           entry("createdBy", "ev_createdbyuserinfo"),
           entry("created", "ev_created"),
@@ -278,7 +277,6 @@ private List<SingleEvent> fetchEvents(SingleEventQueryParams queryParams, PagePa
               coc.setCategoryOptions(options);
               event.setAttributeOptionCombo(coc);
 
-              event.setStoredBy(resultSet.getString("ev_storedby"));
               event.setOccurredDate(resultSet.getTimestamp("ev_occurreddate"));
               event.setCreated(resultSet.getTimestamp("ev_created"));
               event.setCreatedAtClient(resultSet.getTimestamp("ev_createdatclient"));
@@ -393,9 +391,9 @@ private EventDataValue parseEventDataValue(
     eventDataValue.setDataElement(dataElement);
     JsonObject dataValueJson = JsonMixed.of(dataValueResult).asObject();
     eventDataValue.setValue(dataValueJson.getString("value").string(""));
+    eventDataValue.setStoredBy(dataValueJson.getString("storedBy").string(null));
     eventDataValue.setProvidedElsewhere(
         dataValueJson.getBoolean("providedElsewhere").booleanValue(false));
-    eventDataValue.setStoredBy(dataValueJson.getString("storedBy").string(null));
 
     eventDataValue.setCreated(DateUtils.parseDate(dataValueJson.getString("created").string("")));
     eventDataValue.setCreatedByUserInfo(
@@ -617,7 +615,7 @@ private void addSelect(
     sql.append(
         """
             \s as ev_eventdatavalues,
-            ev.completedby as ev_completedby, ev.storedby as ev_storedby,
+            ev.completedby as ev_completedby,
             ev.created as ev_created, ev.createdatclient as ev_createdatclient,
             ev.createdbyuserinfo as ev_createdbyuserinfo,
             ev.lastupdated as ev_lastupdated, ev.lastupdatedatclient as ev_lastupdatedatclient,

dhis-2/dhis-tracker/src/main/java/org/hisp/dhis/tracker/export/trackerevent/JdbcTrackerEventStore.java

@@ -142,7 +142,6 @@ class JdbcTrackerEventStore {
           entry("enrollment.followUp", "en_followup"),
           entry("status", "ev_status"),
           entry("scheduledDate", "ev_scheduleddate"),
-          entry("storedBy", "ev_storedby"),
           entry("lastUpdatedBy", "ev_lastupdatedbyuserinfo"),
           entry("createdBy", "ev_createdbyuserinfo"),
           entry("created", "ev_created"),
@@ -298,8 +297,6 @@ private List<TrackerEvent> fetchEvents(
               }
               coc.setCategoryOptions(options);
               event.setAttributeOptionCombo(coc);
-
-              event.setStoredBy(resultSet.getString("ev_storedby"));
               event.setScheduledDate(resultSet.getTimestamp("ev_scheduleddate"));
               event.setOccurredDate(resultSet.getTimestamp("ev_occurreddate"));
               event.setCreated(resultSet.getTimestamp("ev_created"));
@@ -397,9 +394,9 @@ private EventDataValue parseEventDataValue(
     eventDataValue.setDataElement(dataElement);
     JsonObject dataValueJson = JsonMixed.of(dataValueResult).asObject();
     eventDataValue.setValue(dataValueJson.getString("value").string(""));
+    eventDataValue.setStoredBy(dataValueJson.getString("storedBy").string(null));
     eventDataValue.setProvidedElsewhere(
         dataValueJson.getBoolean("providedElsewhere").booleanValue(false));
-    eventDataValue.setStoredBy(dataValueJson.getString("storedBy").string(null));
 
     eventDataValue.setCreated(DateUtils.parseDate(dataValueJson.getString("created").string("")));
     if (dataValueJson.has("createdByUserInfo")) {
@@ -719,7 +716,7 @@ private void addSelect(StringBuilder sql, TrackerEventQueryParams params) {
             ev.eventid as ev_id, ev.status as ev_status,
             ev.occurreddate as ev_occurreddate, ev.scheduleddate as ev_scheduleddate,
             ev.eventdatavalues as ev_eventdatavalues,
-            ev.completedby as ev_completedby, ev.storedby as ev_storedby,
+            ev.completedby as ev_completedby,
             ev.created as ev_created, ev.createdatclient as ev_createdatclient,
             ev.createdbyuserinfo as ev_createdbyuserinfo,
             ev.lastupdated as ev_lastupdated, ev.lastupdatedatclient as ev_lastupdatedatclient,

dhis-2/dhis-tracker/src/main/java/org/hisp/dhis/tracker/imports/bundle/TrackerObjectsMapper.java

@@ -85,7 +85,6 @@ private TrackerObjectsMapper() {
       dbTrackedEntity.setUid(trackedEntity.getTrackedEntity().getValue());
       dbTrackedEntity.setCreated(now);
       dbTrackedEntity.setCreatedByUserInfo(UserInfoSnapshot.from(user));
-      dbTrackedEntity.setStoredBy(trackedEntity.getStoredBy());
     }
 
     dbTrackedEntity.setLastUpdated(now);
@@ -119,7 +118,6 @@ private TrackerObjectsMapper() {
       dbEnrollment = new Enrollment();
       dbEnrollment.setUid(enrollment.getEnrollment().getValue());
       dbEnrollment.setCreated(now);
-      dbEnrollment.setStoredBy(enrollment.getStoredBy());
       dbEnrollment.setCreatedByUserInfo(UserInfoSnapshot.from(user));
     }
 
@@ -196,7 +194,6 @@ private TrackerObjectsMapper() {
       dbEvent = new TrackerEvent();
       dbEvent.setUid(event.getEvent().getValue());
       dbEvent.setCreated(now);
-      dbEvent.setStoredBy(event.getStoredBy());
       dbEvent.setCreatedByUserInfo(UserInfoSnapshot.from(user));
     }
     dbEvent.setLastUpdated(now);
@@ -268,7 +265,6 @@ private TrackerObjectsMapper() {
       dbEvent = new SingleEvent();
       dbEvent.setUid(event.getEvent().getValue());
       dbEvent.setCreated(now);
-      dbEvent.setStoredBy(event.getStoredBy());
       dbEvent.setCreatedByUserInfo(UserInfoSnapshot.from(user));
     }
     dbEvent.setLastUpdated(now);
@@ -417,7 +413,6 @@ public static TrackerEvent map(SingleEvent singleEvent) {
     event.setCreatedBy(singleEvent.getCreatedBy());
     event.setCreatedAtClient(singleEvent.getCreatedAtClient());
     event.setCreatedByUserInfo(singleEvent.getCreatedByUserInfo());
-    event.setStoredBy(singleEvent.getStoredBy());
     event.setLastUpdated(singleEvent.getLastUpdated());
     event.setLastUpdatedBy(singleEvent.getLastUpdatedBy());
     event.setLastUpdatedAtClient(singleEvent.getLastUpdatedAtClient());

dhis-2/dhis-tracker/src/main/java/org/hisp/dhis/tracker/imports/domain/Enrollment.java

@@ -72,8 +72,6 @@ public class Enrollment implements TrackerDto, Serializable {
 
   @JsonProperty private boolean followUp;
 
-  @JsonProperty private String storedBy;
-
   @JsonProperty private Instant completedAt;
 
   @JsonProperty private Geometry geometry;

dhis-2/dhis-tracker/src/main/java/org/hisp/dhis/tracker/imports/domain/Event.java

@@ -62,8 +62,6 @@ default TrackerType getTrackerType() {
 
   Instant getOccurredAt();
 
-  String getStoredBy();
-
   Instant getCreatedAtClient();
 
   Instant getUpdatedAtClient();