refactor: Service layer for analytics events/enrol. [DHIS2-18005] (#1…

…8596)

* refactor: Service layer for analytics events/enrol. [DHIS2-18005]

* fix: Unit test + clean-up [DHIS2-18005]

* fix: Sonar issues [DHIS2-18005]

* chore: Remove unused class [DHIS2-18005]

dhis-2/dhis-services/dhis-service-analytics/src/main/java/org/hisp/dhis/analytics/data/handler/DataHandler.java

@@ -129,8 +129,8 @@
 import org.hisp.dhis.analytics.QueryPlannerParams;
 import org.hisp.dhis.analytics.RawAnalyticsManager;
 import org.hisp.dhis.analytics.analyze.ExecutionPlanStore;
-import org.hisp.dhis.analytics.event.EventAnalyticsService;
 import org.hisp.dhis.analytics.event.EventQueryParams;
+import org.hisp.dhis.analytics.event.data.EventAggregateService;
 import org.hisp.dhis.analytics.resolver.ExpressionResolver;
 import org.hisp.dhis.analytics.resolver.ExpressionResolvers;
 import org.hisp.dhis.analytics.util.PeriodOffsetUtils;
@@ -171,7 +171,7 @@ public class DataHandler {
 
   private static final int PERCENT = 100;
 
-  private final EventAnalyticsService eventAnalyticsService;
+  private final EventAggregateService eventAggregatedService;
 
   private final RawAnalyticsManager rawAnalyticsManager;
 
@@ -428,7 +428,7 @@ public void addProgramDataElementAttributeIndicatorValues(DataQueryParams params
               .withSkipMeta(true)
               .build();
 
-      Grid eventGrid = eventAnalyticsService.getAggregatedEventData(eventQueryParams);
+      Grid eventGrid = eventAggregatedService.getAggregatedData(eventQueryParams);
 
       grid.addRows(eventGrid);