feat: submitted_at date for csv reports

City-of-Helsinki · Oct 15, 2024 · 11469f9 · 11469f9
1 parent 8612d00
commit 11469f9
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 1 deletion.
diff --git a/backend/benefit/applications/services/applications_csv_report.py b/backend/benefit/applications/services/applications_csv_report.py
@@ -1,3 +1,4 @@
+from datetime import datetime
 from typing import List
 
 from django.utils import translation
@@ -80,6 +81,13 @@ def get_application_origin_label(application_origin: str) -> str:
     return str(ApplicationOrigin(application_origin).label)
 
 
+def get_submitted_at_date(application) -> datetime:
+    if hasattr(application, "submitted_at") and application.submitted_at:
+        return application.submitted_at
+    else:
+        return application.created_at
+
+
 class ApplicationsCsvService(CsvExportBase):
     """
     Export application data for further processing in Excel and other reporting software.
@@ -106,6 +114,7 @@ def CSV_COLUMNS(self):
         if self.prune_data_for_talpa:
             talpa_columns = [
                 CsvColumn("Hakemusnumero", "application_number"),
+                CsvColumn("Hakemus saapunut", get_submitted_at_date, format_datetime),
                 CsvColumn("Työnantajan tyyppi", get_organization_type),
                 CsvColumn("Työnantajan tilinumero", "company_bank_account_number"),
                 CsvColumn("Työnantajan nimi", "company_name"),
@@ -136,6 +145,7 @@ def CSV_COLUMNS(self):
 
         columns = [
             CsvColumn("Hakemusnumero", "application_number"),
+            CsvColumn("Hakemus saapunut", get_submitted_at_date, format_datetime),
             CsvColumn("Hakemusrivi", "application_row_idx"),
             CsvColumn("Hakemuksen tila", "status"),
             CsvColumn(

diff --git a/backend/benefit/applications/services/applications_power_bi_csv_report.py b/backend/benefit/applications/services/applications_power_bi_csv_report.py
@@ -10,6 +10,7 @@
     format_datetime,
     get_application_origin_label,
     get_benefit_type_label,
+    get_submitted_at_date,
 )
 from applications.services.csv_export_base import CsvColumn, get_organization_type
 
@@ -42,6 +43,11 @@ def CSV_COLUMNS(self):
 
         columns = [
             CsvColumn("Hakemusnumero", "application_number"),
+            CsvColumn(
+                "Hakemus saapunut",
+                get_submitted_at_date,
+                format_datetime,
+            ),
             CsvColumn("Työnantajan tyyppi", get_organization_type),
             CsvColumn("Työnantajan Y-tunnus", "company.business_id"),
             csv_default_column(
@@ -52,7 +58,6 @@ def CSV_COLUMNS(self):
             CsvColumn(
                 "Hakemuksen tyyppi", "application_origin", get_application_origin_label
             ),
-            CsvColumn("Hakemus saapunut", "created_at", format_datetime),
             csv_default_column("Haettava lisä", "benefit_type", get_benefit_type_label),
             csv_default_column("Haettu alkupäivä", "start_date"),
             csv_default_column("Haettu päättymispäivä", "end_date"),