chore: compute event statistics using IdentifiableObjectManager DHIS2-17638

[teleivo]

Big picture

Tracker has multiple services for each entity like tracked entity, enrollment and event. One is in dhis-api and one in dhis-service-tracker. Our goal is to provide one API (service) per entity that is part of the tracker domain/team.

Trackers architecture splits read/write into exporter services and an importer. So if you want to get data you use an exporter. If you want to insert, update or delete you have to go through the importer. Only then can we ensure integrity of tracker data.

Another goal is that code that provides tracker functionality and is thus owned by the tracker team lives in ideally one maven module (We can settle on a name later on maybe dhis-service-tracker or dhis-tracker).

This is a big task that we are going to implement in many small steps.

This PR

There are a couple of issues with how the event/data value statistics are computed in the backend and shown in the data management app. There is a lengthy discussion on it in https://dhis2.slack.com/archives/CPGUFVC56/p1719906006918859. We could not settle on a way forward. We will discuss this in a dedicated meeting.

This PR keeps the behavior as is while getting us closer to our big picture described above. We can/will adapt once we come to an agreement with the platform team.

The logic of computing the last updated dates is extracted from

dhis2-core/dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/program/DefaultEventService.java

Lines 97 to 100 in 51d18bd

	Calendar cal = PeriodType.createCalendarInstance();
	cal.add(Calendar.DAY_OF_YEAR, (days * -1));
	return eventStore.getEventCountLastUpdatedAfter(cal.getTime());

(It is also the same for the data value counts)

The query that was previously part of our dhis-service-core HibernateEventStore

dhis2-core/dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/program/hibernate/HibernateEventStore.java

Lines 76 to 84 in 51d18bd

	public long getEventCountLastUpdatedAfter(Date time) {
	CriteriaBuilder builder = getCriteriaBuilder();
	return getCount(
	builder,
	newJpaParameters()
	.addPredicate(root -> builder.greaterThanOrEqualTo(root.get("lastUpdated"), time))
	.count(builder::countDistinct));
	}

is replaced by

dhis2-core/dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/common/hibernate/HibernateIdentifiableObjectStore.java

Lines 633 to 644 in 1be8198

	public int getCountGeLastUpdated(@Nonnull Date lastUpdated) {
	CriteriaBuilder builder = getCriteriaBuilder();
	JpaQueryParameters<T> param =
	new JpaQueryParameters<T>()
	.addPredicates(getSharingPredicates(builder))
	.addPredicate(
	root -> builder.greaterThanOrEqualTo(root.get("lastUpdated"), lastUpdated))
	.count(root -> builder.countDistinct(root.get("id")));
	return getCount(builder, param).intValue();
	}

[sonarqubecloud]

Quality Gate passed

Issues
0 New issues
0 Accepted issues

Measures
0 Security Hotspots
0.0% Coverage on New Code
0.0% Duplication on New Code

See analysis details on SonarCloud