fix: Add skipSynchronization to TrackedEntityAttribute

src/main/java/org/hisp/dhis/api/ApiFields.java

@@ -292,12 +292,15 @@ public class ApiFields {
 
   /** Tracked entity attribute fields. */
   public static final String TRACKED_ENTITY_ATTRIBUTE_FIELDS =
-      String.format("%s,valueType,aggregationType,confidential,unique,orgunitScope", NAME_FIELDS);
+      String.format(
+          "%s,valueType,aggregationType,confidential,unique,orgunitScope,skipSynchronization",
+          NAME_FIELDS);
 
   /** Tracked entity attribute extended fields. */
   public static final String TRACKED_ENTITY_ATTRIBUTE_EXT_FIELDS =
       String.format(
-          "%s,valueType,aggregationType,confidential,unique,orgunitScope", NAME_EXT_FIELDS);
+          "%s,valueType,aggregationType,confidential,unique,orgunitScope,skipSynchronization",
+          NAME_EXT_FIELDS);
 
   /** Tracked entity type fields. */
   public static final String TRACKED_ENTITY_TYPE_FIELDS =

src/main/java/org/hisp/dhis/model/Program.java

@@ -154,7 +154,7 @@ public List<TrackedEntityAttribute> getNonConfidentialTrackedEntityTypeAttribute
 
     return trackedEntityType.getTrackedEntityTypeAttributes().stream()
         .map(TrackedEntityTypeAttribute::getTrackedEntityAttribute)
-        .filter(tea -> !tea.isConfidentialNullSafe())
+        .filter(tea -> !tea.isConfidential())
         .collect(Collectors.toUnmodifiableList());
   }
 
@@ -179,7 +179,22 @@ public List<TrackedEntityAttribute> getTrackedEntityAttributes() {
   public List<TrackedEntityAttribute> getNonConfidentialTrackedEntityAttributes() {
     return programTrackedEntityAttributes.stream()
         .map(ProgramTrackedEntityAttribute::getTrackedEntityAttribute)
-        .filter(tea -> !tea.isConfidentialNullSafe())
+        .filter(tea -> !tea.isConfidential())
+        .toList();
+  }
+
+  /**
+   * Returns tracked entity attributes which are not confidential and synchronizable and part of the
+   * program.
+   *
+   * @return an immutable list of {@link TrackedEntityAttribute}.
+   */
+  @JsonIgnore
+  public List<TrackedEntityAttribute> getSynchronizableTrackedEntityAttributes() {
+    return programTrackedEntityAttributes.stream()
+        .map(ProgramTrackedEntityAttribute::getTrackedEntityAttribute)
+        .filter(tea -> !tea.isConfidential())
+        .filter(tea -> !tea.isSkipSynchronization())
         .toList();
   }
 

src/main/java/org/hisp/dhis/model/trackedentity/TrackedEntityAttribute.java

@@ -27,6 +27,8 @@
  */
 package org.hisp.dhis.model.trackedentity;
 
+import static org.apache.commons.lang3.BooleanUtils.isTrue;
+
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import lombok.Getter;
@@ -53,13 +55,25 @@ public class TrackedEntityAttribute extends NameableObject {
 
   @JsonProperty private Boolean orgunitScope = false;
 
+  @JsonProperty private Boolean skipSynchronization = false;
+
+  @JsonIgnore
+  public boolean isConfidential() {
+    return isTrue(confidential);
+  }
+
+  @JsonIgnore
+  public boolean isUnique() {
+    return isTrue(unique);
+  }
+
   @JsonIgnore
-  public boolean isConfidentialNullSafe() {
-    return confidential != null && confidential;
+  public boolean isOrgUnitScope() {
+    return isTrue(orgunitScope);
   }
 
   @JsonIgnore
-  public boolean isUniqueNullSafe() {
-    return unique != null && unique;
+  public boolean isSkipSynchronization() {
+    return isTrue(skipSynchronization);
   }
 }

src/main/java/org/hisp/dhis/response/data/ImportCount.java

@@ -27,6 +27,7 @@
  */
 package org.hisp.dhis.response.data;
 
+import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import lombok.Getter;
 import lombok.NoArgsConstructor;
@@ -45,4 +46,9 @@ public class ImportCount {
   @JsonProperty private int ignored;
 
   @JsonProperty private int deleted;
+
+  @JsonIgnore
+  public long getTotal() {
+    return (long) imported + updated + ignored + deleted;
+  }
 }

src/test/java/org/hisp/dhis/ApiFieldsTest.java

@@ -79,7 +79,7 @@ void testProgramExtFields() {
         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]],\
+        aggregationType,confidential,unique,orgunitScope,skipSynchronization],displayInList,mandatory,searchable]],\
         categoryCombo[id,code,name,created,lastUpdated,attributeValues,shortName,description,\
         categories[id,code,name,created,lastUpdated,attributeValues,createdBy,lastUpdatedBy,translations,\
         sharing,access,shortName,description,formName,dataDimensionType,dataDimension,\
@@ -115,7 +115,7 @@ void testProgramExtFields() {
         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],\
+        shortName,description,valueType,aggregationType,confidential,unique,orgunitScope,skipSynchronization],\
         sortOrder,displayInList,mandatory,allowFutureDate,searchable],\
         programRuleVariables[id,code,name,created,lastUpdated,attributeValues,createdBy,\
         lastUpdatedBy,translations,sharing,access,program[id,code,name,created,lastUpdated,attributeValues],\
@@ -147,7 +147,7 @@ void testProgramMinFields() {
         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],\
+        description,valueType,aggregationType,confidential,unique,orgunitScope,skipSynchronization],\
         sortOrder,displayInList,mandatory,allowFutureDate,searchable],\
         programType,\
         enrollmentDateLabel,incidentDateLabel,enrollmentLabel,followUpLabel,\

