Merge branch 'main' into wip/73734-parsifal-person-activity-catalog

passerelle/apps/api_entreprise/models.py

@@ -410,6 +410,7 @@ class APIEntreprise(BaseResource):
         code_insee_localite = data.get('adresse', {}).get('code_commune', '')
         data['adresse']['localite'] = localite
         data['adresse']['code_insee_localite'] = code_insee_localite
+        data['adresse']['nom_voie'] = data.get('adresse', {}).get('libelle_voie', '')
         data['commune_implantation'] = {'code': code_insee_localite, 'value': localite}
         data['tranche_effectif_salarie_etablissement'] = data.get('tranche_effectif_salarie', {})
         for i in range(1, 8):

passerelle/apps/franceconnect_data/fc.py

@@ -177,6 +177,16 @@ class FranceConnect:
         data[annrev] = dgfip_ressource_ir_response
         self.add('dgfip_ressource_ir_response', data)
 
+    def request_dgfip_last_known_ir(self):
+        ir = {}
+        for year, response in self.dgfip_ressource_ir_response.items():
+            if response.get('error'):
+                continue
+            if ir.get('year', '0') < year:
+                ir = response
+                ir['year'] = year
+        self.add('dgfip_ressource_last_known_ir_response', ir)
+
     def __getattr__(self, name):
         try:
             return dict(self.items)[name]

passerelle/apps/franceconnect_data/models.py

@@ -186,7 +186,9 @@ class Resource(BaseResource):
                 current_year = now().year
                 for year in range(current_year - 3, current_year):
                     franceconnect.request_dgfip_ir(str(year), id_teleservice=self.dgfip_id_teleservice)
+                franceconnect.request_dgfip_last_known_ir()
                 token['dgfip_ir'] = franceconnect.dgfip_ressource_ir_response
+                token['dgfip_ir']['last_known'] = franceconnect.dgfip_ressource_last_known_ir_response
             try:
                 template = Template(self.text_template)
                 text_template_context = {

tests/test_api_entreprise.py

@@ -50,7 +50,7 @@ ETABLISSEMENTS_RESPONSE = {
             },
             "numero_voie": "50",
             "type_voie": "AV",
-            "nom_voie": "DES CHAMPS ELYSEES",
+            "libelle_voie": "DES CHAMPS ELYSEES",
             "code_postal": "75008",
             "libelle_commune": "PARIS 8",
             "code_commune": "75108",
@@ -562,6 +562,8 @@ def test_etablissements_endpoint(app, resource):
     assert data['etablissement']['adresse']['code_postal'] == '75008'
     assert data['etablissement']['adresse']['localite'] == 'PARIS 8'
     assert data['etablissement']['adresse']['code_insee_localite'] == '75108'
+    assert data['etablissement']['adresse']['nom_voie'] == 'DES CHAMPS ELYSEES'
+    assert data['etablissement']['adresse']['libelle_voie'] == 'DES CHAMPS ELYSEES'
     assert data['etablissement']['adresse']['l1'] == 'OCTO TECHNOLOGY'
     assert data['etablissement']['adresse']['l2'] is None
     assert data['etablissement']['adresse']['l3'] is None

tests/test_franceconnect_data.py

@@ -59,7 +59,7 @@ DGFIP_MOCKED_RESPONSES = USER_INFO_MOCKED_RESPONSES + [
 DGFIP_MOCKED_RESPONSES += [
     [
         '/impotparticulier/1.0/situations/ir/assiettes/annrev/%s' % year,
-        {'rfr': 0, 'revenuBrutGlobal': 0},
+        {'rfr': year * 2, 'revenuBrutGlobal': year * 10},
     ]
     for year in range(CURRENT_YEAR - 3, CURRENT_YEAR)
 ]
@@ -165,3 +165,9 @@ def test_dgfip_mode(app, fc):
     assert data['dgfip_ir']
     for year in range(CURRENT_YEAR - 3, CURRENT_YEAR):
         assert data['dgfip_ir'][str(year)]
+    assert 'last_known' in data['dgfip_ir']
+    last_known_ir = data['dgfip_ir']['last_known']
+    past_year = CURRENT_YEAR - 1
+    assert last_known_ir['year'] == str(past_year)
+    assert last_known_ir['revenuBrutGlobal'] == past_year * 10
+    assert last_known_ir['rfr'] == past_year * 2