diff --git a/dhis-2/dhis-api/src/main/java/org/hisp/dhis/common/BaseTrackerObject.java b/dhis-2/dhis-api/src/main/java/org/hisp/dhis/common/BaseTrackerObject.java
index 7dde45543ba0..7f26bbc94a17 100644
--- a/dhis-2/dhis-api/src/main/java/org/hisp/dhis/common/BaseTrackerObject.java
+++ b/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;
- }
}
diff --git a/dhis-2/dhis-services/dhis-service-core/src/main/resources/org/hisp/dhis/program/hibernate/SingleEvent.hbm.xml b/dhis-2/dhis-services/dhis-service-core/src/main/resources/org/hisp/dhis/program/hibernate/SingleEvent.hbm.xml
index 3c19540233bf..1ee96b39becc 100644
--- a/dhis-2/dhis-services/dhis-service-core/src/main/resources/org/hisp/dhis/program/hibernate/SingleEvent.hbm.xml
+++ b/dhis-2/dhis-services/dhis-service-core/src/main/resources/org/hisp/dhis/program/hibernate/SingleEvent.hbm.xml
@@ -36,8 +36,6 @@
-
-
-
-
diff --git a/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 b/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
new file mode 100644
index 000000000000..b81b48064c68
--- /dev/null
+++ b/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;
\ No newline at end of file
diff --git a/dhis-2/dhis-test-e2e/src/test/java/org/hisp/dhis/tracker/export/TrackerExportFileTest.java b/dhis-2/dhis-test-e2e/src/test/java/org/hisp/dhis/tracker/export/TrackerExportFileTest.java
index 673df66bce9a..fedaf31742f1 100644
--- a/dhis-2/dhis-test-e2e/src/test/java/org/hisp/dhis/tracker/export/TrackerExportFileTest.java
+++ b/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
);
}
diff --git a/dhis-2/dhis-test-integration/src/test/java/org/hisp/dhis/tracker/export/OrderAndPaginationExporterTest.java b/dhis-2/dhis-test-integration/src/test/java/org/hisp/dhis/tracker/export/OrderAndPaginationExporterTest.java
index 7a08e53c7b08..83b6a1dd3fd2 100644
--- a/dhis-2/dhis-test-integration/src/test/java/org/hisp/dhis/tracker/export/OrderAndPaginationExporterTest.java
+++ b/dhis-2/dhis-test-integration/src/test/java/org/hisp/dhis/tracker/export/OrderAndPaginationExporterTest.java
@@ -1577,16 +1577,14 @@ private static Stream 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 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
diff --git a/dhis-2/dhis-test-integration/src/test/java/org/hisp/dhis/tracker/export/trackedentity/TrackedEntityServiceTest.java b/dhis-2/dhis-test-integration/src/test/java/org/hisp/dhis/tracker/export/trackedentity/TrackedEntityServiceTest.java
index d3ee43be2a99..9fa8705574cd 100644
--- a/dhis-2/dhis-test-integration/src/test/java/org/hisp/dhis/tracker/export/trackedentity/TrackedEntityServiceTest.java
+++ b/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
diff --git a/dhis-2/dhis-test-web-api/src/test/java/org/hisp/dhis/webapi/controller/tracker/FieldFilterSerializationTest.java b/dhis-2/dhis-test-web-api/src/test/java/org/hisp/dhis/webapi/controller/tracker/FieldFilterSerializationTest.java
index 7ff44ada87fe..05f3540c3788 100644
--- a/dhis-2/dhis-test-web-api/src/test/java/org/hisp/dhis/webapi/controller/tracker/FieldFilterSerializationTest.java
+++ b/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())
diff --git a/dhis-2/dhis-test-web-api/src/test/java/org/hisp/dhis/webapi/controller/tracker/export/relationship/RelationshipsExportControllerTest.java b/dhis-2/dhis-test-web-api/src/test/java/org/hisp/dhis/webapi/controller/tracker/export/relationship/RelationshipsExportControllerTest.java
index 0d7f47c3619f..f8953272877f 100644
--- a/dhis-2/dhis-test-web-api/src/test/java/org/hisp/dhis/webapi/controller/tracker/export/relationship/RelationshipsExportControllerTest.java
+++ b/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 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
diff --git a/dhis-2/dhis-test-web-api/src/test/java/org/hisp/dhis/webapi/controller/tracker/export/trackedentity/TrackedEntitiesExportControllerTest.java b/dhis-2/dhis-test-web-api/src/test/java/org/hisp/dhis/webapi/controller/tracker/export/trackedentity/TrackedEntitiesExportControllerTest.java
index e8fa1222a2f7..a77ba3e5e3fd 100644
--- a/dhis-2/dhis-test-web-api/src/test/java/org/hisp/dhis/webapi/controller/tracker/export/trackedentity/TrackedEntitiesExportControllerTest.java
+++ b/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())
+ ","
diff --git a/dhis-2/dhis-test-web-api/src/test/java/org/hisp/dhis/webapi/controller/tracker/imports/TrackerEventSMSTest.java b/dhis-2/dhis-test-web-api/src/test/java/org/hisp/dhis/webapi/controller/tracker/imports/TrackerEventSMSTest.java
index 91cdbb8ed28b..540b29d652cf 100644
--- a/dhis-2/dhis-test-web-api/src/test/java/org/hisp/dhis/webapi/controller/tracker/imports/TrackerEventSMSTest.java
+++ b/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());
diff --git a/dhis-2/dhis-tracker/src/main/java/org/hisp/dhis/tracker/export/enrollment/JdbcEnrollmentStore.java b/dhis-2/dhis-tracker/src/main/java/org/hisp/dhis/tracker/export/enrollment/JdbcEnrollmentStore.java
index fc48273409f0..015e09264e2a 100644
--- a/dhis-2/dhis-tracker/src/main/java/org/hisp/dhis/tracker/export/enrollment/JdbcEnrollmentStore.java
+++ b/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")));
diff --git a/dhis-2/dhis-tracker/src/main/java/org/hisp/dhis/tracker/export/relationship/RelationshipItemMapper.java b/dhis-2/dhis-tracker/src/main/java/org/hisp/dhis/tracker/export/relationship/RelationshipItemMapper.java
index 898b552aa59b..ba2c9e051cf8 100644
--- a/dhis-2/dhis-tracker/src/main/java/org/hisp/dhis/tracker/export/relationship/RelationshipItemMapper.java
+++ b/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 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 mapTrackedEntityAttributeValues(
@Mapping(target = "status")
@Mapping(target = "eventDataValues")
@Mapping(target = "notes")
- @Mapping(target = "storedBy")
@Mapping(target = "deleted")
@Mapping(target = "completedBy")
@Mapping(target = "assignedUser")
diff --git a/dhis-2/dhis-tracker/src/main/java/org/hisp/dhis/tracker/export/singleevent/JdbcSingleEventStore.java b/dhis-2/dhis-tracker/src/main/java/org/hisp/dhis/tracker/export/singleevent/JdbcSingleEventStore.java
index 56d0e9d39006..9a5b684c9e41 100644
--- a/dhis-2/dhis-tracker/src/main/java/org/hisp/dhis/tracker/export/singleevent/JdbcSingleEventStore.java
+++ b/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 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,
diff --git a/dhis-2/dhis-tracker/src/main/java/org/hisp/dhis/tracker/export/trackerevent/JdbcTrackerEventStore.java b/dhis-2/dhis-tracker/src/main/java/org/hisp/dhis/tracker/export/trackerevent/JdbcTrackerEventStore.java
index 7b59f42676f9..aa84dd9cdcaa 100644
--- a/dhis-2/dhis-tracker/src/main/java/org/hisp/dhis/tracker/export/trackerevent/JdbcTrackerEventStore.java
+++ b/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 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,
diff --git a/dhis-2/dhis-tracker/src/main/java/org/hisp/dhis/tracker/imports/bundle/TrackerObjectsMapper.java b/dhis-2/dhis-tracker/src/main/java/org/hisp/dhis/tracker/imports/bundle/TrackerObjectsMapper.java
index 14f5a3d812d2..c40ca0f650fc 100644
--- a/dhis-2/dhis-tracker/src/main/java/org/hisp/dhis/tracker/imports/bundle/TrackerObjectsMapper.java
+++ b/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());
diff --git a/dhis-2/dhis-tracker/src/main/java/org/hisp/dhis/tracker/imports/domain/Enrollment.java b/dhis-2/dhis-tracker/src/main/java/org/hisp/dhis/tracker/imports/domain/Enrollment.java
index 40395cf4243c..667480773773 100644
--- a/dhis-2/dhis-tracker/src/main/java/org/hisp/dhis/tracker/imports/domain/Enrollment.java
+++ b/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;
diff --git a/dhis-2/dhis-tracker/src/main/java/org/hisp/dhis/tracker/imports/domain/Event.java b/dhis-2/dhis-tracker/src/main/java/org/hisp/dhis/tracker/imports/domain/Event.java
index 3c3c96de0e9f..e7dfcd7981fe 100644
--- a/dhis-2/dhis-tracker/src/main/java/org/hisp/dhis/tracker/imports/domain/Event.java
+++ b/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();
diff --git a/dhis-2/dhis-tracker/src/main/java/org/hisp/dhis/tracker/imports/domain/SingleEvent.java b/dhis-2/dhis-tracker/src/main/java/org/hisp/dhis/tracker/imports/domain/SingleEvent.java
index f42194dbc4a8..f2e4809be3d9 100644
--- a/dhis-2/dhis-tracker/src/main/java/org/hisp/dhis/tracker/imports/domain/SingleEvent.java
+++ b/dhis-2/dhis-tracker/src/main/java/org/hisp/dhis/tracker/imports/domain/SingleEvent.java
@@ -64,8 +64,6 @@ public class SingleEvent implements Event {
@JsonProperty private Instant occurredAt;
- @JsonProperty private String storedBy;
-
@JsonProperty private Instant createdAtClient;
@JsonProperty private Instant updatedAtClient;
@@ -103,7 +101,6 @@ public static SingleEvent.SingleEventBuilder builderFromEvent(Event event) {
.programStage(event.getProgramStage())
.orgUnit(event.getOrgUnit())
.occurredAt(event.getOccurredAt())
- .storedBy(event.getStoredBy())
.createdAtClient(event.getCreatedAtClient())
.updatedAtClient(event.getUpdatedAtClient())
.attributeOptionCombo(event.getAttributeOptionCombo())
diff --git a/dhis-2/dhis-tracker/src/main/java/org/hisp/dhis/tracker/imports/domain/TrackedEntity.java b/dhis-2/dhis-tracker/src/main/java/org/hisp/dhis/tracker/imports/domain/TrackedEntity.java
index 2caf71478922..ed3aba3e2b94 100644
--- a/dhis-2/dhis-tracker/src/main/java/org/hisp/dhis/tracker/imports/domain/TrackedEntity.java
+++ b/dhis-2/dhis-tracker/src/main/java/org/hisp/dhis/tracker/imports/domain/TrackedEntity.java
@@ -67,8 +67,6 @@ public class TrackedEntity implements TrackerDto, Serializable {
@JsonProperty private Geometry geometry;
- @JsonProperty private String storedBy;
-
@JsonProperty @Builder.Default private List attributes = new ArrayList<>();
@Override
diff --git a/dhis-2/dhis-tracker/src/main/java/org/hisp/dhis/tracker/imports/domain/TrackerEvent.java b/dhis-2/dhis-tracker/src/main/java/org/hisp/dhis/tracker/imports/domain/TrackerEvent.java
index 20c0201ae44f..582c22fb1e99 100644
--- a/dhis-2/dhis-tracker/src/main/java/org/hisp/dhis/tracker/imports/domain/TrackerEvent.java
+++ b/dhis-2/dhis-tracker/src/main/java/org/hisp/dhis/tracker/imports/domain/TrackerEvent.java
@@ -65,8 +65,6 @@ public class TrackerEvent implements Event {
@JsonProperty private Instant scheduledAt;
- @JsonProperty private String storedBy;
-
@JsonProperty private Instant createdAtClient;
@JsonProperty private Instant updatedAtClient;
diff --git a/dhis-2/dhis-tracker/src/main/java/org/hisp/dhis/tracker/imports/sms/SmsImportMapper.java b/dhis-2/dhis-tracker/src/main/java/org/hisp/dhis/tracker/imports/sms/SmsImportMapper.java
index 5d33389fbb72..e959e2f8fa1c 100644
--- a/dhis-2/dhis-tracker/src/main/java/org/hisp/dhis/tracker/imports/sms/SmsImportMapper.java
+++ b/dhis-2/dhis-tracker/src/main/java/org/hisp/dhis/tracker/imports/sms/SmsImportMapper.java
@@ -289,7 +289,6 @@ private static TrackerEvent mapToTrackerEvent(
.orgUnit(metadataUid(submission.getOrgUnit()))
.programStage(metadataUid(submission.getProgramStage()))
.attributeOptionCombo(metadataUid(submission.getAttributeOptionCombo()))
- .storedBy(username)
.occurredAt(toInstant(submission.getEventDate()))
.scheduledAt(toInstant(submission.getDueDate()))
.status(map(submission.getEventStatus()))
@@ -313,7 +312,6 @@ private static TrackerEvent mapTrackerEvent(
.orgUnit(metadataUid(submission.getOrgUnit()))
.programStage(metadataUid(submission.getProgramStage()))
.attributeOptionCombo(metadataUid(submission.getAttributeOptionCombo()))
- .storedBy(username)
.occurredAt(toInstant(submission.getEventDate()))
.scheduledAt(toInstant(submission.getDueDate()))
.status(map(submission.getEventStatus()))
@@ -336,7 +334,6 @@ private static TrackerEvent mapTrackerEvent(
.orgUnit(metadataUid(submission.getOrgUnit()))
.program(metadataUid(submission.getEventProgram()))
.attributeOptionCombo(metadataUid(submission.getAttributeOptionCombo()))
- .storedBy(username)
.occurredAt(toInstant(submission.getEventDate()))
.scheduledAt(toInstant(submission.getDueDate()))
.status(map(submission.getEventStatus()))
@@ -522,7 +519,6 @@ private static EventStatus map(SmsEventStatus status) {
.scheduledAt(sms.getSentDate().toInstant())
.attributeOptionCombo(
metadataUid(dataElementCategoryService.getDefaultCategoryOptionCombo()))
- .storedBy(username)
.dataValues(map(smsCommand.getCodes(), dataValues, username))
.build();
}
diff --git a/dhis-2/dhis-tracker/src/main/java/org/hisp/dhis/tracker/model/Enrollment.java b/dhis-2/dhis-tracker/src/main/java/org/hisp/dhis/tracker/model/Enrollment.java
index 8dfff80c9733..b388d239476b 100644
--- a/dhis-2/dhis-tracker/src/main/java/org/hisp/dhis/tracker/model/Enrollment.java
+++ b/dhis-2/dhis-tracker/src/main/java/org/hisp/dhis/tracker/model/Enrollment.java
@@ -285,7 +285,6 @@ public String toString() {
.add("trackedEntity", trackedEntity)
.add("program", program)
.add("deleted", deleted)
- .add("storedBy", storedBy)
.toString();
}
diff --git a/dhis-2/dhis-tracker/src/main/java/org/hisp/dhis/tracker/model/SingleEvent.java b/dhis-2/dhis-tracker/src/main/java/org/hisp/dhis/tracker/model/SingleEvent.java
index aba7bea0f9fa..260bfc220c09 100644
--- a/dhis-2/dhis-tracker/src/main/java/org/hisp/dhis/tracker/model/SingleEvent.java
+++ b/dhis-2/dhis-tracker/src/main/java/org/hisp/dhis/tracker/model/SingleEvent.java
@@ -62,8 +62,6 @@ public class SingleEvent extends SoftDeletableObject {
@AuditAttribute private ProgramStage programStage;
- private String storedBy;
-
private UserInfoSnapshot createdByUserInfo;
private UserInfoSnapshot lastUpdatedByUserInfo;
diff --git a/dhis-2/dhis-tracker/src/main/java/org/hisp/dhis/tracker/model/TrackerEvent.java b/dhis-2/dhis-tracker/src/main/java/org/hisp/dhis/tracker/model/TrackerEvent.java
index ab92d06e9636..a95235676fe4 100644
--- a/dhis-2/dhis-tracker/src/main/java/org/hisp/dhis/tracker/model/TrackerEvent.java
+++ b/dhis-2/dhis-tracker/src/main/java/org/hisp/dhis/tracker/model/TrackerEvent.java
@@ -64,8 +64,6 @@ public class TrackerEvent extends SoftDeletableObject {
@AuditAttribute private ProgramStage programStage;
- private String storedBy;
-
private UserInfoSnapshot createdByUserInfo;
private UserInfoSnapshot lastUpdatedByUserInfo;
diff --git a/dhis-2/dhis-tracker/src/test/java/org/hisp/dhis/tracker/imports/bundle/TrackerObjectsMapperTest.java b/dhis-2/dhis-tracker/src/test/java/org/hisp/dhis/tracker/imports/bundle/TrackerObjectsMapperTest.java
index 32c41e51cb60..2293a249d4bc 100644
--- a/dhis-2/dhis-tracker/src/test/java/org/hisp/dhis/tracker/imports/bundle/TrackerObjectsMapperTest.java
+++ b/dhis-2/dhis-tracker/src/test/java/org/hisp/dhis/tracker/imports/bundle/TrackerObjectsMapperTest.java
@@ -166,7 +166,6 @@ void shouldMapTrackedEntityWhenItIsACreation() {
.trackedEntityType(MetadataIdentifier.ofUid(trackerEntityType))
.createdAtClient(NOW.toInstant())
.updatedAtClient(NOW.toInstant())
- .storedBy(creatingUser.getUsername())
.inactive(true)
.build();
@@ -185,7 +184,6 @@ void shouldMapTrackedEntityWhenItIsAnUpdate() {
.trackedEntityType(MetadataIdentifier.ofUid(trackerEntityType))
.createdAtClient(NOW.toInstant())
.updatedAtClient(NOW.toInstant())
- .storedBy(creatingUser.getUsername())
.inactive(true)
.build();
@@ -208,7 +206,6 @@ void shouldMapEnrollmentWhenItIsACreation() {
.enrolledAt(NOW.toInstant())
.occurredAt(YESTERDAY.toInstant())
.status(ACTIVE)
- .storedBy(creatingUser.getUsername())
.notes(notes())
.attributeOptionCombo(MetadataIdentifier.EMPTY_UID)
.build();
@@ -234,7 +231,6 @@ void shouldMapEnrollmentWhenItIsACreationAndOccurredDateIsNull() {
.updatedAtClient(NOW.toInstant())
.enrolledAt(NOW.toInstant())
.status(ACTIVE)
- .storedBy(creatingUser.getUsername())
.notes(notes())
.attributeOptionCombo(MetadataIdentifier.EMPTY_UID)
.build();
@@ -262,7 +258,6 @@ void shouldMapEnrollmentWhenItIsAnUpdateAndEnrollmentGetCompleted() {
.updatedAtClient(NOW.toInstant())
.enrolledAt(NOW.toInstant())
.status(EnrollmentStatus.COMPLETED)
- .storedBy(creatingUser.getUsername())
.notes(notes())
.attributeOptionCombo(MetadataIdentifier.EMPTY_UID)
.build();
@@ -290,7 +285,6 @@ void shouldMapEnrollmentWhenItIsAnUpdateAndEnrollmentGetCancelled() {
.updatedAtClient(NOW.toInstant())
.enrolledAt(NOW.toInstant())
.status(EnrollmentStatus.CANCELLED)
- .storedBy(creatingUser.getUsername())
.notes(notes())
.attributeOptionCombo(MetadataIdentifier.EMPTY_UID)
.build();
@@ -318,7 +312,6 @@ void shouldMapEnrollmentWhenItIsAnUpdateAndEnrollmentGetUncompleted() {
.updatedAtClient(NOW.toInstant())
.enrolledAt(NOW.toInstant())
.status(ACTIVE)
- .storedBy(creatingUser.getUsername())
.notes(notes())
.attributeOptionCombo(MetadataIdentifier.EMPTY_UID)
.build();
@@ -344,7 +337,6 @@ void shouldMapEventWhenItIsACreation() {
.program(MetadataIdentifier.ofUid(PROGRAM_UID))
.orgUnit(MetadataIdentifier.ofUid(ORGANISATION_UNIT_UID))
.attributeOptionCombo(MetadataIdentifier.EMPTY_UID)
- .storedBy(creatingUser.getUsername())
.build();
TrackerEvent result = TrackerObjectsMapper.map(preheat, event, creatingUser);
@@ -536,7 +528,6 @@ private void assertMappedTrackedEntity(
DateUtils.fromInstant(trackedEntity.getCreatedAtClient()), actual.getCreatedAtClient());
assertEquals(
DateUtils.fromInstant(trackedEntity.getUpdatedAtClient()), actual.getLastUpdatedAtClient());
- assertEquals(createdBy.getUsername(), actual.getStoredBy());
assertEquals(trackedEntity.isPotentialDuplicate(), actual.isPotentialDuplicate());
assertEquals(trackedEntity.isInactive(), actual.isInactive());
assertEquals(trackedEntity.getGeometry(), actual.getGeometry());
@@ -558,7 +549,6 @@ private void assertMappedEnrollment(
assertEquals(
DateUtils.fromInstant(enrollment.getUpdatedAtClient()), actual.getLastUpdatedAtClient());
assertEquals(DateUtils.fromInstant(enrollment.getEnrolledAt()), actual.getEnrollmentDate());
- assertEquals(createdBy.getUsername(), actual.getStoredBy());
assertEquals(enrollment.getStatus(), actual.getStatus());
assertEquals(enrollment.getGeometry(), actual.getGeometry());
assertEquals(enrollment.isFollowUp(), actual.getFollowup());
@@ -581,7 +571,6 @@ private void assertMappedEvent(
DateUtils.fromInstant(event.getUpdatedAtClient()), actual.getLastUpdatedAtClient());
assertEquals(DateUtils.fromInstant(event.getScheduledAt()), actual.getScheduledDate());
assertEquals(DateUtils.fromInstant(event.getOccurredAt()), actual.getOccurredDate());
- assertEquals(createdBy.getUsername(), actual.getStoredBy());
assertEquals(event.getStatus(), actual.getStatus());
assertEquals(event.getGeometry(), actual.getGeometry());
assertNotes(event.getNotes(), actual.getNotes(), updatedBy);
@@ -646,7 +635,6 @@ private TrackedEntity trackedEntity() {
dbTrackedEntity.setCreatedByUserInfo(UserInfoSnapshot.from(creatingUser));
dbTrackedEntity.setLastUpdatedByUserInfo(UserInfoSnapshot.from(updatingUser));
- dbTrackedEntity.setStoredBy(creatingUser.getUsername());
dbTrackedEntity.setLastUpdated(NOW);
dbTrackedEntity.setDeleted(false);
dbTrackedEntity.setPotentialDuplicate(false);
@@ -672,7 +660,6 @@ private Enrollment enrollment(EnrollmentStatus status) {
dbEnrollment.setEnrollmentDate(NOW);
dbEnrollment.setOccurredDate(YESTERDAY);
dbEnrollment.setStatus(status);
- dbEnrollment.setStoredBy(creatingUser.getUsername());
return dbEnrollment;
}
@@ -690,10 +677,8 @@ private TrackerEvent event(EventStatus status) {
dbEvent.setScheduledDate(NOW);
dbEvent.setOccurredDate(YESTERDAY);
dbEvent.setStatus(status);
- dbEvent.setStoredBy(creatingUser.getUsername());
dbEvent.setAttributeOptionCombo(defaultCategoryOptionCombo);
dbEvent.setOccurredDate(today);
- dbEvent.setStoredBy(creatingUser.getUsername());
return dbEvent;
}
diff --git a/dhis-2/dhis-tracker/src/test/java/org/hisp/dhis/tracker/imports/sms/SmsImportMapperTest.java b/dhis-2/dhis-tracker/src/test/java/org/hisp/dhis/tracker/imports/sms/SmsImportMapperTest.java
index cc55917e2dbb..aac8b5ff71c5 100644
--- a/dhis-2/dhis-tracker/src/test/java/org/hisp/dhis/tracker/imports/sms/SmsImportMapperTest.java
+++ b/dhis-2/dhis-tracker/src/test/java/org/hisp/dhis/tracker/imports/sms/SmsImportMapperTest.java
@@ -224,7 +224,6 @@ void mapEnrollmentWithEvents() {
.attributeOptionCombo(
MetadataIdentifier.ofUid(smsEvent.getAttributeOptionCombo().getUid()))
.status(EventStatus.SCHEDULE)
- .storedBy("francis")
.dataValues(
Set.of(
DataValue.builder()
@@ -362,7 +361,6 @@ void mapTrackerEventWithMandatoryFields() {
.attributeOptionCombo(
MetadataIdentifier.ofUid(input.getAttributeOptionCombo().getUid()))
.status(EventStatus.COMPLETED)
- .storedBy("francis")
.build();
assertContainsOnly(List.of(expected), actual.getEvents());
}
@@ -396,7 +394,6 @@ void mapTrackerEventWithOptionalFields() {
.attributeOptionCombo(
MetadataIdentifier.ofUid(input.getAttributeOptionCombo().getUid()))
.status(EventStatus.ACTIVE)
- .storedBy("francis")
.occurredAt(occurredDate.toInstant())
.scheduledAt(scheduledDate.toInstant())
.geometry(new GeometryFactory().createPoint(new Coordinate(2.3514f, 48.8575f)))
diff --git a/dhis-2/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/tracker/export/event/CsvEventDataValue.java b/dhis-2/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/tracker/export/event/CsvEventDataValue.java
index 8a15b424b990..ad7c8c142a4b 100644
--- a/dhis-2/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/tracker/export/event/CsvEventDataValue.java
+++ b/dhis-2/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/tracker/export/event/CsvEventDataValue.java
@@ -63,7 +63,6 @@
"assignedUser",
"dataElement",
"value",
- "storedBy",
"providedElsewhere",
"storedByDataValue",
"createAtDataValue",
@@ -120,8 +119,6 @@ class CsvEventDataValue {
private String value;
- private String storedBy;
-
private Boolean providedElsewhere;
private String createdAtDataValue;
@@ -157,7 +154,6 @@ public CsvEventDataValue(CsvEventDataValue dataValue) {
longitude = dataValue.getLongitude();
dataElement = dataValue.getDataElement();
value = dataValue.getValue();
- storedBy = dataValue.getStoredBy();
providedElsewhere = dataValue.getProvidedElsewhere();
createdAtDataValue = dataValue.getCreatedAtDataValue();
updatedAtDataValue = dataValue.getUpdatedAtDataValue();
@@ -372,15 +368,6 @@ public void setProvidedElsewhere(Boolean providedElsewhere) {
this.providedElsewhere = providedElsewhere;
}
- @JsonProperty
- public String getStoredBy() {
- return storedBy;
- }
-
- public void setStoredBy(String storedBy) {
- this.storedBy = storedBy;
- }
-
@JsonProperty
public String getCompletedAt() {
return this.completedAt;
diff --git a/dhis-2/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/tracker/export/event/CsvEventService.java b/dhis-2/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/tracker/export/event/CsvEventService.java
index cf1ef904051e..a2bdccbdc701 100644
--- a/dhis-2/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/tracker/export/event/CsvEventService.java
+++ b/dhis-2/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/tracker/export/event/CsvEventService.java
@@ -133,7 +133,6 @@ private static CsvEventDataValue map(Event event) {
result.setUpdatedAtClient(
event.getUpdatedAtClient() == null ? null : event.getUpdatedAtClient().toString());
result.setUpdatedBy(event.getUpdatedBy() == null ? null : event.getUpdatedBy().getUsername());
- result.setStoredBy(event.getStoredBy());
result.setCompletedAt(
event.getCompletedAt() == null ? null : event.getCompletedAt().toString());
result.setCompletedBy(event.getCompletedBy());
@@ -163,10 +162,6 @@ private static CsvEventDataValue map(DataValue value, CsvEventDataValue base) {
result.setUpdatedAtDataValue(
value.getUpdatedAt() == null ? null : value.getUpdatedAt().toString());
- if (value.getStoredBy() != null) {
- result.setStoredBy(value.getStoredBy());
- }
-
return result;
}
@@ -237,7 +232,6 @@ private static Event map(CsvEventDataValue dataValue) throws ParseException {
event.setScheduledAt(DateUtils.instantFromDateAsString(dataValue.getScheduledAt()));
event.setCompletedAt(DateUtils.instantFromDateAsString(dataValue.getCompletedAt()));
event.setCompletedBy(dataValue.getCompletedBy());
- event.setStoredBy(dataValue.getStoredBy());
event.setAttributeOptionCombo(dataValue.getAttributeOptionCombo());
event.setAttributeCategoryOptions(dataValue.getAttributeCategoryOptions());
event.setAssignedUser(User.builder().username(dataValue.getAssignedUser()).build());
diff --git a/dhis-2/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/tracker/export/event/EventMapper.java b/dhis-2/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/tracker/export/event/EventMapper.java
index 9bf321834ce4..ebf30653f382 100644
--- a/dhis-2/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/tracker/export/event/EventMapper.java
+++ b/dhis-2/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/tracker/export/event/EventMapper.java
@@ -82,7 +82,6 @@ public interface EventMapper {
entry("programStage", "programStage.uid"),
entry("scheduledAt", "scheduledDate"),
entry("status", "status"),
- entry("storedBy", "storedBy"),
entry("trackedEntity", "enrollment.trackedEntity.uid"),
entry("updatedAt", "lastUpdated"),
entry("updatedAtClient", "lastUpdatedAtClient"),
diff --git a/dhis-2/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/tracker/export/singleevent/SingleEventCsvRow.java b/dhis-2/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/tracker/export/singleevent/SingleEventCsvRow.java
index 4f3cb6ded1fa..a3386236059a 100644
--- a/dhis-2/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/tracker/export/singleevent/SingleEventCsvRow.java
+++ b/dhis-2/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/tracker/export/singleevent/SingleEventCsvRow.java
@@ -60,7 +60,6 @@
"assignedUser",
"dataElement",
"value",
- "storedBy",
"providedElsewhere",
"storedByDataValue",
"createdAtDataValue",
@@ -111,8 +110,6 @@ class SingleEventCsvRow {
private String value;
- private String storedBy;
-
private Boolean providedElsewhere;
private String createdAtDataValue;
@@ -144,7 +141,6 @@ public SingleEventCsvRow(SingleEventCsvRow dataValue) {
longitude = dataValue.getLongitude();
dataElement = dataValue.getDataElement();
value = dataValue.getValue();
- storedBy = dataValue.getStoredBy();
providedElsewhere = dataValue.getProvidedElsewhere();
createdAtDataValue = dataValue.getCreatedAtDataValue();
updatedAtDataValue = dataValue.getUpdatedAtDataValue();
diff --git a/dhis-2/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/tracker/export/singleevent/SingleEventCsvWriter.java b/dhis-2/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/tracker/export/singleevent/SingleEventCsvWriter.java
index 1a9c985e8977..80c6c4c687df 100644
--- a/dhis-2/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/tracker/export/singleevent/SingleEventCsvWriter.java
+++ b/dhis-2/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/tracker/export/singleevent/SingleEventCsvWriter.java
@@ -110,7 +110,6 @@ private static SingleEventCsvRow map(SingleEvent event) {
result.setUpdatedAtClient(
event.getUpdatedAtClient() == null ? null : event.getUpdatedAtClient().toString());
result.setUpdatedBy(event.getUpdatedBy() == null ? null : event.getUpdatedBy().getUsername());
- result.setStoredBy(event.getStoredBy());
result.setCompletedAt(
event.getCompletedAt() == null ? null : event.getCompletedAt().toString());
result.setCompletedBy(event.getCompletedBy());
@@ -139,10 +138,6 @@ private static SingleEventCsvRow map(DataValue value, SingleEventCsvRow base) {
result.setUpdatedAtDataValue(
value.getUpdatedAt() == null ? null : value.getUpdatedAt().toString());
- if (value.getStoredBy() != null) {
- result.setStoredBy(value.getStoredBy());
- }
-
return result;
}
}
diff --git a/dhis-2/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/tracker/export/trackedentity/CsvTrackedEntity.java b/dhis-2/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/tracker/export/trackedentity/CsvTrackedEntity.java
index 880d74451c74..2e3ffb7011bf 100644
--- a/dhis-2/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/tracker/export/trackedentity/CsvTrackedEntity.java
+++ b/dhis-2/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/tracker/export/trackedentity/CsvTrackedEntity.java
@@ -48,7 +48,6 @@
"geometry",
"latitude",
"longitude",
- "storedBy",
"createdBy",
"updatedBy"
})
@@ -94,8 +93,6 @@ class CsvTrackedEntity {
private Double latitude;
- private String storedBy;
-
private String createdBy;
private String updatedBy;
@@ -114,7 +111,6 @@ public CsvTrackedEntity(CsvTrackedEntity entity) {
this.geometry = entity.getGeometry();
this.longitude = entity.getLongitude();
this.latitude = entity.getLatitude();
- this.storedBy = entity.getStoredBy();
this.createdBy = entity.getCreatedBy();
this.updatedBy = entity.getUpdatedBy();
}
diff --git a/dhis-2/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/tracker/export/trackedentity/CsvTrackedEntityService.java b/dhis-2/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/tracker/export/trackedentity/CsvTrackedEntityService.java
index 60789531daae..b60dbb3b79f1 100644
--- a/dhis-2/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/tracker/export/trackedentity/CsvTrackedEntityService.java
+++ b/dhis-2/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/tracker/export/trackedentity/CsvTrackedEntityService.java
@@ -101,7 +101,6 @@ private List getCsvTrackedEntities(List tracked
trackedEntityValue.setInactive(trackedEntity.isInactive());
trackedEntityValue.setDeleted(trackedEntity.isDeleted());
trackedEntityValue.setPotentialDuplicate(trackedEntity.isPotentialDuplicate());
- trackedEntityValue.setStoredBy(trackedEntity.getStoredBy());
trackedEntityValue.setCreatedBy(
trackedEntity.getCreatedBy() == null ? null : trackedEntity.getCreatedBy().getUsername());
trackedEntityValue.setUpdatedBy(
diff --git a/dhis-2/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/tracker/export/trackedentity/TrackedEntitiesExportController.java b/dhis-2/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/tracker/export/trackedentity/TrackedEntitiesExportController.java
index 84c0c069782b..8f077c1b3ea9 100644
--- a/dhis-2/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/tracker/export/trackedentity/TrackedEntitiesExportController.java
+++ b/dhis-2/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/tracker/export/trackedentity/TrackedEntitiesExportController.java
@@ -107,7 +107,7 @@ class TrackedEntitiesExportController {
*/
private static final Fields CSV_FIELDS =
FieldsParser.parse(
- "trackedEntity,trackedEntityType,createdAt,createdAtClient,updatedAt,updatedAtClient,orgUnit,inactive,deleted,potentialDuplicate,geometry,storedBy,createdBy,updatedBy,attributes");
+ "trackedEntity,trackedEntityType,createdAt,createdAtClient,updatedAt,updatedAtClient,orgUnit,inactive,deleted,potentialDuplicate,geometry,createdBy,updatedBy,attributes");
private static final TrackedEntityMapper TRACKED_ENTITY_MAPPER =
Mappers.getMapper(TrackedEntityMapper.class);
diff --git a/dhis-2/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/tracker/export/trackerevent/TrackerEventCsvRow.java b/dhis-2/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/tracker/export/trackerevent/TrackerEventCsvRow.java
index 0a87c6ed1c18..d41e1f48262b 100644
--- a/dhis-2/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/tracker/export/trackerevent/TrackerEventCsvRow.java
+++ b/dhis-2/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/tracker/export/trackerevent/TrackerEventCsvRow.java
@@ -64,7 +64,6 @@
"assignedUser",
"dataElement",
"value",
- "storedBy",
"providedElsewhere",
"storedByDataValue",
"createdAtDataValue",
@@ -123,8 +122,6 @@ class TrackerEventCsvRow {
private String value;
- private String storedBy;
-
private Boolean providedElsewhere;
private String createdAtDataValue;
@@ -160,7 +157,6 @@ public TrackerEventCsvRow(TrackerEventCsvRow dataValue) {
longitude = dataValue.getLongitude();
dataElement = dataValue.getDataElement();
value = dataValue.getValue();
- storedBy = dataValue.getStoredBy();
providedElsewhere = dataValue.getProvidedElsewhere();
createdAtDataValue = dataValue.getCreatedAtDataValue();
updatedAtDataValue = dataValue.getUpdatedAtDataValue();
diff --git a/dhis-2/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/tracker/export/trackerevent/TrackerEventCsvWriter.java b/dhis-2/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/tracker/export/trackerevent/TrackerEventCsvWriter.java
index 8d24359eef94..118fa511e2e3 100644
--- a/dhis-2/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/tracker/export/trackerevent/TrackerEventCsvWriter.java
+++ b/dhis-2/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/tracker/export/trackerevent/TrackerEventCsvWriter.java
@@ -115,7 +115,6 @@ private static TrackerEventCsvRow map(TrackerEvent event) {
result.setUpdatedAtClient(
event.getUpdatedAtClient() == null ? null : event.getUpdatedAtClient().toString());
result.setUpdatedBy(event.getUpdatedBy() == null ? null : event.getUpdatedBy().getUsername());
- result.setStoredBy(event.getStoredBy());
result.setCompletedAt(
event.getCompletedAt() == null ? null : event.getCompletedAt().toString());
result.setCompletedBy(event.getCompletedBy());
@@ -144,10 +143,6 @@ private static TrackerEventCsvRow map(DataValue value, TrackerEventCsvRow base)
result.setUpdatedAtDataValue(
value.getUpdatedAt() == null ? null : value.getUpdatedAt().toString());
- if (value.getStoredBy() != null) {
- result.setStoredBy(value.getStoredBy());
- }
-
return result;
}
}
diff --git a/dhis-2/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/tracker/view/Enrollment.java b/dhis-2/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/tracker/view/Enrollment.java
index f66502eee648..543697908e3f 100644
--- a/dhis-2/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/tracker/view/Enrollment.java
+++ b/dhis-2/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/tracker/view/Enrollment.java
@@ -87,8 +87,6 @@ public class Enrollment {
@JsonProperty private boolean deleted;
- @JsonProperty private String storedBy;
-
@JsonProperty private User createdBy;
@JsonProperty private User updatedBy;
diff --git a/dhis-2/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/tracker/view/Event.java b/dhis-2/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/tracker/view/Event.java
index 955333745ac3..5768e7999ae1 100644
--- a/dhis-2/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/tracker/view/Event.java
+++ b/dhis-2/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/tracker/view/Event.java
@@ -87,10 +87,6 @@ public class Event {
@JsonProperty private Instant scheduledAt;
- @JsonProperty
- @OpenApi.Property({UID.class, org.hisp.dhis.user.User.class})
- private String storedBy;
-
@JsonProperty private boolean followUp;
@JsonProperty private boolean deleted;
diff --git a/dhis-2/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/tracker/view/SingleEvent.java b/dhis-2/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/tracker/view/SingleEvent.java
index 6543dd64451e..8bea9013ae29 100644
--- a/dhis-2/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/tracker/view/SingleEvent.java
+++ b/dhis-2/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/tracker/view/SingleEvent.java
@@ -68,10 +68,6 @@ public class SingleEvent {
@JsonProperty private Instant occurredAt;
- @JsonProperty
- @OpenApi.Property({UID.class, org.hisp.dhis.user.User.class})
- private String storedBy;
-
@JsonProperty private boolean deleted;
@JsonProperty private Instant createdAt;
diff --git a/dhis-2/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/tracker/view/TrackedEntity.java b/dhis-2/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/tracker/view/TrackedEntity.java
index 23f13ebc71ee..47168f1c5eff 100644
--- a/dhis-2/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/tracker/view/TrackedEntity.java
+++ b/dhis-2/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/tracker/view/TrackedEntity.java
@@ -75,8 +75,6 @@ public class TrackedEntity {
@JsonProperty private Geometry geometry;
- @JsonProperty private String storedBy;
-
@JsonProperty private User createdBy;
@JsonProperty private User updatedBy;
diff --git a/dhis-2/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/tracker/view/TrackerEvent.java b/dhis-2/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/tracker/view/TrackerEvent.java
index 79a854ce3c6f..aca0ffbcc598 100644
--- a/dhis-2/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/tracker/view/TrackerEvent.java
+++ b/dhis-2/dhis-web-api/src/main/java/org/hisp/dhis/webapi/controller/tracker/view/TrackerEvent.java
@@ -82,10 +82,6 @@ public class TrackerEvent {
@JsonProperty private Instant scheduledAt;
- @JsonProperty
- @OpenApi.Property({UID.class, org.hisp.dhis.user.User.class})
- private String storedBy;
-
@JsonProperty private boolean followUp;
@JsonProperty private boolean deleted;
diff --git a/dhis-2/dhis-web-api/src/test/java/org/hisp/dhis/webapi/controller/tracker/export/event/CsvEventServiceTest.java b/dhis-2/dhis-web-api/src/test/java/org/hisp/dhis/webapi/controller/tracker/export/event/CsvEventServiceTest.java
index acaaca1b7387..682ab177c121 100644
--- a/dhis-2/dhis-web-api/src/test/java/org/hisp/dhis/webapi/controller/tracker/export/event/CsvEventServiceTest.java
+++ b/dhis-2/dhis-web-api/src/test/java/org/hisp/dhis/webapi/controller/tracker/export/event/CsvEventServiceTest.java
@@ -85,7 +85,7 @@ void writeEventsHandlesEventsWithNullEventFields() throws IOException {
service.write(out, Collections.singletonList(new Event()), false);
- assertEquals(",ACTIVE,,,,,,,,,,false,false,,,,,,,,,,,,,,,,,\n", out.toString());
+ assertEquals(",ACTIVE,,,,,,,,,,false,false,,,,,,,,,,,,,,,,\n", out.toString());
}
@Test
@@ -102,7 +102,7 @@ void writeEventsWithoutDataValues() throws IOException {
service.write(out, Collections.singletonList(event), false);
- assertEquals("BuA2R2Gr4vt,ACTIVE,,,,,,,,,,true,false,,,,,,,,,,,,,,,,,\n", out.toString());
+ assertEquals("BuA2R2Gr4vt,ACTIVE,,,,,,,,,,true,false,,,,,,,,,,,,,,,,\n", out.toString());
}
@Test
@@ -125,8 +125,8 @@ void writeEventsWithDataValuesIntoASingleRow() throws IOException {
service.write(out, Collections.singletonList(event), false);
- assertInCSV(out, "BuA2R2Gr4vt,ACTIVE,,,,,,,,,,true,false,,,,,,,,,,,color,yellow,,true,,,\n");
- assertInCSV(out, "BuA2R2Gr4vt,ACTIVE,,,,,,,,,,true,false,,,,,,,,,,,color,purple,,true,,,\n");
+ assertInCSV(out, "BuA2R2Gr4vt,ACTIVE,,,,,,,,,,true,false,,,,,,,,,,,color,yellow,true,,,\n");
+ assertInCSV(out, "BuA2R2Gr4vt,ACTIVE,,,,,,,,,,true,false,,,,,,,,,,,color,purple,true,,,\n");
}
private void assertInCSV(ByteArrayOutputStream out, String expectedLine) {
@@ -176,7 +176,6 @@ void testReadEventsFromFileWithHeader() throws IOException, ParseException {
assertNull(events.get(0).getScheduledAt());
assertNull(events.get(0).getCompletedAt());
assertNull(events.get(0).getCompletedBy());
- assertNull(events.get(0).getStoredBy());
assertNull(events.get(0).getAttributeCategoryOptions());
assertEquals(new User(), events.get(0).getAssignedUser());
assertTrue(events.get(0).getDataValues().isEmpty());
@@ -207,7 +206,6 @@ void testReadEventsFromFileWithoutHeader() throws IOException, ParseException {
assertEquals("2020-02-26T23:06:00Z", events.get(0).getUpdatedAtClient().toString());
assertEquals("2020-02-26T23:07:00Z", events.get(0).getCompletedAt().toString());
assertEquals("admin", events.get(0).getCompletedBy());
- assertEquals("admin", events.get(0).getStoredBy());
assertEquals("attributeOptionCombo", events.get(0).getAttributeOptionCombo());
assertEquals("attributeCategoryOptions", events.get(0).getAttributeCategoryOptions());
assertEquals("assignedUser", events.get(0).getAssignedUser().getUsername());
@@ -277,7 +275,7 @@ void zipFileAndMatchCsvEventDataValuesWhenCreateZipFileFromEventList()
assertEquals(
"""
-FRM97UKN8te,COMPLETED,programId,programStageId,PSeMWi7rBgb,orgUnitId,2020-02-26T23:01:00Z,2020-02-26T23:02:00Z,,,,false,false,2020-02-26T23:03:00Z,,2020-02-26T23:05:00Z,,admin,2020-02-26T23:07:00Z,,attributeOptionCombo,attributeCategoryOptions,,dataElement,value,admin,false,,2020-02-26T23:08:00Z,2020-02-26T23:09:00Z
+FRM97UKN8te,COMPLETED,programId,programStageId,PSeMWi7rBgb,orgUnitId,2020-02-26T23:01:00Z,2020-02-26T23:02:00Z,,,,false,false,2020-02-26T23:03:00Z,,2020-02-26T23:05:00Z,,admin,2020-02-26T23:07:00Z,,attributeOptionCombo,attributeCategoryOptions,,dataElement,value,false,,2020-02-26T23:08:00Z,2020-02-26T23:09:00Z
""",
csvStream.toString(),
"The event does not match or not exists in the Zip File.");
@@ -307,7 +305,7 @@ void gzipFileAndMatchCsvEventDataValuesWhenCreateGZipFileFromEventList()
assertEquals(
"""
-FRM97UKN8te,COMPLETED,programId,programStageId,PSeMWi7rBgb,orgUnitId,2020-02-26T23:01:00Z,2020-02-26T23:02:00Z,,,,false,false,2020-02-26T23:03:00Z,,2020-02-26T23:05:00Z,,admin,2020-02-26T23:07:00Z,,attributeOptionCombo,attributeCategoryOptions,,dataElement,value,admin,false,,2020-02-26T23:08:00Z,2020-02-26T23:09:00Z
+FRM97UKN8te,COMPLETED,programId,programStageId,PSeMWi7rBgb,orgUnitId,2020-02-26T23:01:00Z,2020-02-26T23:02:00Z,,,,false,false,2020-02-26T23:03:00Z,,2020-02-26T23:05:00Z,,admin,2020-02-26T23:07:00Z,,attributeOptionCombo,attributeCategoryOptions,,dataElement,value,false,,2020-02-26T23:08:00Z,2020-02-26T23:09:00Z
""",
csvStream.toString(),
"The event does not match or not exists in the GZip File.");
diff --git a/dhis-2/dhis-web-api/src/test/java/org/hisp/dhis/webapi/controller/tracker/export/trackedentity/CsvTrackedEntityServiceTest.java b/dhis-2/dhis-web-api/src/test/java/org/hisp/dhis/webapi/controller/tracker/export/trackedentity/CsvTrackedEntityServiceTest.java
index 036daada22cf..4f84ac384358 100644
--- a/dhis-2/dhis-web-api/src/test/java/org/hisp/dhis/webapi/controller/tracker/export/trackedentity/CsvTrackedEntityServiceTest.java
+++ b/dhis-2/dhis-web-api/src/test/java/org/hisp/dhis/webapi/controller/tracker/export/trackedentity/CsvTrackedEntityServiceTest.java
@@ -73,7 +73,7 @@ void singlePointCoordinatesEntityIsWritten() throws IOException {
assertEquals(
"h4w96yEMlzO,,"
+ instant.toString()
- + ",,,,\"Test org unit\",false,false,false,\"POINT (40 5)\",5.0,40.0,,,,,,,,,\n",
+ + ",,,,\"Test org unit\",false,false,false,\"POINT (40 5)\",5.0,40.0,,,,,,,,\n",
out.toString());
}
@@ -92,7 +92,7 @@ void singleLineCoordinatesEntityIsWritten() throws IOException {
assertEquals(
"h4w96yEMlzO,,"
+ instant.toString()
- + ",,,,\"Test org unit\",false,false,false,\"LINESTRING (40 5, 41 6)\",,,,,,,,,,,\n",
+ + ",,,,\"Test org unit\",false,false,false,\"LINESTRING (40 5, 41 6)\",,,,,,,,,,\n",
out.toString());
}
@@ -112,13 +112,13 @@ void multipleTrackedEntitiesAreWritten() throws IOException {
assertEquals(
"h4w96yEMlzO,,"
+ instant.toString()
- + ",,,,\"Test org unit\",false,false,false,,,,,,,,,,,,\n"
+ + ",,,,\"Test org unit\",false,false,false,,,,,,,,,,,\n"
+ "h4w96yEMlzO,,"
+ instant
- + ",,,,\"Test org unit\",false,false,false,\"POINT (40 5)\",5.0,40.0,,,,,,,,,\n"
+ + ",,,,\"Test org unit\",false,false,false,\"POINT (40 5)\",5.0,40.0,,,,,,,,\n"
+ "h4w96yEMlzO,,"
+ instant
- + ",,,,\"Test org unit\",false,false,false,,,,,,,,,,,,\n",
+ + ",,,,\"Test org unit\",false,false,false,,,,,,,,,,,\n",
out.toString());
}
@@ -142,16 +142,16 @@ void multipleTrackedEntitiesWithAttributesAreWritten() throws IOException {
assertEquals(
"h4w96yEMlzO,,"
+ instant.toString()
- + ",,,,\"Test org unit\",false,false,false,,,,,,,,,,,,\n"
+ + ",,,,\"Test org unit\",false,false,false,,,,,,,,,,,\n"
+ "h4w96yEMlzO,,"
+ instant
- + ",,,,\"Test org unit\",false,false,false,\"POINT (40 5)\",5.0,40.0,,,,,,,,,\n"
+ + ",,,,\"Test org unit\",false,false,false,\"POINT (40 5)\",5.0,40.0,,,,,,,,\n"
+ "h4w96yEMlzO,,"
+ instant
- + ",,,,\"Test org unit\",false,false,false,,,,,,,,,\"attribute 1\",,\"Age test\",AGE\n"
+ + ",,,,\"Test org unit\",false,false,false,,,,,,,,\"attribute 1\",,\"Age test\",AGE\n"
+ "h4w96yEMlzO,,"
+ instant
- + ",,,,\"Test org unit\",false,false,false,,,,,,,,,\"attribute 2\",,\"Text test\",TEXT\n",
+ + ",,,,\"Test org unit\",false,false,false,,,,,,,,\"attribute 2\",,\"Text test\",TEXT\n",
out.toString());
}
@@ -182,8 +182,8 @@ void zipFileAndMatchCsvTeWhenCreateZipFileFromTrackedEntityList() throws IOExcep
assertEquals(
"""
-h4w96yEMlzO,,2022-09-29T15:15:30Z,,,,"Test org unit",false,false,false,"POINT (40 5)",5.0,40.0,,,,,,"attribute 1",,"Age test",AGE
-h4w96yEMlzO,,2022-09-29T15:15:30Z,,,,"Test org unit",false,false,false,"POINT (40 5)",5.0,40.0,,,,,,"attribute 2",,"Text test",TEXT
+h4w96yEMlzO,,2022-09-29T15:15:30Z,,,,"Test org unit",false,false,false,"POINT (40 5)",5.0,40.0,,,,,"attribute 1",,"Age test",AGE
+h4w96yEMlzO,,2022-09-29T15:15:30Z,,,,"Test org unit",false,false,false,"POINT (40 5)",5.0,40.0,,,,,"attribute 2",,"Text test",TEXT
""",
csvStream.toString(),
"The tracked entity does not match or not exists in the Zip File.");
@@ -211,8 +211,8 @@ void gzipFileAndMatchCsvTeWhenCreateGZipFileFromTrackedEntityList() throws IOExc
assertEquals(
"""
-h4w96yEMlzO,,2022-09-29T15:15:30Z,,,,"Test org unit",false,false,false,"POINT (40 5)",5.0,40.0,,,,,,"attribute 1",,"Age test",AGE
-h4w96yEMlzO,,2022-09-29T15:15:30Z,,,,"Test org unit",false,false,false,"POINT (40 5)",5.0,40.0,,,,,,"attribute 2",,"Text test",TEXT
+h4w96yEMlzO,,2022-09-29T15:15:30Z,,,,"Test org unit",false,false,false,"POINT (40 5)",5.0,40.0,,,,,"attribute 1",,"Age test",AGE
+h4w96yEMlzO,,2022-09-29T15:15:30Z,,,,"Test org unit",false,false,false,"POINT (40 5)",5.0,40.0,,,,,"attribute 2",,"Text test",TEXT
""",
csvStream.toString(),
"The tracked entity does not match or not exists in the Zip File.");
diff --git a/dhis-2/dhis-web-api/src/test/resources/controller/tracker/csv/completeEvent.csv b/dhis-2/dhis-web-api/src/test/resources/controller/tracker/csv/completeEvent.csv
index e845dcbfe440..ee290a2e4d30 100644
--- a/dhis-2/dhis-web-api/src/test/resources/controller/tracker/csv/completeEvent.csv
+++ b/dhis-2/dhis-web-api/src/test/resources/controller/tracker/csv/completeEvent.csv
@@ -1 +1 @@
-FRM97UKN8te,COMPLETED,programId,programStageId,PSeMWi7rBgb,orgUnitId,2020-02-26T23:01:00Z,2020-02-26T23:02:00Z,,,,false,false,2020-02-26T23:03:00Z,2020-02-26T23:04:00Z,2020-02-26T23:05:00Z,2020-02-26T23:06:00Z,admin,2020-02-26T23:07:00Z,system,attributeOptionCombo,attributeCategoryOptions,assignedUser,dataElement,value,admin,false,admin,2020-02-26T23:08:00Z,2020-02-26T23:09:00Z
\ No newline at end of file
+FRM97UKN8te,COMPLETED,programId,programStageId,PSeMWi7rBgb,orgUnitId,2020-02-26T23:01:00Z,2020-02-26T23:02:00Z,,,,false,false,2020-02-26T23:03:00Z,2020-02-26T23:04:00Z,2020-02-26T23:05:00Z,2020-02-26T23:06:00Z,admin,2020-02-26T23:07:00Z,system,attributeOptionCombo,attributeCategoryOptions,assignedUser,dataElement,value,false,admin,2020-02-26T23:08:00Z,2020-02-26T23:09:00Z
\ No newline at end of file