Philipp/aki_prj23_transparenzregister
Philipp/aki_prj23_transparenzregister
1
0
Fork 0
mirror of https://github.com/fhswf/aki_prj23_transparenzregister.git synced 2025-04-25 21:12:34 +02:00
Code Issues Packages Projects Releases Wiki Activity

refactor: Resolve leftover todos

Browse Source
This commit is contained in:
TrisNol 2023-11-05 19:59:13 +01:00
parent f9d3f0eb76
commit 982cbd7ad4
4 changed files with 4 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/aki_prj23_transparenzregister/apps/find_missing_companies.py
View File

@ -126,7 +126,7 @@ if __name__ == "__main__":
missing_companies = ( missing_companies = (
session.query(entities.MissingCompany) session.query(entities.MissingCompany)
.where(entities.MissingCompany.searched_for is False) .where(entities.MissingCompany.searched_for == False) # noqa
.all() .all()
) )

8
src/aki_prj23_transparenzregister/utils/data_extraction/unternehmensregister/transform/main.py
View File

@ -57,7 +57,6 @@ def determine_version(data: dict) -> BaseTransformer:
module: Version module module: Version module
""" """
if "XJustiz_Daten" in data: if "XJustiz_Daten" in data:
# TODO consider class inheritance for version modules
return v1.V1_Transformer() return v1.V1_Transformer()
if "tns:nachrichtenkopf" in data[list(data.keys())[0]]: if "tns:nachrichtenkopf" in data[list(data.keys())[0]]:
return v3.V3_Transformer() return v3.V3_Transformer()
@ -79,14 +78,13 @@ def map_unternehmensregister_json(data: dict) -> Company:
if __name__ == "__main__": if __name__ == "__main__":
base_path = "./Jupyter/API-tests/Unternehmensregister/data/Unternehmensregister" 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")): for file in tqdm(glob.glob1(f"{base_path}/export", "*.json")):
path = os.path.join(f"{base_path}/export", file) path = os.path.join(f"{base_path}/export", file)
with open(path, encoding="utf-8") as file_object: with open(path, encoding="utf-8") as file_object:
try: try:
company: Company = map_unternehmensregister_json( data = json.loads(file_object.read())
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] name = "".join(e for e in company.name if e.isalnum())[:50]

1
src/aki_prj23_transparenzregister/utils/data_extraction/unternehmensregister/transform/v1/v1.py
View File

@ -435,7 +435,6 @@ class V1_Transformer(BaseTransformer): # noqa: N801
""" """
result: dict = {"relationships": []} result: dict = {"relationships": []}
# TODO Refactor mapping - this is a nightmare...
result["id"] = self.map_company_id(data) result["id"] = self.map_company_id(data)
result["name"] = self.name_from_beteiligung(data) result["name"] = self.name_from_beteiligung(data)

1
src/aki_prj23_transparenzregister/utils/data_extraction/unternehmensregister/transform/v3/v3.py
View File

@ -526,7 +526,6 @@ class V3_Transformer(BaseTransformer): # noqa: N801
path = ["tns:fachdatenRegister", "tns:auszug", "tns:letzteEintragung"] path = ["tns:fachdatenRegister", "tns:auszug", "tns:letzteEintragung"]
return traversal(data, path) return traversal(data, path)
# TODO class model with inheritance - only difference: Determine root in __init__
def map_unternehmensregister_json(self, data: dict) -> Company: def map_unternehmensregister_json(self, data: dict) -> Company:
"""Processes the Unternehmensregister structured export to a Company by using several helper methods. """Processes the Unternehmensregister structured export to a Company by using several helper methods.