feat: Add not-null constraint for column trackedentitytypeid in trackedentity table [DHIS2-15066]

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

@@ -58,7 +58,7 @@
                      foreign-key="fk_trackedentityinstance_organisationunitid" not-null="true" lazy="false"/>
 
         <many-to-one name="trackedEntityType" class="org.hisp.dhis.trackedentity.TrackedEntityType"
-                     column="trackedentitytypeid" foreign-key="fk_trackedentityinstance_trackedentitytypeid" lazy="false"/>
+                     column="trackedentitytypeid" foreign-key="fk_trackedentityinstance_trackedentitytypeid" lazy="false" not-null="true"/>
     </class>
 
     <sql-query name="updateTrackedEntitiesLastUpdated">update trackedentity set lastUpdated = :lastUpdated, lastupdatedbyuserinfo = CAST(:lastupdatedbyuserinfo as jsonb) WHERE uid in :trackedEntities</sql-query>

dhis-2/dhis-services/dhis-service-core/src/test/java/org/hisp/dhis/copy/CopyServiceTest.java

@@ -78,6 +78,7 @@
 import org.hisp.dhis.programrule.ProgramRuleVariableService;
 import org.hisp.dhis.security.acl.AclService;
 import org.hisp.dhis.test.TestBase;
+import org.hisp.dhis.trackedentity.TrackedEntityType;
 import org.hisp.dhis.user.User;
 import org.hisp.dhis.user.UserDetails;
 import org.hisp.dhis.user.sharing.Sharing;
