fix: use arg name depending on report version (#47)

Aam-Digital · Nov 11, 2024 · e60f01c · e60f01c
1 parent de169dc
commit e60f01c
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 4 deletions.
diff --git a/...l/aambackendservice/reporting/reportcalculation/controller/ReportCalculationController.kt b/...l/aambackendservice/reporting/reportcalculation/controller/ReportCalculationController.kt
@@ -67,11 +67,19 @@ class ReportCalculationController(
         val args = mutableMapOf<String, String>()
 
         if (from != null) {
-            args["from"] = from.toInstant().atOffset(ZoneOffset.UTC).format(DateTimeFormatter.ISO_DATE_TIME)
+            if (report.version == 1) {
+                args["from"] = from.toInstant().atOffset(ZoneOffset.UTC).format(DateTimeFormatter.ISO_DATE_TIME)
+            } else {
+                args["startDate"] = from.toInstant().atOffset(ZoneOffset.UTC).format(DateTimeFormatter.ISO_DATE_TIME)
+            }
         }
 
         if (to != null) {
-            args["to"] = to.toInstant().atOffset(ZoneOffset.UTC).format(DateTimeFormatter.ISO_DATE_TIME)
+            if (report.version == 1) {
+                args["to"] = to.toInstant().atOffset(ZoneOffset.UTC).format(DateTimeFormatter.ISO_DATE_TIME)
+            } else {
+                args["endDate"] = to.toInstant().atOffset(ZoneOffset.UTC).format(DateTimeFormatter.ISO_DATE_TIME)
+            }
         }
 
         val createReportCalculationResponse = createReportCalculationUseCase.createReportCalculation(

diff --git a/.../aambackendservice/reporting/reportcalculation/usecase/DefaultReportCalculationUseCase.kt b/.../aambackendservice/reporting/reportcalculation/usecase/DefaultReportCalculationUseCase.kt
@@ -55,7 +55,6 @@ class DefaultReportCalculationUseCase(
 ) : ReportCalculationUseCase() {
 
     override fun apply(request: ReportCalculationRequest): UseCaseOutcome<ReportCalculationData> {
-
         val reportCalculation: ReportCalculation = try {
             reportCalculationStorage.fetchReportCalculation(
                 DomainReference(request.reportCalculationId)
@@ -100,7 +99,6 @@ class DefaultReportCalculationUseCase(
     private fun handleSqlReport(
         report: Report, reportCalculation: ReportCalculation
     ): UseCaseOutcome<ReportCalculationData> {
-
         for ((argKey: String, transformationKeys: List<String>) in report.transformations) {
             handleTransformations(argKey, transformationKeys, reportCalculation.args)
         }