Skip to content

Commit cd73ea7

Browse files
enricocolasanteenricocolasante
committed
chore: Rename event to trackerEvent in Preheat [DHIS2-19865]
1 parent ee34e77 commit cd73ea7

24 files changed

+64
-62
lines changed

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -181,7 +181,7 @@ private TrackerObjectsMapper() {
181181
@Nonnull TrackerPreheat preheat,
182182
@Nonnull org.hisp.dhis.tracker.imports.domain.Event event,
183183
@Nonnull UserDetails user) {
184-
TrackerEvent dbEvent = preheat.getEvent(event.getEvent());
184+
TrackerEvent dbEvent = preheat.getTrackerEvent(event.getEvent());
185185

186186
Date now = new Date();
187187

@@ -348,7 +348,7 @@ private TrackerObjectsMapper() {
348348
case PROGRAM_INSTANCE ->
349349
fromItem.setEnrollment(preheat.getEnrollment(relationship.getFrom().getEnrollment()));
350350
case PROGRAM_STAGE_INSTANCE -> {
351-
TrackerEvent event = preheat.getEvent(relationship.getFrom().getEvent());
351+
TrackerEvent event = preheat.getTrackerEvent(relationship.getFrom().getEvent());
352352
SingleEvent singleEvent = preheat.getSingleEvent(relationship.getFrom().getEvent());
353353
fromItem.setEvent(event != null ? event : map(singleEvent));
354354
}
@@ -365,7 +365,7 @@ private TrackerObjectsMapper() {
365365
case PROGRAM_INSTANCE ->
366366
toItem.setEnrollment(preheat.getEnrollment(relationship.getTo().getEnrollment()));
367367
case PROGRAM_STAGE_INSTANCE -> {
368-
TrackerEvent event = preheat.getEvent(relationship.getTo().getEvent());
368+
TrackerEvent event = preheat.getTrackerEvent(relationship.getTo().getEvent());
369369
SingleEvent singleEvent = preheat.getSingleEvent(relationship.getTo().getEvent());
370370
toItem.setEvent(event != null ? event : map(singleEvent));
371371
}

‎dhis-2/dhis-services/dhis-service-tracker/src/main/java/org/hisp/dhis/tracker/imports/bundle/persister/TrackerEventPersister.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@ public TrackerEventPersister(
8686

8787
@Override
8888
protected void updatePreheat(TrackerPreheat preheat, TrackerEvent event) {
89-
preheat.putEvents(Collections.singletonList(event));
89+
preheat.putTrackerEvents(Collections.singletonList(event));
9090
}
9191

9292
@Override
@@ -108,7 +108,7 @@ protected TrackerNotificationDataBundle handleNotifications(
108108
@Override
109109
protected List<NotificationTrigger> determineNotificationTriggers(
110110
TrackerPreheat preheat, org.hisp.dhis.tracker.imports.domain.TrackerEvent entity) {
111-
TrackerEvent persistedEvent = preheat.getEvent(entity.getUid());
111+
TrackerEvent persistedEvent = preheat.getTrackerEvent(entity.getUid());
112112
List<NotificationTrigger> triggers = new ArrayList<>();
113113
// If the event is new and has been completed
114114
if (persistedEvent == null && entity.getStatus() == EventStatus.COMPLETED) {
@@ -136,7 +136,7 @@ protected TrackerEvent convert(
136136
@Override
137137
protected TrackerEvent cloneEntityProperties(
138138
TrackerPreheat preheat, org.hisp.dhis.tracker.imports.domain.TrackerEvent event) {
139-
TrackerEvent originalEvent = preheat.getEvent(event.getUid());
139+
TrackerEvent originalEvent = preheat.getTrackerEvent(event.getUid());
140140

141141
if (originalEvent == null) {
142142
return new TrackerEvent();

‎dhis-2/dhis-services/dhis-service-tracker/src/main/java/org/hisp/dhis/tracker/imports/preheat/TrackerPreheat.java

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -205,7 +205,7 @@ public MetadataIdentifier getCategoryOptionComboIdentifier(
205205
* Internal map of all preheated events, mainly used for confirming existence for updates, and
206206
* used for object merging.
207207
*/
208-
@Getter private final Map<UID, TrackerEvent> events = new HashMap<>();
208+
@Getter private final Map<UID, TrackerEvent> trackerEvents = new HashMap<>();
209209

210210
/**
211211
* Internal map of all preheated single events, mainly used for confirming existence for updates,
@@ -460,16 +460,16 @@ public void putEnrollment(Enrollment enrollment) {
460460
enrollments.put(UID.of(enrollment), enrollment);
461461
}
462462

463-
public TrackerEvent getEvent(UID uid) {
464-
return events.get(uid);
463+
public TrackerEvent getTrackerEvent(UID uid) {
464+
return trackerEvents.get(uid);
465465
}
466466

467-
public void putEvents(List<TrackerEvent> events) {
468-
events.forEach(this::putEvent);
467+
public void putTrackerEvents(List<TrackerEvent> events) {
468+
events.forEach(this::putTrackerEvent);
469469
}
470470

471-
public void putEvent(TrackerEvent event) {
472-
events.put(UID.of(event), event);
471+
public void putTrackerEvent(TrackerEvent event) {
472+
trackerEvents.put(UID.of(event), event);
473473
}
474474

475475
public SingleEvent getSingleEvent(UID uid) {
@@ -650,7 +650,7 @@ public boolean exists(TrackerType type, UID uid) {
650650
return switch (type) {
651651
case TRACKED_ENTITY -> getTrackedEntity(uid) != null;
652652
case ENROLLMENT -> getEnrollment(uid) != null;
653-
case EVENT -> getEvent(uid) != null || getSingleEvent(uid) != null;
653+
case EVENT -> getTrackerEvent(uid) != null || getSingleEvent(uid) != null;
654654
case RELATIONSHIP -> getRelationship(uid) != null;
655655
};
656656
}

‎dhis-2/dhis-services/dhis-service-tracker/src/main/java/org/hisp/dhis/tracker/imports/preheat/supplier/ProgramOwnerSupplier.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ public class ProgramOwnerSupplier extends AbstractPreheatSupplier {
5858
public void preheatAdd(TrackerObjects trackerObjects, TrackerPreheat preheat) {
5959
final Map<UID, TrackedEntity> preheatedTrackedEntities = preheat.getTrackedEntities();
6060
final Map<UID, Enrollment> preheatedEnrollments = preheat.getEnrollments();
61-
final Map<UID, TrackerEvent> preheatedEvents = preheat.getEvents();
61+
final Map<UID, TrackerEvent> preheatedEvents = preheat.getTrackerEvents();
6262
Set<Long> teIds = new HashSet<>();
6363
for (org.hisp.dhis.tracker.imports.domain.Enrollment en : trackerObjects.getEnrollments()) {
6464
Enrollment enrollment = preheatedEnrollments.get(en.getEnrollment());

‎dhis-2/dhis-services/dhis-service-tracker/src/main/java/org/hisp/dhis/tracker/imports/preheat/supplier/strategy/EventStrategy.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ public void add(List<List<String>> splitList, TrackerPreheat preheat) {
5959
for (List<String> ids : splitList) {
6060
List<TrackerEvent> trackerEvents = getTrackerEventsIncludingDeleted(ids);
6161

62-
preheat.putEvents(
62+
preheat.putTrackerEvents(
6363
DetachUtils.detach(
6464
this.getClass().getAnnotation(StrategyFor.class).mapper(), trackerEvents));
6565
}

‎dhis-2/dhis-services/dhis-service-tracker/src/main/java/org/hisp/dhis/tracker/imports/preprocess/StrategyPreProcessor.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,7 @@ public void preProcessTrackerEvents(TrackerBundle bundle) {
9494
for (org.hisp.dhis.tracker.imports.domain.TrackerEvent event : bundle.getTrackerEvents()) {
9595
TrackerImportStrategy importStrategy = bundle.getImportStrategy();
9696

97-
TrackerEvent existingEvent = bundle.getPreheat().getEvent(event.getEvent());
97+
TrackerEvent existingEvent = bundle.getPreheat().getTrackerEvent(event.getEvent());
9898

9999
if (importStrategy.isCreateAndUpdate()) {
100100
if (existingEvent == null) {

‎dhis-2/dhis-services/dhis-service-tracker/src/main/java/org/hisp/dhis/tracker/imports/programrule/RuleEngineMapper.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -160,7 +160,7 @@ private static RuleEvent mapPayloadEvent(
160160
TrackerPreheat preheat, org.hisp.dhis.tracker.imports.domain.Event eventToEvaluate) {
161161
OrganisationUnit organisationUnit = preheat.getOrganisationUnit(eventToEvaluate.getOrgUnit());
162162
ProgramStage programStage = preheat.getProgramStage(eventToEvaluate.getProgramStage());
163-
TrackerEvent event = preheat.getEvent(eventToEvaluate.getUid());
163+
TrackerEvent event = preheat.getTrackerEvent(eventToEvaluate.getUid());
164164
Instant createdDate =
165165
event == null
166166
? Clock.System.INSTANCE.now()

‎dhis-2/dhis-services/dhis-service-tracker/src/main/java/org/hisp/dhis/tracker/imports/validation/validator/ValidationUtils.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -150,7 +150,7 @@ private static Set<MetadataIdentifier> getEventDataValues(TrackerBundle bundle,
150150
Stream<MetadataIdentifier> payloadDataValues =
151151
event.getDataValues().stream().map(DataValue::getDataElement);
152152
Stream<MetadataIdentifier> savedDataValues =
153-
Optional.ofNullable(bundle.getPreheat().getEvent(event.getUid()))
153+
Optional.ofNullable(bundle.getPreheat().getTrackerEvent(event.getUid()))
154154
.map(TrackerEvent::getEventDataValues)
155155
.orElse(Set.of())
156156
.stream()
@@ -227,7 +227,7 @@ public static boolean enrollmentExist(TrackerBundle bundle, UID enrollment) {
227227
}
228228

229229
public static boolean eventExist(TrackerBundle bundle, UID event) {
230-
return bundle.getPreheat().getEvent(event) != null
230+
return bundle.getPreheat().getTrackerEvent(event) != null
231231
|| bundle.getPreheat().getSingleEvent(event) != null
232232
|| bundle.findTrackerEventByUid(event).isPresent()
233233
|| bundle.findSingleEventByUid(event).isPresent();

‎dhis-2/dhis-services/dhis-service-tracker/src/main/java/org/hisp/dhis/tracker/imports/validation/validator/event/ExistenceValidator.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ public void validate(
6969
private SoftDeletableObject getExistingEvent(
7070
org.hisp.dhis.tracker.imports.domain.Event event, TrackerPreheat preheat) {
7171
if (event instanceof TrackerEvent) {
72-
return preheat.getEvent(event.getEvent());
72+
return preheat.getTrackerEvent(event.getEvent());
7373
} else if (event instanceof SingleEvent) {
7474
return preheat.getSingleEvent(event.getEvent());
7575
}

‎dhis-2/dhis-services/dhis-service-tracker/src/main/java/org/hisp/dhis/tracker/imports/validation/validator/event/SecurityTrackerEventValidator.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ public void validate(
7676
return;
7777
}
7878
TrackerImportStrategy strategy = bundle.getStrategy(event);
79-
TrackerEvent preheatEvent = bundle.getPreheat().getEvent(event.getEvent());
79+
TrackerEvent preheatEvent = bundle.getPreheat().getTrackerEvent(event.getEvent());
8080

8181
ProgramStage programStage =
8282
strategy.isUpdateOrDelete()
@@ -134,7 +134,7 @@ private UID getTeUidFromEvent(
134134
TrackerBundle bundle, org.hisp.dhis.tracker.imports.domain.Event event) {
135135
if (bundle.getStrategy(event).isUpdateOrDelete()) {
136136
return UID.of(
137-
bundle.getPreheat().getEvent(event.getUid()).getEnrollment().getTrackedEntity());
137+
bundle.getPreheat().getTrackerEvent(event.getUid()).getEnrollment().getTrackedEntity());
138138
}
139139

140140
Enrollment enrollment = bundle.getPreheat().getEnrollment(event.getEnrollment());

0 commit comments

Comments
 (0)