Merge pull request #18 from statisticsnorway/bugfix

Bugfix

pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "ssb-jordbruk-fagfunksjoner"
-version = "0.2.0"
+version = "0.2.1"
 description = "SSB Jordbruk Fagfunksjoner"
 authors = ["Magnus Theodor Engh <dor@ssb.no>"]
 license = "MIT"

src/ssb_jordbruk_fagfunksjoner/produksjonstilskudd.py

@@ -253,11 +253,11 @@ class Produksjonstilskudd:
     }
 
     statbank_groups: ClassVar[dict[str, list[str]]] = {
-        "storfe": ["119", "120", "121"],
-        "ku": ["120", "121"],
-        "sau": ["145", "146", "139"],
-        "avlssvin": ["155", "156", "158", "159"],
-        "svin": ["154", "155", "156", "157", "158", "159"],
+        "statbank_storfe": ["119", "120", "121"],
+        "statbank_ku": ["120", "121"],
+        "statbank_sau": ["145", "146", "139"],
+        "statbank_avlssvin": ["155", "156", "158", "159"],
+        "statbank_svin": ["154", "155", "156", "157", "158", "159"],
     }
 
     def __init__(self) -> None:
@@ -286,6 +286,9 @@ def _setup_dynamic_attributes(self) -> None:
                 combined_dict.update(getattr(self, group, {}))
             setattr(self, combo_name, combined_dict)
 
+        for statbank_name, codes in self.statbank_groups.items():
+            setattr(self, statbank_name, self._extract_from_codelist(codes))
+
     def _extract_from_codelist(self, numbers: list[str]) -> dict[str, str]:
         result = {}
         for code in numbers:

tests/test_produksjonstilskudd.py

@@ -57,5 +57,16 @@ def test_dynamic_combinations_creation(
     ), "Instance should have 'frukt' combination attribute"
     combination = produksjonstilskudd_instance.frukt
     assert (
-        "001" in combination or "271" in combination
+        "001" in combination and "271" in combination
     ), "'frukt' combination should contain codes from its groups"
+
+
+def test_dynamic_statbank_creation(
+    produksjonstilskudd_instance: Produksjonstilskudd,
+) -> None:
+    assert hasattr(
+        produksjonstilskudd_instance, "statbank_storfe"
+    ), "Instance should have 'statbank_storfe' attribute"
+    assert isinstance(
+        produksjonstilskudd_instance.statbank_storfe, dict
+    ), "'statbank_storfe' should be a dictionary"