From 982cbd7ad454bee371502cd83b56312849988ea5 Mon Sep 17 00:00:00 2001
From: TrisNol <tristan.nolde@yahoo.de>
Date: Sun, 5 Nov 2023 19:59:13 +0100
Subject: [PATCH] refactor: Resolve leftover todos

---
 .../apps/find_missing_companies.py                        | 2 +-
 .../unternehmensregister/transform/main.py                | 8 +++-----
 .../unternehmensregister/transform/v1/v1.py               | 1 -
 .../unternehmensregister/transform/v3/v3.py               | 1 -
 4 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/src/aki_prj23_transparenzregister/apps/find_missing_companies.py b/src/aki_prj23_transparenzregister/apps/find_missing_companies.py
index cf0e1bb..29ec97d 100644
--- a/src/aki_prj23_transparenzregister/apps/find_missing_companies.py
+++ b/src/aki_prj23_transparenzregister/apps/find_missing_companies.py
@@ -126,7 +126,7 @@ if __name__ == "__main__":
 
     missing_companies = (
         session.query(entities.MissingCompany)
-        .where(entities.MissingCompany.searched_for is False)
+        .where(entities.MissingCompany.searched_for == False)  # noqa
         .all()
     )
 
diff --git a/src/aki_prj23_transparenzregister/utils/data_extraction/unternehmensregister/transform/main.py b/src/aki_prj23_transparenzregister/utils/data_extraction/unternehmensregister/transform/main.py
index 6459311..dc57093 100644
--- a/src/aki_prj23_transparenzregister/utils/data_extraction/unternehmensregister/transform/main.py
+++ b/src/aki_prj23_transparenzregister/utils/data_extraction/unternehmensregister/transform/main.py
@@ -57,7 +57,6 @@ def determine_version(data: dict) -> BaseTransformer:
         module: Version module
     """
     if "XJustiz_Daten" in data:
-        # TODO consider class inheritance for version modules
         return v1.V1_Transformer()
     if "tns:nachrichtenkopf" in data[list(data.keys())[0]]:
         return v3.V3_Transformer()
@@ -79,14 +78,13 @@ def map_unternehmensregister_json(data: dict) -> Company:
 
 if __name__ == "__main__":
     base_path = "./Jupyter/API-tests/Unternehmensregister/data/Unternehmensregister"
-    # TODO Adapt to new structure with different versions
     for file in tqdm(glob.glob1(f"{base_path}/export", "*.json")):
         path = os.path.join(f"{base_path}/export", file)
         with open(path, encoding="utf-8") as file_object:
             try:
-                company: Company = map_unternehmensregister_json(
-                    json.loads(file_object.read())
-                )
+                data = json.loads(file_object.read())
+                transformer: BaseTransformer = determine_version(data)
+                company: Company = transformer.map_unternehmensregister_json(data)
 
                 name = "".join(e for e in company.name if e.isalnum())[:50]
 
diff --git a/src/aki_prj23_transparenzregister/utils/data_extraction/unternehmensregister/transform/v1/v1.py b/src/aki_prj23_transparenzregister/utils/data_extraction/unternehmensregister/transform/v1/v1.py
index 77993d2..6cb60e7 100644
--- a/src/aki_prj23_transparenzregister/utils/data_extraction/unternehmensregister/transform/v1/v1.py
+++ b/src/aki_prj23_transparenzregister/utils/data_extraction/unternehmensregister/transform/v1/v1.py
@@ -435,7 +435,6 @@ class V1_Transformer(BaseTransformer):  # noqa: N801
         """
         result: dict = {"relationships": []}
 
-        # TODO Refactor mapping - this is a nightmare...
         result["id"] = self.map_company_id(data)
         result["name"] = self.name_from_beteiligung(data)
 
diff --git a/src/aki_prj23_transparenzregister/utils/data_extraction/unternehmensregister/transform/v3/v3.py b/src/aki_prj23_transparenzregister/utils/data_extraction/unternehmensregister/transform/v3/v3.py
index 70f97cb..b787d4d 100644
--- a/src/aki_prj23_transparenzregister/utils/data_extraction/unternehmensregister/transform/v3/v3.py
+++ b/src/aki_prj23_transparenzregister/utils/data_extraction/unternehmensregister/transform/v3/v3.py
@@ -526,7 +526,6 @@ class V3_Transformer(BaseTransformer):  # noqa: N801
         path = ["tns:fachdatenRegister", "tns:auszug", "tns:letzteEintragung"]
         return traversal(data, path)
 
-    # TODO class model with inheritance - only difference: Determine root in __init__
     def map_unternehmensregister_json(self, data: dict) -> Company:
         """Processes the Unternehmensregister structured export to a Company by using several helper methods.