From 749338be68d9f3b2231ee05f507d95797ec2c122 Mon Sep 17 00:00:00 2001
From: Hendrik Huyskens <hendrik.huyskens@rl-institut.de>
Date: Fri, 6 Oct 2023 10:24:18 +0200
Subject: [PATCH] Minor naming change

---
 data_adapter_oemof/adapters.py          |  8 ++++----
 data_adapter_oemof/build_datapackage.py |  2 +-
 data_adapter_oemof/mappings.py          | 12 ++++++------
 3 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/data_adapter_oemof/adapters.py b/data_adapter_oemof/adapters.py
index b3f7d2a..7b4e611 100644
--- a/data_adapter_oemof/adapters.py
+++ b/data_adapter_oemof/adapters.py
@@ -4,7 +4,7 @@
 from oemof.tabular._facade import Facade
 
 from data_adapter_oemof import calculations
-from data_adapter_oemof.mappings import Mapper, field_mock
+from data_adapter_oemof.mappings import Field, Mapper
 
 logger = logging.getLogger()
 
@@ -12,9 +12,9 @@
 class Adapter:
     type: str = "adapter"
     facade: Facade = None
-    extra_attributes = (
-        field_mock(name="name", type=str),
-        field_mock(name="type", type=str),
+    extra_fields = (
+        Field(name="name", type=str),
+        Field(name="type", type=str),
     )
 
     def as_dict(self) -> dict:
diff --git a/data_adapter_oemof/build_datapackage.py b/data_adapter_oemof/build_datapackage.py
index de6184b..0899bc5 100644
--- a/data_adapter_oemof/build_datapackage.py
+++ b/data_adapter_oemof/build_datapackage.py
@@ -125,7 +125,7 @@ def get_foreign_keys(struct: list, mapper: Mapper, components: list) -> list:
                 {"fields": bus, "reference": {"fields": "name", "resource": "bus"}}
             )
 
-        for field in mapper.fields_names():
+        for field in mapper.get_fields():
             if (
                 mapper.is_sequence(field.type)
                 and field.name in components.columns
diff --git a/data_adapter_oemof/mappings.py b/data_adapter_oemof/mappings.py
index 2f5a109..7716c5b 100644
--- a/data_adapter_oemof/mappings.py
+++ b/data_adapter_oemof/mappings.py
@@ -16,7 +16,7 @@
     "tech": "tech",
 }
 
-field_mock = collections.namedtuple(typename="field_mock", field_names=["name", "type"])
+Field = collections.namedtuple(typename="Field", field_names=["name", "type"])
 
 
 class MappingError(Exception):
@@ -44,11 +44,11 @@ def __init__(
         self.mapping = mapping
         self.bus_map = bus_map
 
-    def fields_names(self):
+    def get_fields(self):
         return [
-            field_mock(name=field.name, type=field.type)
+            Field(name=field.name, type=field.type)
             for field in dataclasses.fields(self.adapter.facade)
-        ] + list(self.adapter.extra_attributes)
+        ] + list(self.adapter.extra_fields)
 
     def map_key(self, key):
         """Use adapter specific mapping if available, otherwise use default
@@ -152,7 +152,7 @@ def get_busses(self, struct):
         :return: dictionary with tabular like Busses
         """
         bus_occurrences_in_fields = [
-            field.name for field in self.fields_names() if "bus" in field.name
+            field.name for field in self.get_fields() if "bus" in field.name
         ]
         if len(bus_occurrences_in_fields) == 0:
             logger.warning(
@@ -220,7 +220,7 @@ def get_default_mappings(self, struct):
 
         mapped_all_class_fields = {
             field.name: value
-            for field in self.fields_names()
+            for field in self.get_fields()
             if (value := self.get(field.name, field.type)) is not None
         }
         mapped_all_class_fields.update(self.get_busses(struct))