src/test/java/org/hisp/dhis/CategoryOptionApiTest.java

@@ -86,7 +86,7 @@ void testGetCategoryOptionsWithPaging() {
     assertFalse(categoryOptions.isEmpty());
     assertNotNull(categoryOptions.get(0).getId());
     assertNotNull(categoryOptions.get(0).getName());
-    assertFalse(categoryOptions.get(0).getCategories().isEmpty());
+    assertNotEmpty(categoryOptions.get(0).getCategories());
   }
 
   @Test
@@ -104,7 +104,7 @@ void testGetCategoryOption() {
 
     CategoryOption categoryOption = dhis2.getCategoryOption("jRbMi0aBjYn");
 
-    assertEquals("Male", categoryOption.getName());
+    assertNotBlank(categoryOption.getName());
   }
 
   @Test
@@ -119,7 +119,7 @@ void testUpdateCategoryOption() {
 
     assertEquals(Status.OK, response.getStatus());
     categoryOption = dhis2.getCategoryOption("jRbMi0aBjYn");
-    assertEquals("Male gender", categoryOption.getDescription());
+    assertNotBlank(categoryOption.getDescription());
     assertNotNull(categoryOption.getLastUpdatedBy());
   }
 }

src/test/java/org/hisp/dhis/CategoryOptionComboApiTest.java

@@ -27,6 +27,7 @@
  */
 package org.hisp.dhis;
 
+import static org.hisp.dhis.support.Assertions.assertNotBlank;
 import static org.hisp.dhis.support.Assertions.assertNotEmpty;
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertFalse;
@@ -45,7 +46,7 @@ void testGetCategoryOptionCombo() {
     CategoryOptionCombo coc = dhis2.getCategoryOptionCombo("KQ50BVoUrd6");
 
     assertEquals("KQ50BVoUrd6", coc.getId());
-    assertEquals("Male", coc.getName());
+    assertNotBlank(coc.getName());
     assertFalse(coc.getIgnoreApproval());
     assertNotEmpty(coc.getCategoryOptions());
   }

src/test/java/org/hisp/dhis/DataElementApiTest.java

@@ -29,6 +29,7 @@
 
 import static org.hisp.dhis.support.Assertions.assertNotBlank;
 import static org.hisp.dhis.support.Assertions.assertNotEmpty;
+import static org.hisp.dhis.support.Assertions.assertSize;
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertNotNull;
 import static org.junit.jupiter.api.Assertions.assertTrue;
