From f1474feaf888572a72c1ee755713b7b6a3704c8a Mon Sep 17 00:00:00 2001 From: TrisNol Date: Sun, 15 Oct 2023 13:21:41 +0200 Subject: [PATCH] refactor: Adapt to extended unit tests --- .../unternehmensregister/transform.py | 8 ++++---- .../unternehmensregister/transform_test.py | 18 ++++++++---------- 2 files changed, 12 insertions(+), 14 deletions(-) diff --git a/src/aki_prj23_transparenzregister/utils/data_extraction/unternehmensregister/transform.py b/src/aki_prj23_transparenzregister/utils/data_extraction/unternehmensregister/transform.py index a4df2e6..82a8028 100644 --- a/src/aki_prj23_transparenzregister/utils/data_extraction/unternehmensregister/transform.py +++ b/src/aki_prj23_transparenzregister/utils/data_extraction/unternehmensregister/transform.py @@ -503,18 +503,18 @@ def map_co_relation(data: dict) -> dict: co_company_index = None for index, part in enumerate(parts): trimmed_part = part.strip() - result = re.findall(r"^c\/o (.*)$", trimmed_part) + result = re.findall(r"^c\/o(.*)$", trimmed_part) if len(result) == 1: - co_company = result[0] + co_company = result[0].strip() co_company_index = index if co_company_index is not None: del parts[co_company_index] street = "".join(parts).strip() data["location"].street = street - if co_company is not None: + if co_company is not None and co_company != "": relation = CompanyToCompanyRelationship( - RelationshipRoleEnum.LOKATION_BEI, # type: ignore + RelationshipRoleEnum.CARE_OF, # type: ignore Location( data["location"].city, street, diff --git a/tests/utils/data_extraction/unternehmensregister/transform_test.py b/tests/utils/data_extraction/unternehmensregister/transform_test.py index f6fff63..08f24a7 100644 --- a/tests/utils/data_extraction/unternehmensregister/transform_test.py +++ b/tests/utils/data_extraction/unternehmensregister/transform_test.py @@ -723,7 +723,7 @@ def test_map_last_update() -> None: "location": Location("", "Abc ffda", None, None), "relationships": [ CompanyToCompanyRelationship( - RelationshipRoleEnum.LOKATION_BEI, # type: ignore + RelationshipRoleEnum.CARE_OF, # type: ignore Location("", "Abc ffda", None, None), CompanyRelationshipEnum.COMPANY, "Youco24 Business Center", @@ -734,7 +734,7 @@ def test_map_last_update() -> None: ( { "location": Location( - "", "c/o Youco24 Business Center, Abc Str.", "42", "58644" + "Iserlohn", "c/o Youco24 Business Center, Abc Str.", "42", "58644" ), "relationships": [], }, @@ -742,8 +742,8 @@ def test_map_last_update() -> None: "location": Location("Iserlohn", "Abc Str.", "42", "58644"), "relationships": [ CompanyToCompanyRelationship( - RelationshipRoleEnum.LOKATION_BEI, # type: ignore - Location("Iserlohn", "Abc ffda", "42", "58644"), + RelationshipRoleEnum.CARE_OF, # type: ignore + Location("Iserlohn", "Abc Str.", "42", "58644"), CompanyRelationshipEnum.COMPANY, "Youco24 Business Center", ) @@ -753,7 +753,7 @@ def test_map_last_update() -> None: ( { "location": Location( - "Iserlohn", "Abc Str. 42, c/o Youco24 Business Center", None, "58644" + "Iserlohn", "Abc Str., c/o Youco24 Business Center", "42", "58644" ), "relationships": [], }, @@ -761,8 +761,8 @@ def test_map_last_update() -> None: "location": Location("Iserlohn", "Abc Str.", "42", "58644"), "relationships": [ CompanyToCompanyRelationship( - RelationshipRoleEnum.LOKATION_BEI, # type: ignore - Location("Iserlohn", "Abc ffda", "42", "58644"), + RelationshipRoleEnum.CARE_OF, # type: ignore + Location("Iserlohn", "Abc Str.", "42", "58644"), CompanyRelationshipEnum.COMPANY, "Youco24 Business Center", ) @@ -771,9 +771,7 @@ def test_map_last_update() -> None: ), ( { - "location": Location( - "Iserlohn", "Abc Str. 42, c/o", None, "58644" - ), + "location": Location("Iserlohn", "Abc Str., c/o", "42", "58644"), "relationships": [], }, {