@@ -132,8 +133,11 @@ void setup() {
   void testCopyProgramFromUidWithValidProgram() throws NotFoundException, ForbiddenException {
 
     OrganisationUnit orgUnit = createOrganisationUnit("New Org 1");
+    TrackedEntityType trackedEntityType = createTrackedEntityType('E');
+
     List<Enrollment> originalEnrollments =
-        List.of(createEnrollment(original, createTrackedEntity(orgUnit), orgUnit));
+        List.of(
+            createEnrollment(original, createTrackedEntity(orgUnit, trackedEntityType), orgUnit));
     when(programService.getProgram(VALID_PROGRAM_UID)).thenReturn(original);
 
     when(aclService.canWrite(UserDetails.fromUser(user), original)).thenReturn(true);

dhis-2/dhis-services/dhis-service-tracker/src/test/java/org/hisp/dhis/tracker/deduplication/DeduplicationHelperTest.java

@@ -521,14 +521,14 @@ private List<Enrollment> getEnrollments() {
   }
 
   private TrackedEntity getTrackedEntityA() {
-    TrackedEntity te = createTrackedEntity(organisationUnitA);
+    TrackedEntity te = createTrackedEntity(organisationUnitA, createTrackedEntityType('I'));
     te.setTrackedEntityType(trackedEntityTypeA);
 
     return te;
   }
 
   private TrackedEntity getTrackedEntityB() {
-    TrackedEntity te = createTrackedEntity(organisationUnitB);
+    TrackedEntity te = createTrackedEntity(organisationUnitB, createTrackedEntityType('F'));
     te.setTrackedEntityType(trackedEntityTypeB);
 
     return te;

dhis-2/dhis-services/dhis-service-tracker/src/test/java/org/hisp/dhis/tracker/export/relationship/RelationshipOperationParamsMapperTest.java

@@ -91,7 +91,7 @@ public void setUp() {
     Program program = createProgram('A');
     ProgramStage programStage = createProgramStage('A', program);
 
-    trackedEntity = createTrackedEntity(organisationUnit);
+    trackedEntity = createTrackedEntity(organisationUnit, createTrackedEntityType('P'));
     trackedEntity.setUid(TE_UID.getValue());
     enrollment = createEnrollment(program, trackedEntity, organisationUnit);
     enrollment.setUid(EN_UID.getValue());

dhis-2/dhis-services/dhis-service-tracker/src/test/java/org/hisp/dhis/tracker/imports/preheat/supplier/DuplicateRelationshipSupplierTest.java

@@ -109,11 +109,11 @@ public void setUp() {
 
     OrganisationUnit organisationUnit = createOrganisationUnit('A');
 
-    teA = createTrackedEntity(organisationUnit);
+    teA = createTrackedEntity(organisationUnit, createTrackedEntityType('D'));
     teA.setUid(TE_A_UID.getValue());
-    teB = createTrackedEntity(organisationUnit);
+    teB = createTrackedEntity(organisationUnit, createTrackedEntityType('E'));
     teB.setUid(TE_B_UID.getValue());
-    teC = createTrackedEntity(organisationUnit);
+    teC = createTrackedEntity(organisationUnit, createTrackedEntityType('F'));
     teC.setUid(TE_C_UID.getValue());
 
     relationshipA =

dhis-2/dhis-services/dhis-service-tracker/src/test/java/org/hisp/dhis/tracker/imports/preheat/supplier/UniqueAttributeSupplierTest.java

@@ -97,7 +97,7 @@ public void setUp() {
     OrganisationUnit orgUnit = createOrganisationUnit('A');
     Program program = createProgram('A');
     Attribute attribute = createAttribute('A');
-    trackedEntity = createTrackedEntity('A', orgUnit);
+    trackedEntity = createTrackedEntity('A', orgUnit, createTrackedEntityType('U'));
     trackedEntity.setUid(TE_UID.getValue());
     trackedEntity.setAttributeValues(AttributeValues.of(Map.of(attribute.getUid(), UNIQUE_VALUE)));
     enrollment = createEnrollment(program, trackedEntity, orgUnit);

dhis-2/dhis-services/dhis-service-tracker/src/test/java/org/hisp/dhis/tracker/imports/programrule/RuleEngineMapperTest.java

@@ -327,7 +327,8 @@ private Attribute attribute(TrackedEntityAttribute trackedEntityAttribute, Strin
   }
 
   private TrackedEntity trackedEntity() {
-    return createTrackedEntity('I', organisationUnit, trackedEntityAttribute);
+    return createTrackedEntity(
+        'I', organisationUnit, trackedEntityAttribute, createTrackedEntityType('W'));
   }
 
   private org.hisp.dhis.tracker.imports.domain.Enrollment payloadEnrollment() {

dhis-2/dhis-services/dhis-service-tracker/src/test/java/org/hisp/dhis/tracker/imports/validation/validator/enrollment/DataRelationsValidatorTest.java

@@ -263,7 +263,7 @@ private TrackedEntityType trackedEntityType(String uid, char uniqueChar) {
   }
 
   private TrackedEntity trackedEntity(UID uid, TrackedEntityType type, OrganisationUnit orgUnit) {
-    TrackedEntity te = createTrackedEntity(orgUnit);
+    TrackedEntity te = createTrackedEntity(orgUnit, createTrackedEntityType('R'));
     te.setUid(uid.getValue());
     te.setTrackedEntityType(type);
     return te;

dhis-2/dhis-services/dhis-service-tracker/src/test/java/org/hisp/dhis/tracker/imports/validation/validator/enrollment/SecurityOwnershipValidatorTest.java

@@ -389,7 +389,8 @@ void verifyValidationFailsForEnrollmentDeletionAndUserWithoutTrackedEntityTypeRe
   }
 
   private TrackedEntity teWithNoEnrollments() {
-    TrackedEntity trackedEntity = createTrackedEntity(organisationUnit);
+    TrackedEntity trackedEntity =
+        createTrackedEntity(organisationUnit, createTrackedEntityType('C'));
     trackedEntity.setUid(TE_ID.getValue());
     trackedEntity.setEnrollments(Sets.newHashSet());
     trackedEntity.setTrackedEntityType(trackedEntityType);

dhis-2/dhis-services/dhis-service-tracker/src/test/java/org/hisp/dhis/tracker/imports/validation/validator/event/SecurityOwnershipValidatorTest.java

@@ -486,7 +486,8 @@ void verifySuccessEventValidationWhenEventHasNoOrgUnitAssigned() {
   }
 
   private TrackedEntity teWithNoEnrollments() {
-    TrackedEntity trackedEntity = createTrackedEntity(organisationUnit);
+    TrackedEntity trackedEntity =
+        createTrackedEntity(organisationUnit, createTrackedEntityType('E'));
     trackedEntity.setUid(TE_ID.getValue());
     trackedEntity.setEnrollments(Sets.newHashSet());
     trackedEntity.setTrackedEntityType(trackedEntityType);

dhis-2/dhis-services/dhis-service-tracker/src/test/java/org/hisp/dhis/tracker/imports/validation/validator/trackedentity/SecurityOwnershipValidatorTest.java

@@ -299,7 +299,8 @@ void shouldFailWhenUpdateTEAndUserHasNoWriteAccess() {
   }
 
   private TrackedEntity teWithNoEnrollments() {
-    TrackedEntity trackedEntity = createTrackedEntity(organisationUnit);
+    TrackedEntity trackedEntity =
+        createTrackedEntity(organisationUnit, createTrackedEntityType('Z'));
     trackedEntity.setUid(TE_ID.getValue());
     trackedEntity.setEnrollments(Sets.newHashSet());
     trackedEntity.setTrackedEntityType(trackedEntityType);
@@ -311,7 +312,8 @@ private TrackedEntity teWithDeleteEnrollments() {
     Enrollment enrollment = new Enrollment();
     enrollment.setDeleted(true);
 
-    TrackedEntity trackedEntity = createTrackedEntity(organisationUnit);
+    TrackedEntity trackedEntity =
+        createTrackedEntity(organisationUnit, createTrackedEntityType('B'));
     trackedEntity.setUid(TE_ID.getValue());
     trackedEntity.setEnrollments(Sets.newHashSet(enrollment));
     trackedEntity.setTrackedEntityType(trackedEntityType);
@@ -320,7 +322,8 @@ private TrackedEntity teWithDeleteEnrollments() {
   }
 
   private TrackedEntity teWithEnrollments() {
-    TrackedEntity trackedEntity = createTrackedEntity(organisationUnit);
+    TrackedEntity trackedEntity =
+        createTrackedEntity(organisationUnit, createTrackedEntityType('R'));
     trackedEntity.setUid(TE_ID.getValue());
     trackedEntity.setEnrollments(Sets.newHashSet(new Enrollment()));
     trackedEntity.setTrackedEntityType(trackedEntityType);

dhis-2/dhis-support/dhis-support-db-migration/src/main/resources/org/hisp/dhis/db/migration/2.42/V2_42_26__Add_not_null_constraint_to_trackedentity.sql

@@ -0,0 +1,31 @@
+DO $$
+DECLARE
+dummy_tet_id INT;
+dummy_tet_uid VARCHAR(11);
+BEGIN
+    -- If there are NULL values in trackedentitytypeid, proceed with the update and NOT NULL constraint
+    IF EXISTS (SELECT 1 FROM trackedentity WHERE trackedentitytypeid IS NULL) THEN
+        -- Step 2: Generate a dummy ID for trackedentitytype
+        SELECT COALESCE(MAX(trackedentitytypeid), 0) + 1 INTO dummy_tet_id FROM trackedentitytype;
+
+        -- Generate a unique UID for the dummy entry
+        LOOP
+        SELECT generate_uid() INTO dummy_tet_uid;
+        -- Ensure the UID is unique in trackedentitytype
+        EXIT WHEN NOT EXISTS (SELECT 1 FROM trackedentitytype WHERE uid = dummy_tet_uid);
+        END LOOP;
+
+        -- Step 3: Insert dummy TrackedEntityType using generated ID and UID
+        INSERT INTO trackedentitytype(
+                trackedentitytypeid, uid, code, created, lastupdated, name, description, formname, style)
+                VALUES (dummy_tet_id, dummy_tet_uid, 'dummy_tet', now(), now(), 'dummy_tet', 'Placeholder for NULL values', 'dummy_tet', '{}'::jsonb);
+
+        -- Step 4: Update rows with NULL values in trackedentitytypeid
+        UPDATE trackedentity
+        SET trackedentitytypeid = dummy_tet_id
+        WHERE trackedentitytypeid IS NULL;
+
+        -- Step 5: Add NOT NULL constraint to trackedentitytypeid
+        ALTER TABLE trackedentity ALTER COLUMN trackedentitytypeid SET NOT NULL;
+    END IF;
+END $$;

dhis-2/dhis-support/dhis-support-test/src/main/java/org/hisp/dhis/test/TestBase.java

@@ -2141,29 +2141,36 @@ public static TrackedEntityType createTrackedEntityType(char uniqueChar) {
     return trackedEntityType;
   }
 
-  public static TrackedEntity createTrackedEntity(OrganisationUnit organisationUnit) {
+  public static TrackedEntity createTrackedEntity(
+      OrganisationUnit organisationUnit, TrackedEntityType trackedEntityType) {
     TrackedEntity trackedEntity = new TrackedEntity();
     trackedEntity.setAutoFields();
     trackedEntity.setOrganisationUnit(organisationUnit);
+    trackedEntity.setTrackedEntityType(trackedEntityType);
 
     return trackedEntity;
   }
 
   public static TrackedEntity createTrackedEntity(
-      char uniqueChar, OrganisationUnit organisationUnit) {
+      char uniqueChar, OrganisationUnit organisationUnit, TrackedEntityType trackedEntityType) {
     TrackedEntity trackedEntity = new TrackedEntity();
     trackedEntity.setAutoFields();
     trackedEntity.setOrganisationUnit(organisationUnit);
     trackedEntity.setUid(BASE_TE_UID + uniqueChar);
+    trackedEntity.setTrackedEntityType(trackedEntityType);
 
     return trackedEntity;
   }
 
   public static TrackedEntity createTrackedEntity(
-      char uniqueChar, OrganisationUnit organisationUnit, TrackedEntityAttribute attribute) {
+      char uniqueChar,
+      OrganisationUnit organisationUnit,
+      TrackedEntityAttribute attribute,
+      TrackedEntityType trackedEntityType) {
     TrackedEntity trackedEntity = new TrackedEntity();
     trackedEntity.setAutoFields();
     trackedEntity.setOrganisationUnit(organisationUnit);
+    trackedEntity.setTrackedEntityType(trackedEntityType);
 
     TrackedEntityAttributeValue attributeValue = new TrackedEntityAttributeValue();
     attributeValue.setAttribute(attribute);

dhis-2/dhis-test-integration/src/test/java/org/hisp/dhis/analytics/event/data/EventAnalyticsServiceTest.java

@@ -411,9 +411,8 @@ void setUp() throws ConflictException {
     manager.save(trackedEntityType);
 
     // Tracked Entity Instances (Registrations)
-    TrackedEntity teiA = createTrackedEntity(ouD);
+    TrackedEntity teiA = createTrackedEntity(ouD, trackedEntityType);
     teiA.setUid("trackEntInA");
-    teiA.setTrackedEntityType(trackedEntityType);
     manager.save(teiA);
 
     // Tracked Entity Attribute Values

dhis-2/dhis-test-integration/src/test/java/org/hisp/dhis/audit/AuditIntegrationTest.java

@@ -56,6 +56,7 @@
 import org.hisp.dhis.test.integration.PostgresIntegrationTestBase;
 import org.hisp.dhis.trackedentity.TrackedEntity;
 import org.hisp.dhis.trackedentity.TrackedEntityAttribute;
+import org.hisp.dhis.trackedentity.TrackedEntityType;
 import org.hisp.dhis.trackedentityattributevalue.TrackedEntityAttributeValue;
 import org.hisp.dhis.tracker.trackedentityattributevalue.TrackedEntityAttributeValueService;
 import org.junit.jupiter.api.Disabled;
@@ -108,7 +109,10 @@ void testSaveTrackedEntity() {
     TrackedEntityAttribute attribute = createTrackedEntityAttribute('A');
     manager.save(ou);
     manager.save(attribute);
-    TrackedEntity trackedEntity = createTrackedEntity('A', ou, attribute);
+
+    TrackedEntityType trackedEntityType = createTrackedEntityType('O');
+    manager.save(trackedEntityType);
+    TrackedEntity trackedEntity = createTrackedEntity('A', ou, attribute, trackedEntityType);
     manager.save(trackedEntity);
     AuditQuery query = AuditQuery.builder().uid(Sets.newHashSet(trackedEntity.getUid())).build();
     await().atMost(TIMEOUT, TimeUnit.SECONDS).until(() -> auditService.countAudits(query) >= 0);
@@ -127,7 +131,11 @@ void testSaveTrackedAttributeValue() {
     TrackedEntityAttribute attribute = createTrackedEntityAttribute('A');
     manager.save(ou);
     manager.save(attribute);
-    TrackedEntity trackedEntity = createTrackedEntity('A', ou, attribute);
+
+    TrackedEntityType trackedEntityType = createTrackedEntityType('O');
+    manager.save(trackedEntityType);
+
+    TrackedEntity trackedEntity = createTrackedEntity('A', ou, attribute, trackedEntityType);
     manager.save(trackedEntity);
     TrackedEntityAttributeValue dataValue =
         createTrackedEntityAttributeValue('A', trackedEntity, attribute);

dhis-2/dhis-test-integration/src/test/java/org/hisp/dhis/maintenance/HardDeleteAuditTest.java

@@ -44,6 +44,7 @@
 import org.hisp.dhis.test.integration.PostgresIntegrationTestBase;
 import org.hisp.dhis.trackedentity.TrackedEntity;
 import org.hisp.dhis.trackedentity.TrackedEntityAttribute;
+import org.hisp.dhis.trackedentity.TrackedEntityType;
 import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -70,7 +71,9 @@ class HardDeleteAuditTest extends PostgresIntegrationTestBase {
   void testHardDeleteTrackedEntity() {
     OrganisationUnit ou = createOrganisationUnit('A');
     TrackedEntityAttribute attribute = createTrackedEntityAttribute('A');
-    TrackedEntity trackedEntity = createTrackedEntity('A', ou, attribute);
+    TrackedEntityType trackedEntityType = createTrackedEntityType('O');
+    manager.save(trackedEntityType);
+    TrackedEntity trackedEntity = createTrackedEntity('A', ou, attribute, trackedEntityType);
     transactionTemplate.execute(
         status -> {
           manager.save(ou);

dhis-2/dhis-test-integration/src/test/java/org/hisp/dhis/maintenance/MaintenanceServiceTest.java

@@ -164,13 +164,11 @@ void setUp() {
     programService.updateProgram(program);
     TrackedEntityType trackedEntityType = createTrackedEntityType('A');
     trackedEntityTypeService.addTrackedEntityType(trackedEntityType);
-    trackedEntity = createTrackedEntity(organisationUnit);
-    trackedEntity.setTrackedEntityType(trackedEntityType);
+    trackedEntity = createTrackedEntity(organisationUnit, trackedEntityType);
     manager.save(trackedEntity);
-    trackedEntityB = createTrackedEntity(organisationUnit);
-    trackedEntityB.setTrackedEntityType(trackedEntityType);
+    trackedEntityB = createTrackedEntity(organisationUnit, trackedEntityType);
     manager.save(trackedEntityB);
-    trackedEntityWithAssociations = createTrackedEntity('T', organisationUnit);
+    trackedEntityWithAssociations = createTrackedEntity('T', organisationUnit, trackedEntityType);
     DateTime testDate1 = DateTime.now();
     testDate1.withTimeAtStartOfDay();
     testDate1 = testDate1.minusDays(70);

dhis-2/dhis-test-integration/src/test/java/org/hisp/dhis/merge/dataelement/DataElementMergeServiceTest.java

@@ -112,6 +112,7 @@
 import org.hisp.dhis.test.integration.PostgresIntegrationTestBase;
 import org.hisp.dhis.trackedentity.TrackedEntity;
 import org.hisp.dhis.trackedentity.TrackedEntityDataElementDimension;
+import org.hisp.dhis.trackedentity.TrackedEntityType;
 import org.hisp.dhis.tracker.export.event.EventChangeLogService;
 import org.hisp.dhis.tracker.export.event.TrackedEntityDataValueChangeLog;
 import org.hisp.dhis.tracker.export.event.TrackedEntityDataValueChangeLogQueryParams;
@@ -1267,7 +1268,9 @@ void programIndicatorFilterMergeSourcesDeletedTest() throws ConflictException {
       "Event eventDataValues references to source DataElements are replaced with target DataElement, source DataElements are not deleted")
   void eventMergeTest() throws ConflictException {
     // given
-    TrackedEntity trackedEntity = createTrackedEntity(ou1);
+    TrackedEntityType trackedEntityType = createTrackedEntityType('O');
+    identifiableObjectManager.save(trackedEntityType);
+    TrackedEntity trackedEntity = createTrackedEntity(ou1, trackedEntityType);
     identifiableObjectManager.save(trackedEntity);
     Enrollment enrollment = createEnrollment(program, trackedEntity, ou1);
     identifiableObjectManager.save(enrollment);
@@ -1352,7 +1355,10 @@ void eventMergeTest() throws ConflictException {
       "Event eventDataValues references with source DataElements are deleted when using DISCARD merge strategy")
   void eventMergeDiscardTest() throws ConflictException {
     // given
-    TrackedEntity trackedEntity = createTrackedEntity(ou1);
+
+    TrackedEntityType trackedEntityType = createTrackedEntityType('O');
+    identifiableObjectManager.save(trackedEntityType);
+    TrackedEntity trackedEntity = createTrackedEntity(ou1, trackedEntityType);
     identifiableObjectManager.save(trackedEntity);
     Enrollment enrollment = createEnrollment(program, trackedEntity, ou1);
     identifiableObjectManager.save(enrollment);
@@ -1445,7 +1451,10 @@ void eventMergeDiscardTest() throws ConflictException {
       "Event eventDataValues references to source DataElements are replaced with target DataElement, source DataElements are deleted")
   void eventMergeSourcesDeletedTest() throws ConflictException {
     // given
-    TrackedEntity trackedEntity = createTrackedEntity(ou1);
+
+    TrackedEntityType trackedEntityType = createTrackedEntityType('O');
+    identifiableObjectManager.save(trackedEntityType);
+    TrackedEntity trackedEntity = createTrackedEntity(ou1, trackedEntityType);
     identifiableObjectManager.save(trackedEntity);
     Enrollment enrollment = createEnrollment(program, trackedEntity, ou1);
     identifiableObjectManager.save(enrollment);
@@ -2549,7 +2558,9 @@ void dataValueAuditMergeDeleteTest() throws ConflictException {
       "TrackedEntityDataValueChangeLog with references to source DataElements are not changed or deleted when sources not deleted")
   void trackedEntityDataValueChangeLogMergeTest() throws ConflictException {
     // given
-    TrackedEntity trackedEntity = createTrackedEntity(ou1);
+    TrackedEntityType trackedEntityType = createTrackedEntityType('O');
+    identifiableObjectManager.save(trackedEntityType);
+    TrackedEntity trackedEntity = createTrackedEntity(ou1, trackedEntityType);
     identifiableObjectManager.save(trackedEntity);
     Enrollment enrollment = createEnrollment(program, trackedEntity, ou1);
     identifiableObjectManager.save(enrollment);
@@ -2602,7 +2613,9 @@ void trackedEntityDataValueChangeLogMergeTest() throws ConflictException {
       "TrackedEntityDataValueChangeLog with references to source DataElements are deleted when sources are deleted")
   void trackedEntityDataValueChangeLogMergeDeletedTest() throws ConflictException {
     // given
-    TrackedEntity trackedEntity = createTrackedEntity(ou1);
+    TrackedEntityType trackedEntityType = createTrackedEntityType('O');
+    identifiableObjectManager.save(trackedEntityType);
+    TrackedEntity trackedEntity = createTrackedEntity(ou1, trackedEntityType);
     identifiableObjectManager.save(trackedEntity);
     Enrollment enrollment = createEnrollment(program, trackedEntity, ou1);
     identifiableObjectManager.save(enrollment);

dhis-2/dhis-test-integration/src/test/java/org/hisp/dhis/merge/orgunit/handler/TrackerOrgUnitMergeHandlerTest.java

@@ -39,6 +39,7 @@
 import org.hisp.dhis.program.ProgramStage;
 import org.hisp.dhis.test.integration.PostgresIntegrationTestBase;
 import org.hisp.dhis.trackedentity.TrackedEntity;
+import org.hisp.dhis.trackedentity.TrackedEntityType;
 import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.TestInstance;
@@ -97,9 +98,12 @@ void setUp() {
     manager.save(ouA);
     manager.save(ouB);
     manager.save(ouC);
-    trackedEntityA = createTrackedEntity('A', ouA);
-    trackedEntityB = createTrackedEntity('B', ouB);
-    trackedEntityC = createTrackedEntity('C', ouC);
+
+    TrackedEntityType trackedEntityType = createTrackedEntityType('O');
+    manager.save(trackedEntityType);
+    trackedEntityA = createTrackedEntity('A', ouA, trackedEntityType);
+    trackedEntityB = createTrackedEntity('B', ouB, trackedEntityType);
+    trackedEntityC = createTrackedEntity('C', ouC, trackedEntityType);
     manager.save(trackedEntityA);
     manager.save(trackedEntityB);
     manager.save(trackedEntityC);