From 193217b495a9c52925eb54f7e6b80a9ebee44de1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fr=C3=A9d=C3=A9ric=20P=C3=A9ters?= <fpeters@entrouvert.com>
Date: Tue, 18 Oct 2022 11:33:26 +0200
Subject: [PATCH] sigerly: allow for new nom_rue parameter (and elements as not
 required) (#70409)

---
 passerelle/contrib/sigerly/models.py |  9 +++++++--
 tests/test_sigerly.py                | 25 +++++++++++++++++++++++++
 2 files changed, 32 insertions(+), 2 deletions(-)

diff --git a/passerelle/contrib/sigerly/models.py b/passerelle/contrib/sigerly/models.py
index b3b453e4..a7d3bad2 100644
--- a/passerelle/contrib/sigerly/models.py
+++ b/passerelle/contrib/sigerly/models.py
@@ -26,7 +26,7 @@ from passerelle.utils.jsonresponse import APIError
 CREATE_SCHEMA = {
     '$schema': 'http://json-schema.org/draft-04/schema#',
     "type": "object",
-    'required': ['demandeur', 'id_typeinterv', 'id_urgence', 'elements'],
+    'required': ['demandeur', 'id_typeinterv', 'id_urgence'],
     'properties': {
         'demandeur': {
             'description': "Nom du demandeur",
@@ -53,6 +53,10 @@ CREATE_SCHEMA = {
             'type': 'string',
             'pattern': r'^[0-9A-Z :]+$',
         },
+        'nom_rue': {
+            'description': 'Adresse',
+            'type': 'string',
+        },
     },
 }
 
@@ -120,7 +124,8 @@ class Sigerly(BaseResource, HTTPResource):
         post_data['id_typeinterv'] = int(post_data['id_typeinterv'])
         post_data['id_urgence'] = int(post_data['id_urgence'])
         post_data['id_qualification'] = int(post_data['id_qualification'])
-        post_data['elements'] = [x.strip() for x in post_data['elements'].split(':') if x.strip()]
+        if 'elements' in post_data:
+            post_data['elements'] = [x.strip() for x in post_data['elements'].split(':') if x.strip()]
 
         response = self.request('createIntervention.php', json=post_data)
         if not response.get('success', None):
diff --git a/tests/test_sigerly.py b/tests/test_sigerly.py
index 36787e18..93d973c9 100644
--- a/tests/test_sigerly.py
+++ b/tests/test_sigerly.py
@@ -79,6 +79,31 @@ def test_create(app, connector):
     def sigerly_mock(url, request):
         assert request.headers['Accept'] == 'application/json'
         assert json.loads(request.body)['elements'] == ['LIMW003D', 'LIMWW003C']
+        assert 'nom_rue' not in json.loads(request.body)
+        return httmock.response(200, json.dumps({'success': True, 'message': '7830'}))
+
+    with httmock.HTTMock(sigerly_mock):
+        resp = app.post_json(endpoint, params=payload)
+    assert not resp.json['err']
+    assert resp.json['data']['message'] == '7830'  # id unusable within query endpoint
+
+
+def test_create_nom_rue(app, connector):
+    endpoint = get_endpoint('create')
+    payload = {
+        'demandeur': 'Test webservice',
+        'id_typeinterv': '5',
+        'id_urgence': '1',
+        'id_qualification': '8',
+        'observations': 'Test webservice',
+        'nom_rue': 'some place',
+    }
+
+    @httmock.urlmatch(netloc='sigerly.example.net', path='/createIntervention.php', method='POST')
+    def sigerly_mock(url, request):
+        assert request.headers['Accept'] == 'application/json'
+        assert json.loads(request.body)['nom_rue'] == 'some place'
+        assert 'elements' not in json.loads(request.body)
         return httmock.response(200, json.dumps({'success': True, 'message': '7830'}))
 
     with httmock.HTTMock(sigerly_mock):