2097: Refactor populate_csv_columns

Author: ahernp

accessibility_monitoring_platform/apps/cases/csv_export.py

@@ -76,22 +76,21 @@ def populate_csv_columns(
     case: DetailedCase | SimplifiedCase, column_definitions: list[CSVColumn]
 ) -> list[CSVColumn]:
     """Collect data for a case to export"""
-    source_instances: dict[ExportableClasses] = {
-        SimplifiedCase: case if isinstance(case, SimplifiedCase) else None,
-        DetailedCase: case if isinstance(case, DetailedCase) else None,
-        CaseCompliance: case.compliance if hasattr(case, "compliance") else None,
-        CaseStatus: case.status,
-        SimplifiedContact: (
-            case.contact_set.filter(is_deleted=False).first()
-            if isinstance(case, SimplifiedCase)
-            else None
-        ),
-        DetailedContact: (
-            case.contact_set.filter(is_deleted=False).first()
-            if isinstance(case, DetailedCase)
-            else None
-        ),
-    }
+    source_instances: dict[ExportableClasses] = {}
+    if isinstance(case, DetailedCase):
+        source_instances[DetailedCase] = case
+        source_instances[DetailedContact] = case.contact_set.filter(
+            is_deleted=False
+        ).first()
+    elif isinstance(case, SimplifiedCase):
+        source_instances[SimplifiedCase] = case
+        source_instances[CaseStatus] = case.status
+        source_instances[SimplifiedContact] = case.contact_set.filter(
+            is_deleted=False
+        ).first()
+        if hasattr(case, "compliance"):
+            source_instances[CaseCompliance] = case.compliance
+
     columns: list[CSVColumn] = copy.deepcopy(column_definitions)
     for column in columns:
         source_instance: ExportableClasses = source_instances.get(column.source_class)

accessibility_monitoring_platform/apps/detailed/models.py

@@ -289,8 +289,7 @@ def previous_case_identifier(self) -> str:
     @property
     def equality_body_export_contact_details(self) -> str:
         """
-        For a contact-related field, concatenate the values for all the contacts
-        and return as a single string.
+        Concatenate the values for all the contacts and return as a single string.
         """
         contacts_string: str = ""
         for contact in self.contacts:

accessibility_monitoring_platform/apps/simplified/models.py

@@ -607,8 +607,7 @@ def contact_exists(self) -> bool:
     @property
     def equality_body_export_contact_details(self) -> QuerySet["Contact"]:
         """
-        For a contact-related field, concatenate the values for all the contacts
-        and return as a single string.
+        Concatenate the values for all the contacts and return as a single string.
         """
         contact_details: str = ""
         for contact in self.contacts: