fix(links): use dynamic person entity key instead of hardcoded 'person'

ImplicitOne2ManyLink hardcoded target_entity_key='person', which crashes
when the person entity has a different key (e.g. 'individu' in
openfisca-france).

This fix adds a person_entity_key parameter to ImplicitOne2ManyLink
and passes the actual person entity key from Simulation._resolve_links().

Fixes the France API crash:
  KeyError: "Link 'individus': target entity 'person' not found in
  populations ['individu', 'famille', 'foyer_fiscal', 'menage']"

Author: benjello

openfisca_core/links/implicit.py

@@ -38,11 +38,11 @@ def _project_implicit(self, result: numpy.ndarray) -> numpy.ndarray:
 class ImplicitOne2ManyLink(One2ManyLink):
     """A group → person link using GroupPopulation's internal arrays."""
 
-    def __init__(self, name: str, group_entity_key: str):
+    def __init__(self, name: str, group_entity_key: str, person_entity_key: str):
         super().__init__(
             name=name,
             link_field="",  # Not used
-            target_entity_key="person",  # The target of the O2M is persons
+            target_entity_key=person_entity_key,
         )
         self._group_entity_key = group_entity_key
 

openfisca_core/links/tests/test_edge_cases.py

@@ -294,7 +294,7 @@ class is_female(variables.Variable):
         )
 
         # Create and bind implicit link
-        link = ImplicitOne2ManyLink("persons", "household")
+        link = ImplicitOne2ManyLink("persons", "household", "person")
         pop = sim.populations["household"]
         link.attach(pop)
         link.resolve(sim.populations)

openfisca_core/links/tests/test_implicit.py

@@ -62,7 +62,7 @@ def test_implicit_many2one(sim):
 
 
 def test_implicit_one2many(sim):
-    link = ImplicitOne2ManyLink("persons", "household")
+    link = ImplicitOne2ManyLink("persons", "household", "person")
     link.attach(sim.populations["household"])
     link.resolve(sim.populations)
 

openfisca_core/simulations/simulation.py

@@ -115,7 +115,7 @@ def _resolve_links(self) -> None:
             # group -> persons (One2Many)
             o2m_name = person_entity.plural
             if not population.entity.get_link(o2m_name):
-                o2m = ImplicitOne2ManyLink(o2m_name, group_key)
+                o2m = ImplicitOne2ManyLink(o2m_name, group_key, person_entity.key)
                 population.entity.add_link(o2m)
 
         from copy import copy

tests/core/test_link_accessors.py

@@ -53,7 +53,7 @@ class rent(variables.Variable):
 
 
 def test_nth_accessor(simple_sim):
-    link = ImplicitOne2ManyLink("persons", "household")
+    link = ImplicitOne2ManyLink("persons", "household", "person")
     link.attach(simple_sim.populations["household"])
     link.resolve(simple_sim.populations)
 
@@ -67,7 +67,7 @@ def test_nth_accessor(simple_sim):
 
 
 def test_one2many_get_by_role(simple_sim):
-    link = ImplicitOne2ManyLink("persons", "household")
+    link = ImplicitOne2ManyLink("persons", "household", "person")
     link.attach(simple_sim.populations["household"])
     link.resolve(simple_sim.populations)