Merge pull request #218 from UKGovernmentBEIS/pc-500-address-bug

PC-500: fix address bug
UKGovernmentBEIS · Sep 22, 2023 · 98c4bce · 98c4bce
2 parents 87af01f + c6a45cf
commit 98c4bce
Showing 1 changed file with 6 additions and 4 deletions.
diff --git a/help_to_heat/frontdoor/interface.py b/help_to_heat/frontdoor/interface.py
@@ -376,11 +376,13 @@ def parse_dpa_to_address(self, dpa):
         if "DEPENDENT_LOCALITY" in dpa:
             line_1_parts.append(dpa["DEPENDENT_LOCALITY"].title())
 
-        if "DEPENDENT_THOROUGHFARE_NAME" and "THOROUGHFARE_NAME" in dpa:
-            line_1_parts.append(dpa["THOROUGHFARE_NAME"].title())
-        else:
+        if "DEPENDENT_THOROUGHFARE_NAME" in dpa:
             line_1_parts.append(dpa["DEPENDENT_THOROUGHFARE_NAME"].title())
-            line_2_parts.insert(0, dpa["THOROUGHFARE_NAME"].title())
+            if "THOROUGHFARE_NAME" in dpa:
+                line_2_parts.insert(0, dpa["THOROUGHFARE_NAME"].title())
+        else:
+            if "THOROUGHFARE_NAME" in dpa:
+                line_1_parts.append(dpa["THOROUGHFARE_NAME"].title())
 
         line1 = ", ".join(line for line in line_1_parts if line)
         line2 = ", ".join(line for line in line_2_parts if line)