diff --git a/src/main/java/org/hisp/dhis/api/ApiFields.java b/src/main/java/org/hisp/dhis/api/ApiFields.java index 0513a23d..7c2c9b60 100644 --- a/src/main/java/org/hisp/dhis/api/ApiFields.java +++ b/src/main/java/org/hisp/dhis/api/ApiFields.java @@ -46,7 +46,7 @@ public class ApiFields { /** Identifiable object extended fields. */ public static final String ID_EXT_FIELDS = - String.format("%s,translations,sharing,access", ID_FIELDS); + String.format("%s,createdBy,lastUpdatedBy,translations,sharing,access", ID_FIELDS); /** Nameable object fields. */ public static final String NAME_FIELDS = String.format("%s,shortName,description", ID_FIELDS); @@ -334,8 +334,8 @@ public class ApiFields { /** Program indicator fields. */ public static final String PROGRAM_INDICATOR_FIELDS = String.format( - "%1$s,program[%1$s],expression,filter,decimals,aggregationType,analyticsType", - NAME_FIELDS); + "%1$s,program[%2$s],expression,filter,decimals,aggregationType,analyticsType", + NAME_EXT_FIELDS, NAME_FIELDS); /** Program section fields. */ public static final String PROGRAM_SECTION_FIELDS = diff --git a/src/main/java/org/hisp/dhis/model/IdentifiableObject.java b/src/main/java/org/hisp/dhis/model/IdentifiableObject.java index 61db56f5..d022fa80 100644 --- a/src/main/java/org/hisp/dhis/model/IdentifiableObject.java +++ b/src/main/java/org/hisp/dhis/model/IdentifiableObject.java @@ -40,6 +40,7 @@ import org.hisp.dhis.model.acl.Access; import org.hisp.dhis.model.sharing.Sharing; import org.hisp.dhis.model.translation.Translation; +import org.hisp.dhis.model.user.User; @Getter @Setter @@ -54,8 +55,12 @@ public class IdentifiableObject implements Serializable { @JsonProperty protected Date created; + @JsonProperty protected User createdBy; + @JsonProperty protected Date lastUpdated; + @JsonProperty protected User lastUpdatedBy; + /** Attribute values. */ @JsonProperty protected Set attributeValues = new HashSet<>(); diff --git a/src/test/java/org/hisp/dhis/ApiFieldsTest.java b/src/test/java/org/hisp/dhis/ApiFieldsTest.java index 7f8d2659..ccd8ab1a 100644 --- a/src/test/java/org/hisp/dhis/ApiFieldsTest.java +++ b/src/test/java/org/hisp/dhis/ApiFieldsTest.java @@ -40,17 +40,23 @@ class ApiFieldsTest { void testProgramStageFields() { String expected = """ - id,code,name,created,lastUpdated,attributeValues,translations,sharing,access,shortName,description,formName,\ + id,code,name,created,lastUpdated,attributeValues,createdBy,lastUpdatedBy,\ + translations,sharing,access,shortName,description,formName,\ program[id,code,name,created,lastUpdated,attributeValues],\ - programStageDataElements[id,code,name,created,lastUpdated,attributeValues,translations,sharing,access,shortName,description,formName,\ + programStageDataElements[id,code,name,created,lastUpdated,attributeValues,\ + createdBy,lastUpdatedBy,translations,sharing,access,shortName,description,formName,\ programStage[id,code,name,created,lastUpdated,attributeValues,shortName,description],\ - dataElement[id,code,name,created,lastUpdated,attributeValues,translations,sharing,access,shortName,description,formName,\ - aggregationType,valueType,domainType,url,categoryCombo[id,code,name,created,lastUpdated,attributeValues,shortName,description],\ + dataElement[id,code,name,created,lastUpdated,attributeValues,createdBy,lastUpdatedBy,\ + translations,sharing,access,shortName,description,formName,\ + aggregationType,valueType,domainType,url,categoryCombo[id,code,name,created,\ + lastUpdated,attributeValues,shortName,description],\ legendSets[id,code,name,created,lastUpdated,\ attributeValues,shortName,description],\ - optionSet[id,code,name,created,lastUpdated,attributeValues,translations,sharing,access,valueType,version]],\ + optionSet[id,code,name,created,lastUpdated,attributeValues,createdBy,\ + lastUpdatedBy,translations,sharing,access,valueType,version]],\ compulsory,displayInReports,skipSynchronization,skipAnalytics,allowFutureDate,sortOrder],\ - programStageSections[id,code,name,created,lastUpdated,attributeValues,translations,sharing,access,\ + programStageSections[id,code,name,created,lastUpdated,attributeValues,\ + createdBy,lastUpdatedBy,translations,sharing,access,\ shortName,description,formName,programStage[id,code,name,created,lastUpdated,\ attributeValues,shortName,description],sortOrder,\ dataElements[id,code,name,created,lastUpdated,attributeValues,shortName,description],\ @@ -67,30 +73,39 @@ void testProgramStageFields() { void testProgramExtFields() { String expected = """ - id,code,name,created,lastUpdated,attributeValues,translations,sharing,access,shortName,description,formName,\ - trackedEntityType[id,code,name,created,lastUpdated,attributeValues,translations,sharing,access,shortName,description,formName,\ + id,code,name,created,lastUpdated,attributeValues,createdBy,lastUpdatedBy,\ + translations,sharing,access,shortName,description,formName,\ + trackedEntityType[id,code,name,created,lastUpdated,attributeValues,\ + createdBy,lastUpdatedBy,translations,sharing,access,shortName,description,formName,\ trackedEntityTypeAttributes[id,\ trackedEntityAttribute[id,code,name,created,lastUpdated,attributeValues,shortName,description,valueType,\ aggregationType,confidential,unique,orgunitScope],displayInList,mandatory,searchable]],\ categoryCombo[id,code,name,created,lastUpdated,attributeValues,shortName,description,\ - categories[id,code,name,created,lastUpdated,attributeValues,translations,sharing,access,shortName,description,formName,dataDimensionType,dataDimension,\ + categories[id,code,name,created,lastUpdated,attributeValues,createdBy,lastUpdatedBy,translations,\ + sharing,access,shortName,description,formName,dataDimensionType,dataDimension,\ categoryOptions[id,code,name,created,lastUpdated,attributeValues],\ categoryCombos[id,code,name,created,lastUpdated,attributeValues]]],\ organisationUnits[id,code,name,created,lastUpdated,attributeValues,shortName,description],\ - programSections[id,code,name,created,lastUpdated,attributeValues,translations,sharing,access,shortName,description,formName,sortOrder,\ + programSections[id,code,name,created,lastUpdated,attributeValues,createdBy,lastUpdatedBy,\ + translations,sharing,access,shortName,description,formName,sortOrder,\ program[id,code,name,created,lastUpdated,attributeValues,shortName,description],\ trackedEntityAttributes[id,code,name,created,lastUpdated,attributeValues,shortName,description]],\ - programStages[id,code,name,created,lastUpdated,attributeValues,translations,sharing,access,shortName,description,formName,\ + programStages[id,code,name,created,lastUpdated,attributeValues,createdBy,lastUpdatedBy,\ + translations,sharing,access,shortName,description,formName,\ program[id,code,name,created,lastUpdated,attributeValues],\ - programStageDataElements[id,code,name,created,lastUpdated,attributeValues,translations,sharing,access,shortName,description,formName,\ + programStageDataElements[id,code,name,created,lastUpdated,attributeValues,createdBy,lastUpdatedBy,\ + translations,sharing,access,shortName,description,formName,\ programStage[id,code,name,created,lastUpdated,attributeValues,shortName,description],\ - dataElement[id,code,name,created,lastUpdated,attributeValues,translations,sharing,access,shortName,description,formName,\ - aggregationType,valueType,domainType,url,categoryCombo[id,code,name,created,lastUpdated,attributeValues,shortName,description],\ + dataElement[id,code,name,created,lastUpdated,attributeValues,createdBy,lastUpdatedBy,translations,\ + sharing,access,shortName,description,formName,aggregationType,valueType,domainType,url,\ + categoryCombo[id,code,name,created,lastUpdated,attributeValues,shortName,description],\ legendSets[id,code,name,created,lastUpdated,attributeValues,shortName,description],\ - optionSet[id,code,name,created,lastUpdated,attributeValues,translations,sharing,access,valueType,version]],\ + optionSet[id,code,name,created,lastUpdated,attributeValues,createdBy,lastUpdatedBy,\ + translations,sharing,access,valueType,version]],\ compulsory,displayInReports,skipSynchronization,skipAnalytics,allowFutureDate,sortOrder],\ - programStageSections[id,code,name,created,lastUpdated,attributeValues,translations,sharing,access,\ - shortName,description,formName,programStage[id,code,name,created,lastUpdated,attributeValues,shortName,description],\ + programStageSections[id,code,name,created,lastUpdated,attributeValues,createdBy,\ + lastUpdatedBy,translations,sharing,access,shortName,description,formName,\ + programStage[id,code,name,created,lastUpdated,attributeValues,shortName,description],\ sortOrder,dataElements[id,code,name,created,lastUpdated,attributeValues,shortName,description],\ programIndicators[id,code,name,created,lastUpdated,attributeValues,shortName,description]],\ executionDateLabel,dueDateLabel,programStageLabel,eventLabel,\ @@ -99,11 +114,11 @@ void testProgramExtFields() { hideDueDate,enableUserAssignment,referral,featureType],\ programTrackedEntityAttributes[id,code,name,program[id,code,name,created,lastUpdated,\ attributeValues,shortName,description],\ - trackedEntityAttribute[id,code,name,created,lastUpdated,attributeValues,shortName,\ - description,valueType,aggregationType,confidential,unique,orgunitScope],\ + trackedEntityAttribute[id,code,name,created,lastUpdated,attributeValues,\ + shortName,description,valueType,aggregationType,confidential,unique,orgunitScope],\ sortOrder,displayInList,mandatory,allowFutureDate,searchable],\ - programRuleVariables[id,code,name,created,lastUpdated,attributeValues,translations,\ - sharing,access,program[id,code,name,created,lastUpdated,attributeValues],\ + programRuleVariables[id,code,name,created,lastUpdated,attributeValues,createdBy,\ + lastUpdatedBy,translations,sharing,access,program[id,code,name,created,lastUpdated,attributeValues],\ programRuleVariableSourceType,valueType,programStage[id,code,name,created,\ lastUpdated,attributeValues],trackedEntityAttribute[id,code,name,created,\ lastUpdated,attributeValues],useCodeForOptionSet,\ @@ -124,7 +139,7 @@ void testProgramExtFields() { void testProgramMinFields() { String expected = """ - id,code,name,created,lastUpdated,attributeValues,translations,sharing,access,shortName,description,\ + id,code,name,created,lastUpdated,attributeValues,createdBy,lastUpdatedBy,translations,sharing,access,shortName,description,\ formName,trackedEntityType[id,code,name,created,lastUpdated,attributeValues,shortName,description],\ categoryCombo[id,code,name,created,lastUpdated,attributeValues,shortName,description],\ programSections[id,code,name,created,lastUpdated,attributeValues,shortName,description],\ @@ -150,11 +165,11 @@ void testProgramMinFields() { void testUserFields() { String expected = """ - id,code,name,created,lastUpdated,attributeValues,translations,sharing,access,\ + id,code,name,created,lastUpdated,attributeValues,createdBy,lastUpdatedBy,translations,sharing,access,\ username,firstName,surname,email,phoneNumber,externalAuth,lastLogin,disabled,interests,\ organisationUnits[id,code,name,created,lastUpdated,attributeValues,shortName,description],\ - groups[id,code,name,created,lastUpdated,attributeValues,translations,sharing,access],\ - userRoles[id,code,name,created,lastUpdated,attributeValues,translations,sharing,access],\ + groups[id,code,name,created,lastUpdated,attributeValues,createdBy,lastUpdatedBy,translations,sharing,access],\ + userRoles[id,code,name,created,lastUpdated,attributeValues,createdBy,lastUpdatedBy,translations,sharing,access],\ dataViewOrganisationUnits[id,code,name,created,lastUpdated,attributeValues,shortName,description],\ teiSearchOrganisationUnits[id,code,name,created,lastUpdated,attributeValues,shortName,description]"""; diff --git a/src/test/java/org/hisp/dhis/AttributeApiTest.java b/src/test/java/org/hisp/dhis/AttributeApiTest.java index d9cfd0f0..31a6524b 100644 --- a/src/test/java/org/hisp/dhis/AttributeApiTest.java +++ b/src/test/java/org/hisp/dhis/AttributeApiTest.java @@ -57,6 +57,7 @@ void testGetAttribute() { assertEquals("Classification", attribute.getName()); assertEquals("CLASSIFICATION", attribute.getCode()); assertNotNull(attribute.getCreated()); + assertNotNull(attribute.getCreatedBy()); assertNotNull(attribute.getLastUpdated()); } @@ -115,6 +116,7 @@ void testCreateUpdateAndDeleteAttributes() { assertEquals(uidA, attribute.getDescription()); assertFalse(attribute.getUnique()); assertFalse(attribute.getMandatory()); + assertNotNull(attribute.getCreatedBy()); attribute.setName(uidB); @@ -129,6 +131,7 @@ void testCreateUpdateAndDeleteAttributes() { assertNotNull(attribute); assertEquals(attributeUid, attribute.getId()); assertEquals(uidB, attribute.getName()); + assertNotNull(attribute.getLastUpdatedBy()); // Remove ObjectResponse removeRespA = dhis2.removeAttribute(attributeUid); diff --git a/src/test/java/org/hisp/dhis/CategoryApiTest.java b/src/test/java/org/hisp/dhis/CategoryApiTest.java index 85eb293a..35f76dad 100644 --- a/src/test/java/org/hisp/dhis/CategoryApiTest.java +++ b/src/test/java/org/hisp/dhis/CategoryApiTest.java @@ -53,6 +53,7 @@ void testGetCategory() { assertEquals("EC40NXmsTVu", category.getId()); assertNotBlank(category.getName()); assertNotNull(category.getCreated()); + assertNotNull(category.getCreatedBy()); assertNotNull(category.getLastUpdated()); assertNotNull(category.getSharing()); assertNotNull(category.getAccess()); diff --git a/src/test/java/org/hisp/dhis/CategoryComboApiTest.java b/src/test/java/org/hisp/dhis/CategoryComboApiTest.java index 9552d853..ec7193c8 100644 --- a/src/test/java/org/hisp/dhis/CategoryComboApiTest.java +++ b/src/test/java/org/hisp/dhis/CategoryComboApiTest.java @@ -55,6 +55,7 @@ void testGetCategoryCombo() { assertEquals("m2jTvAj5kkm", categoryCombo.getId()); assertEquals("Births", categoryCombo.getName()); assertNotNull(categoryCombo.getCreated()); + assertNotNull(categoryCombo.getCreatedBy()); assertNotNull(categoryCombo.getLastUpdated()); assertNotNull(categoryCombo.getSharing()); assertNotNull(categoryCombo.getAccess()); diff --git a/src/test/java/org/hisp/dhis/CategoryOptionApiTest.java b/src/test/java/org/hisp/dhis/CategoryOptionApiTest.java index 7c7037cb..7b7f6763 100644 --- a/src/test/java/org/hisp/dhis/CategoryOptionApiTest.java +++ b/src/test/java/org/hisp/dhis/CategoryOptionApiTest.java @@ -56,6 +56,7 @@ void getCategoryOption() { assertNotBlank(categoryOption.getName()); assertEquals("K4gwuiVvW3z", categoryOption.getId()); assertNotNull(categoryOption.getCreated()); + assertNotNull(categoryOption.getCreatedBy()); assertNotNull(categoryOption.getLastUpdated()); assertNotNull(categoryOption.getSharing()); assertNotNull(categoryOption.getAccess()); @@ -119,5 +120,6 @@ void testUpdateCategoryOption() { assertEquals(Status.OK, response.getStatus()); categoryOption = dhis2.getCategoryOption("jRbMi0aBjYn"); assertEquals("Male gender", categoryOption.getDescription()); + assertNotNull(categoryOption.getLastUpdatedBy()); } } diff --git a/src/test/java/org/hisp/dhis/DashboardApiTest.java b/src/test/java/org/hisp/dhis/DashboardApiTest.java index be370e81..fd22d61c 100644 --- a/src/test/java/org/hisp/dhis/DashboardApiTest.java +++ b/src/test/java/org/hisp/dhis/DashboardApiTest.java @@ -52,6 +52,7 @@ void testGetDashboard() { assertEquals("L1BtjXgpUpd", dashboard.getId()); assertNotBlank(dashboard.getName()); assertNotNull(dashboard.getCreated()); + assertNotNull(dashboard.getCreatedBy()); assertNotNull(dashboard.getLastUpdated()); assertNotNull(dashboard.getSharing()); assertNotNull(dashboard.getAccess()); diff --git a/src/test/java/org/hisp/dhis/DataElementApiTest.java b/src/test/java/org/hisp/dhis/DataElementApiTest.java index 2fd69f1d..e6f182ca 100644 --- a/src/test/java/org/hisp/dhis/DataElementApiTest.java +++ b/src/test/java/org/hisp/dhis/DataElementApiTest.java @@ -69,6 +69,7 @@ void testGetDataElement() { assertNotNull(dataElement.getId()); assertNotBlank(dataElement.getName()); assertNotNull(dataElement.getCreated()); + assertNotNull(dataElement.getCreatedBy()); assertNotNull(dataElement.getLastUpdated()); assertNotNull(dataElement.getSharing()); assertNotNull(dataElement.getAccess()); diff --git a/src/test/java/org/hisp/dhis/DataElementGroupApiTest.java b/src/test/java/org/hisp/dhis/DataElementGroupApiTest.java index f1efe990..4f554899 100644 --- a/src/test/java/org/hisp/dhis/DataElementGroupApiTest.java +++ b/src/test/java/org/hisp/dhis/DataElementGroupApiTest.java @@ -55,6 +55,7 @@ void testGetDataElementGroup() { assertEquals("Lassa Fever", deg.getName()); assertEquals("Lassa Fever", deg.getShortName()); assertNotNull(deg.getCreated()); + assertNotNull(deg.getCreatedBy()); assertNotNull(deg.getLastUpdated()); assertNotNull(deg.getSharing()); assertNotNull(deg.getAccess()); diff --git a/src/test/java/org/hisp/dhis/DataElementGroupSetApiTest.java b/src/test/java/org/hisp/dhis/DataElementGroupSetApiTest.java index c102e97c..9d535775 100644 --- a/src/test/java/org/hisp/dhis/DataElementGroupSetApiTest.java +++ b/src/test/java/org/hisp/dhis/DataElementGroupSetApiTest.java @@ -87,6 +87,7 @@ void testGetDataElementGroupSet() { assertEquals("Diagnosis", dataElementGroupSet.getName()); assertEquals("Diagnosis", dataElementGroupSet.getShortName()); assertNotNull(dataElementGroupSet.getCreated()); + assertNotNull(dataElementGroupSet.getCreatedBy()); assertNotNull(dataElementGroupSet.getLastUpdated()); assertNotNull(dataElementGroupSet.getSharing()); assertNotNull(dataElementGroupSet.getAccess()); @@ -157,6 +158,7 @@ void testCreateUpdateAndDeleteDataElementGroupSet() { assertNotNull(dataElementGroupSet); assertEquals(dataElementGroupSetUid, dataElementGroupSet.getId()); assertEquals(uidB, dataElementGroupSet.getName()); + assertNotNull(dataElementGroupSet.getLastUpdatedBy()); // Remove ObjectResponse removeRespA = dhis2.removeDataElementGroupSet(dataElementGroupSetUid); diff --git a/src/test/java/org/hisp/dhis/DataSetApiTest.java b/src/test/java/org/hisp/dhis/DataSetApiTest.java index 919ff03c..c47b004c 100644 --- a/src/test/java/org/hisp/dhis/DataSetApiTest.java +++ b/src/test/java/org/hisp/dhis/DataSetApiTest.java @@ -60,6 +60,7 @@ void testGetDataSet() { assertEquals("Mortality < 5 years", dataSet.getName()); assertEquals("Mortality < 5 years", dataSet.getDisplayFormName()); assertNotNull(dataSet.getCreated()); + assertNotNull(dataSet.getCreatedBy()); assertNotNull(dataSet.getLastUpdated()); assertNotNull(dataSet.getSharing()); assertNotNull(dataSet.getAccess()); diff --git a/src/test/java/org/hisp/dhis/DocumentApiTest.java b/src/test/java/org/hisp/dhis/DocumentApiTest.java index 0286a10f..aed19325 100644 --- a/src/test/java/org/hisp/dhis/DocumentApiTest.java +++ b/src/test/java/org/hisp/dhis/DocumentApiTest.java @@ -50,16 +50,17 @@ class DocumentApiTest { void testGetDocument() { Dhis2 dhis2 = new Dhis2(TestFixture.DEFAULT_CONFIG); - Document document = dhis2.getDocument("hKYLLpNinZR"); + Document document = dhis2.getDocument("L2APFupqBU1"); assertNotNull(document); - assertEquals("hKYLLpNinZR", document.getId()); + assertEquals("L2APFupqBU1", document.getId()); assertNotBlank(document.getName()); assertNotNull(document.getCreated()); + assertNotNull(document.getCreatedBy()); assertNotNull(document.getLastUpdated()); assertNotBlank(document.getUrl()); - assertTrue(document.getExternal()); - assertTrue(document.isExternal()); + assertFalse(document.getExternal()); + assertFalse(document.isExternal()); assertFalse(document.isAttachment()); } diff --git a/src/test/java/org/hisp/dhis/EventFilterApiTest.java b/src/test/java/org/hisp/dhis/EventFilterApiTest.java index 44f41db6..1f6d6dbc 100644 --- a/src/test/java/org/hisp/dhis/EventFilterApiTest.java +++ b/src/test/java/org/hisp/dhis/EventFilterApiTest.java @@ -188,6 +188,7 @@ private void validateEventFilter(EventFilter eventFilter) { assertNotNull(eventFilter.getSharing()); assertNotNull(eventFilter.getAccess()); assertNotNull(eventFilter.getCreated()); + assertNotNull(eventFilter.getCreatedBy()); assertNotNull(eventFilter.getLastUpdated()); assertNotNull(eventFilter.getProgram()); assertNotNull(eventFilter.getEventQueryCriteria()); diff --git a/src/test/java/org/hisp/dhis/IndicatorApiTest.java b/src/test/java/org/hisp/dhis/IndicatorApiTest.java index 43d9ceb4..26d61ef5 100644 --- a/src/test/java/org/hisp/dhis/IndicatorApiTest.java +++ b/src/test/java/org/hisp/dhis/IndicatorApiTest.java @@ -63,6 +63,7 @@ void testGetIndicator() { assertNotNull(indicator.getAccess()); assertEquals("ANC IPT 1 Coverage", indicator.getShortName()); assertNotNull(indicator.getCreated()); + assertNotNull(indicator.getCreatedBy()); assertNotNull(indicator.getLastUpdated()); assertFalse(indicator.isAnnualized()); assertNotNull(indicator.getUrl()); @@ -180,6 +181,7 @@ void testCreateUpdateAndDeleteIndicator() { assertNotNull(indicator); assertEquals(indicatorUid, indicator.getId()); assertEquals(uidB, indicator.getName()); + assertNotNull(indicator.getLastUpdatedBy()); // Remove ObjectResponse removeRespA = dhis2.removeIndicator(indicatorUid); diff --git a/src/test/java/org/hisp/dhis/IndicatorGroupApiTest.java b/src/test/java/org/hisp/dhis/IndicatorGroupApiTest.java index 18a7f35a..f90c16c0 100644 --- a/src/test/java/org/hisp/dhis/IndicatorGroupApiTest.java +++ b/src/test/java/org/hisp/dhis/IndicatorGroupApiTest.java @@ -56,6 +56,7 @@ void testGetIndicatorGroup() { assertEquals("pKHOV0uwPJk", group.getId()); assertNotBlank(group.getName()); assertNotNull(group.getCreated()); + assertNotNull(group.getCreatedBy()); assertNotNull(group.getLastUpdated()); assertNotNull(group.getSharing()); assertNotNull(group.getAccess()); @@ -116,6 +117,7 @@ void testCreateUpdateAndDeleteIndicatorGroup() { assertNotNull(indicatorGroup); assertEquals(indicatorGroupUid, indicatorGroup.getId()); assertEquals(uidB, indicatorGroup.getName()); + assertNotNull(indicatorGroup.getLastUpdatedBy()); // Remove ObjectResponse removeRespA = dhis2.removeIndicatorGroup(indicatorGroupUid); diff --git a/src/test/java/org/hisp/dhis/IndicatorGroupSetApiTest.java b/src/test/java/org/hisp/dhis/IndicatorGroupSetApiTest.java index b2fdf8fa..cec2b728 100644 --- a/src/test/java/org/hisp/dhis/IndicatorGroupSetApiTest.java +++ b/src/test/java/org/hisp/dhis/IndicatorGroupSetApiTest.java @@ -122,7 +122,7 @@ void testCreateUpdateAndDeleteIndicator() { assertNotNull(indicatorGroupSet); assertEquals(indicatorGroupSetUid, indicatorGroupSet.getId()); assertEquals(uidB, indicatorGroupSet.getName()); - + assertNotNull(indicatorGroupSet.getLastUpdatedBy()); // Remove ObjectResponse removeRespA = dhis2.removeIndicatorGroupSet(indicatorGroupSetUid); diff --git a/src/test/java/org/hisp/dhis/IndicatorTypeApiTest.java b/src/test/java/org/hisp/dhis/IndicatorTypeApiTest.java index 1c9319ab..7f6ff8c2 100644 --- a/src/test/java/org/hisp/dhis/IndicatorTypeApiTest.java +++ b/src/test/java/org/hisp/dhis/IndicatorTypeApiTest.java @@ -119,6 +119,7 @@ void testCreateUpdateAndDeleteIndicatorType() { assertNotNull(indicatorType); assertEquals(indicatorTypeUid, indicatorType.getId()); assertEquals(updatedName, indicatorType.getName()); + assertNotNull(indicatorType.getLastUpdatedBy()); // Remove ObjectResponse removeRespA = dhis2.removeIndicatorType(indicatorTypeUid); diff --git a/src/test/java/org/hisp/dhis/OptionSetApiTest.java b/src/test/java/org/hisp/dhis/OptionSetApiTest.java index ff4d08ea..d32dc9ed 100644 --- a/src/test/java/org/hisp/dhis/OptionSetApiTest.java +++ b/src/test/java/org/hisp/dhis/OptionSetApiTest.java @@ -61,6 +61,7 @@ void testGetOptionSet() { assertEquals("VQ2lai3OfVG", optionSet.getId()); assertNotBlank(optionSet.getName()); assertNotNull(optionSet.getCreated()); + assertNotNull(optionSet.getCreatedBy()); assertNotNull(optionSet.getLastUpdated()); assertNotNull(optionSet.getSharing()); assertNotNull(optionSet.getAccess()); @@ -205,6 +206,7 @@ void testSaveUpdateOptionSet() { assertNotNull(updated); assertEquals("qszOn4ydMDE", updated.getId()); assertEquals("DJC: Legend", updated.getName()); + assertNotNull(updated.getLastUpdatedBy()); assertSize(3, updated.getOptions()); ObjectResponse removeResponse = dhis2.removeOptionSet("qszOn4ydMDE"); diff --git a/src/test/java/org/hisp/dhis/OrgUnitApiTest.java b/src/test/java/org/hisp/dhis/OrgUnitApiTest.java index efd5929c..aded8b1b 100644 --- a/src/test/java/org/hisp/dhis/OrgUnitApiTest.java +++ b/src/test/java/org/hisp/dhis/OrgUnitApiTest.java @@ -63,6 +63,7 @@ void testGetOrgUnit() { assertEquals("YuQRtpLP10I", ou.getId()); assertEquals("OU_539", ou.getCode()); assertNotNull(ou.getCreated()); + assertNotNull(ou.getCreatedBy()); assertNotNull(ou.getLastUpdated()); assertEquals("Badjia", ou.getName()); assertEquals("Badjia", ou.getShortName()); diff --git a/src/test/java/org/hisp/dhis/OrgUnitGroupApiTest.java b/src/test/java/org/hisp/dhis/OrgUnitGroupApiTest.java index f7e9ce0c..efcafb63 100644 --- a/src/test/java/org/hisp/dhis/OrgUnitGroupApiTest.java +++ b/src/test/java/org/hisp/dhis/OrgUnitGroupApiTest.java @@ -56,6 +56,7 @@ void testGetOrgUnitGroup() { assertEquals("Country", oug.getName()); assertEquals("Country", oug.getShortName()); assertNotNull(oug.getCreated()); + assertNotNull(oug.getCreatedBy()); assertNotNull(oug.getLastUpdated()); assertNotNull(oug.getSharing()); assertNotNull(oug.getAccess()); diff --git a/src/test/java/org/hisp/dhis/ProgramIndicatorApiTest.java b/src/test/java/org/hisp/dhis/ProgramIndicatorApiTest.java index 851d847b..a80186b5 100644 --- a/src/test/java/org/hisp/dhis/ProgramIndicatorApiTest.java +++ b/src/test/java/org/hisp/dhis/ProgramIndicatorApiTest.java @@ -57,6 +57,7 @@ void testGetProgramIndicator() { assertNotBlank(programIndicator.getExpression()); assertNotNull(programIndicator.getAggregationType()); assertNotNull(programIndicator.getAnalyticsType()); + assertNotNull(programIndicator.getCreatedBy()); } @Test diff --git a/src/test/java/org/hisp/dhis/ProgramStageApiTest.java b/src/test/java/org/hisp/dhis/ProgramStageApiTest.java index e6fcb6c9..00cccc5c 100644 --- a/src/test/java/org/hisp/dhis/ProgramStageApiTest.java +++ b/src/test/java/org/hisp/dhis/ProgramStageApiTest.java @@ -53,6 +53,7 @@ void getGetProgramStage() { assertEquals("A03MvHHogjR", programStage.getId()); assertNotBlank(programStage.getName()); assertNotNull(programStage.getCreated()); + assertNotNull(programStage.getCreatedBy()); assertNotNull(programStage.getLastUpdated()); assertNotBlank(programStage.getDescription()); assertNotEmpty(programStage.getProgramStageDataElements()); diff --git a/src/test/java/org/hisp/dhis/RelationshipTypeApiTest.java b/src/test/java/org/hisp/dhis/RelationshipTypeApiTest.java index 7c80eff3..82bf3bf0 100644 --- a/src/test/java/org/hisp/dhis/RelationshipTypeApiTest.java +++ b/src/test/java/org/hisp/dhis/RelationshipTypeApiTest.java @@ -62,6 +62,7 @@ void testGetRelationshipType() { assertEquals("Birth to Baby postnatal", relationshipType.getFromToName()); assertEquals("Baby postnatal to Birth", relationshipType.getToFromName()); assertNotNull(relationshipType.getCreated()); + assertNotNull(relationshipType.getCreatedBy()); assertNotNull(relationshipType.getLastUpdated()); RelationshipConstraint constraint = relationshipType.getFromConstraint(); @@ -149,6 +150,7 @@ void testCreateUpdateAndDeleteRelationshipTypes() { assertNotNull(relationshipType); assertEquals(relationshipTypeUid, relationshipType.getId()); assertEquals(uidB, relationshipType.getName()); + assertNotNull(relationshipType.getLastUpdatedBy()); // Remove ObjectResponse removeRespA = dhis2.removeRelationshipType(relationshipTypeUid); diff --git a/src/test/java/org/hisp/dhis/TrackedEntityAttributeApiTest.java b/src/test/java/org/hisp/dhis/TrackedEntityAttributeApiTest.java index 88bedd70..a72aa846 100644 --- a/src/test/java/org/hisp/dhis/TrackedEntityAttributeApiTest.java +++ b/src/test/java/org/hisp/dhis/TrackedEntityAttributeApiTest.java @@ -59,6 +59,7 @@ void testGetTrackedEntityAttribute() { assertNotNull(trackedEntityAttribute); assertEquals("VqEFza8wbwA", trackedEntityAttribute.getId()); assertEquals("Address", trackedEntityAttribute.getName()); + assertNotNull(trackedEntityAttribute.getCreatedBy()); } @Test @@ -126,6 +127,7 @@ void testCreateUpdateDeleteTrackedEntityAttributes() { assertEquals(teaId, retrieved.getId()); assertEquals(uidB, retrieved.getName()); assertNotNull(retrieved.getDescription()); + assertNotNull(retrieved.getLastUpdatedBy()); // Remove diff --git a/src/test/java/org/hisp/dhis/TrackedEntityTypeApiTest.java b/src/test/java/org/hisp/dhis/TrackedEntityTypeApiTest.java index 3ef019e8..9921e071 100644 --- a/src/test/java/org/hisp/dhis/TrackedEntityTypeApiTest.java +++ b/src/test/java/org/hisp/dhis/TrackedEntityTypeApiTest.java @@ -61,6 +61,7 @@ void testGetTrackedEntityType() { assertEquals("nEenWmSyUEp", tet.getId()); assertNotBlank(tet.getName()); assertNotNull(tet.getCreated()); + assertNotNull(tet.getCreatedBy()); assertNotNull(tet.getLastUpdated()); assertNotEmpty(tet.getTrackedEntityTypeAttributes()); diff --git a/src/test/java/org/hisp/dhis/UserApiTest.java b/src/test/java/org/hisp/dhis/UserApiTest.java index 80d31409..41537687 100644 --- a/src/test/java/org/hisp/dhis/UserApiTest.java +++ b/src/test/java/org/hisp/dhis/UserApiTest.java @@ -63,6 +63,7 @@ void testGetUser() { assertEquals("John", user.getFirstName()); assertEquals("Traore", user.getSurname()); assertEquals("dummy@dhis2.org", user.getEmail()); + assertNotNull(user.getCreatedBy()); assertFalse(user.getOrganisationUnits().isEmpty()); OrgUnit orgUnit = user.getOrganisationUnits().get(0); @@ -145,6 +146,7 @@ void testCreateUpdateAndDeleteUser() { assertNotNull(user); assertEquals(userUid, user.getId()); assertEquals(updatedFirstName, user.getFirstName()); + assertNotNull(user.getLastUpdatedBy()); // Remove ObjectResponse removeRespA = dhis2.removeUser(userUid); diff --git a/src/test/java/org/hisp/dhis/UserGroupApiTest.java b/src/test/java/org/hisp/dhis/UserGroupApiTest.java index b896b536..4d005784 100644 --- a/src/test/java/org/hisp/dhis/UserGroupApiTest.java +++ b/src/test/java/org/hisp/dhis/UserGroupApiTest.java @@ -58,6 +58,7 @@ void testGetUserGroup() { assertEquals("ZrsVF7IJ93y", userGroup.getId()); assertEquals("Family Health Partner", userGroup.getName()); assertNotNull(userGroup.getCreated()); + assertNotNull(userGroup.getCreatedBy()); assertNotNull(userGroup.getLastUpdated()); assertNotEmpty(userGroup.getUsers()); } @@ -132,6 +133,7 @@ void testCreateUpdateAndDeleteUserGroups() { assertNotNull(userGroup); assertEquals(userGroupUid, userGroup.getId()); assertEquals(uidB, userGroup.getName()); + assertNotNull(userGroup.getLastUpdatedBy()); // Remove ObjectResponse removeRespA = dhis2.removeUserGroup(userGroupUid); diff --git a/src/test/java/org/hisp/dhis/UserRoleApiTest.java b/src/test/java/org/hisp/dhis/UserRoleApiTest.java index b483320e..e68335c9 100644 --- a/src/test/java/org/hisp/dhis/UserRoleApiTest.java +++ b/src/test/java/org/hisp/dhis/UserRoleApiTest.java @@ -55,6 +55,7 @@ void testGetUserRole() { assertEquals("Ufph3mGRmMo", userRole.getId()); assertEquals("Superuser", userRole.getName()); assertNotNull(userRole.getCreated()); + assertNotNull(userRole.getCreatedBy()); assertNotNull(userRole.getLastUpdated()); assertFalse(userRole.getUsers().isEmpty()); } @@ -108,6 +109,7 @@ void testCreateUpdateAndDeleteUserRoles() { assertNotNull(userRole); assertEquals(userRoleUid, userRole.getId()); assertEquals(uidB, userRole.getName()); + assertNotNull(userRole.getLastUpdatedBy()); // Remove ObjectResponse removeRespA = dhis2.removeUserRole(userRoleUid); diff --git a/src/test/java/org/hisp/dhis/VisualizationApiTest.java b/src/test/java/org/hisp/dhis/VisualizationApiTest.java index 0db86910..59a427a0 100644 --- a/src/test/java/org/hisp/dhis/VisualizationApiTest.java +++ b/src/test/java/org/hisp/dhis/VisualizationApiTest.java @@ -61,6 +61,7 @@ void testGetVisualizationA() { assertEquals("UlfTKWZWV4u", visualization.getId()); assertNotBlank(visualization.getName()); assertNotNull(visualization.getCreated()); + assertNotNull(visualization.getCreatedBy()); assertNotNull(visualization.getLastUpdated()); assertNotNull(visualization.getSharing()); assertNotNull(visualization.getAccess()); @@ -83,6 +84,7 @@ void testGetVisualizationB() { assertEquals("hrDweynvx7G", visualization.getId()); assertNotBlank(visualization.getName()); assertNotNull(visualization.getCreated()); + assertNotNull(visualization.getCreatedBy()); assertNotNull(visualization.getLastUpdated()); assertNotNull(visualization.getSharing()); assertNotNull(visualization.getAccess());