@@ -185,8 +186,8 @@ void testSaveGetDataElementWithSharing() {
     assertNotNull(sharing);
     assertNotBlank(sharing.getOwner());
     assertNotBlank(sharing.getPublicAccess());
-    assertEquals(2, sharing.getUsers().size());
-    assertEquals(2, sharing.getUserGroups().size());
+    assertSize(2, sharing.getUsers().values());
+    assertSize(2, sharing.getUserGroups().values());
 
     UserAccess userAccess = sharing.getUsers().get("awtnYWiVEd5");
 

src/test/java/org/hisp/dhis/DataElementGroupApiTest.java

@@ -27,6 +27,7 @@
  */
 package org.hisp.dhis;
 
+import static org.hisp.dhis.support.Assertions.assertSize;
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertNotNull;
 import static org.junit.jupiter.api.Assertions.assertNull;
@@ -67,7 +68,7 @@ void testGetDataElementGroup() {
     List<DataElement> dataElements = deg.getDataElements();
 
     assertNotNull(dataElements);
-    assertEquals(3, dataElements.size());
+    assertSize(3, dataElements);
 
     List<String> deIds =
         dataElements.stream().map(IdentifiableObject::getId).collect(Collectors.toList());

src/test/java/org/hisp/dhis/DataSetApiTest.java

@@ -105,7 +105,7 @@ void testGetDataSetsWithExpandAssociations() {
                 .withExpandAssociations()
                 .addFilter(Filter.in("id", list("BfMAe6Itzgt"))));
 
-    assertEquals(1, dataSets.size());
+    assertSize(1, dataSets);
 
     DataSet dataSet = dataSets.get(0);
 

src/test/java/org/hisp/dhis/DataStoreApiTest.java

@@ -27,6 +27,7 @@
  */
 package org.hisp.dhis;
 
+import static org.hisp.dhis.support.Assertions.assertSize;
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertFalse;
 import static org.junit.jupiter.api.Assertions.assertNotNull;
@@ -86,7 +87,7 @@ void testCrud() {
         dhis2.getDatastoreEntries("fruits", List.of("name", "color"));
 
     assertNotNull(fruits);
-    assertEquals(2, fruits.size());
+    assertSize(2, fruits);
     assertNotNull(fruits.get(0));
     assertNotNull(fruits.get(0).get("name"));
     assertNotNull(fruits.get(0).get("color"));

src/test/java/org/hisp/dhis/Dhis2CrudApiTest.java

@@ -27,6 +27,7 @@
  */
 package org.hisp.dhis;
 
+import static org.hisp.dhis.support.Assertions.assertSize;
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertNotNull;
 import static org.junit.jupiter.api.Assertions.assertThrows;
@@ -87,7 +88,7 @@ void testCrudCategoryOption() {
     assertEquals(codeA, coA.getCode());
     assertEquals(nameA, coA.getName());
     assertEquals(shortNameA, coA.getShortName());
-    assertEquals(2, coA.getOrganisationUnits().size());
+    assertSize(2, coA.getOrganisationUnits());
     assertTrue(coA.getOrganisationUnits().contains(ouA));
     assertTrue(coA.getOrganisationUnits().contains(ouB));
 
@@ -112,7 +113,7 @@ void testCrudCategoryOption() {
     assertNotNull(coA.getAttributeValues());
     assertEquals(uidA, coA.getId());
     assertEquals(codeA, coA.getCode());
-    assertEquals(2, coA.getOrganisationUnits().size());
+    assertSize(2, coA.getOrganisationUnits());
     assertTrue(coA.getOrganisationUnits().contains(ouA));
     assertTrue(coA.getOrganisationUnits().contains(ouB));
 

src/test/java/org/hisp/dhis/EnrollmentsApiTest.java

@@ -27,6 +27,7 @@
  */
 package org.hisp.dhis;
 
+import static org.hisp.dhis.support.Assertions.assertSize;
 import static org.hisp.dhis.util.DateTimeUtils.toDate;
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertFalse;
@@ -126,7 +127,7 @@ void testSaveGetRemoveEnrollments() {
     assertEquals(trackedEntity, enrollment.getTrackedEntity());
 
     assertNotNull(enrollment.getNotes());
-    assertEquals(1, enrollment.getNotes().size());
+    assertSize(1, enrollment.getNotes());
     note = enrollment.getNotes().get(0);
     assertEquals(noteId, note.getNote());
     assertEquals(5000, note.getValue().length());

src/test/java/org/hisp/dhis/EventsApiTest.java

@@ -27,6 +27,7 @@
  */
 package org.hisp.dhis;
 
+import static org.hisp.dhis.support.Assertions.assertSize;
 import static org.hisp.dhis.util.CollectionUtils.list;
 import static org.hisp.dhis.util.DateTimeUtils.toDate;
 import static org.junit.jupiter.api.Assertions.assertEquals;
@@ -252,7 +253,7 @@ void testSaveEventsMissingOccurredAt() {
     assertTrue(response.hasErrorReports());
     assertEquals(Status.ERROR, response.getStatus(), response.toString());
     assertEquals(1, response.getStats().getIgnored());
-    assertEquals(1, response.getValidationReport().getErrorReports().size());
+    assertSize(1, response.getValidationReport().getErrorReports());
 
     ErrorReport errorReport = response.getValidationReport().getErrorReports().get(0);
     assertEquals("E1031", errorReport.getErrorCode());
@@ -269,7 +270,7 @@ void testGetEvents() {
 
     assertNotNull(events);
     assertNotNull(events.getEvents());
-    assertEquals(50, events.getEvents().size());
+    assertSize(50, events.getEvents());
 
     Event event = events.getEvents().get(0);
 
@@ -294,7 +295,7 @@ void testGetEventsWithFilter() {
 
     assertNotNull(events);
     assertNotNull(events.getEvents());
-    assertEquals(50, events.getEvents().size());
+    assertSize(50, events.getEvents());
 
     Event event = events.getEvents().get(0);
 
@@ -323,7 +324,7 @@ void testGetEventsWithOrder() {
 
     assertNotNull(events);
     assertNotNull(events.getEvents());
-    assertEquals(10, events.getEvents().size());
+    assertSize(10, events.getEvents());
 
     Event firstEvent = events.getEvents().get(0);
     int firstValue = Integer.parseInt(firstEvent.getDataValue("qrur9Dvnyt5"));

src/test/java/org/hisp/dhis/IndicatorApiTest.java

@@ -28,6 +28,7 @@
 package org.hisp.dhis;
 
 import static org.hisp.dhis.support.Assertions.assertNotEmpty;
+import static org.hisp.dhis.support.Assertions.assertSize;
 import static org.hisp.dhis.support.Assertions.assertSuccessResponse;
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertFalse;
@@ -107,7 +108,7 @@ void testGetIndicatorsWithInFilter() {
     List<Indicator> indicators = dhis2.getIndicators(query);
 
     assertNotEmpty(indicators);
-    assertEquals(3, indicators.size());
+    assertSize(3, indicators);
   }
 
   @Test

src/test/java/org/hisp/dhis/IndicatorTypeApiTest.java

@@ -28,6 +28,7 @@
 package org.hisp.dhis;
 
 import static org.hisp.dhis.support.Assertions.assertNotEmpty;
+import static org.hisp.dhis.support.Assertions.assertSize;
 import static org.hisp.dhis.support.Assertions.assertSuccessResponse;
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertNotNull;
@@ -70,7 +71,7 @@ void testGetIndicatorTypesWithInFilter() {
     List<IndicatorType> indicatorTypes = dhis2.getIndicatorTypes(query);
 
     assertNotEmpty(indicatorTypes);
-    assertEquals(2, indicatorTypes.size());
+    assertSize(2, indicatorTypes);
   }
 
   @Test

src/test/java/org/hisp/dhis/MetadataApiTest.java

@@ -28,6 +28,7 @@
 package org.hisp.dhis;
 
 import static org.hisp.dhis.support.Assertions.assertNotEmpty;
+import static org.hisp.dhis.support.Assertions.assertSize;
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertNotNull;
 import static org.junit.jupiter.api.Assertions.assertTrue;
@@ -78,7 +79,7 @@ void testImportMetadata() {
     assertEquals(4, stats.getTotal());
 
     assertNotEmpty(response.getTypeReports());
-    assertEquals(2, response.getTypeReports().size());
+    assertSize(2, response.getTypeReports());
 
     ObjectResponse removeResponse =
         dhis2.removeMetadataObject(MetadataEntity.OPTION_SET, "gKdxTM8BcI7");