0001-atal-return-works-comment-and-hide-raw-data-37669.patch

Emmanuel Cazenave, 18 novembre 2019 10:59

Voir les différences: en ligne côte à côte

Subject: [PATCH] atal: return works comment and hide raw data (#37669)

 passerelle/apps/atal/models.py | 35 +++++++++++++++++++++++-----------
 tests/test_atal.py             | 21 ++++++++++++++++----
 2 files changed, 41 insertions(+), 15 deletions(-)

             parameters={
                 'demand_number': {
                     'description': _('Demande number'), 'example_value': 'DIT18050001'
                 },
                 'full': {
                     'description': _('Full'),
                     'example_value': 'true',
                     'type': 'bool',
+                }
+            }
+        )
         def infos(self, request, demand_number):
         def infos(self, request, demand_number, full=False):
             demand_details = helpers.serialize_object(
                 self._soap_call(
                     wsdl='DemandeService', method='retrieveDetailsDemande',
-...
                 raise APIError('Could not get a status')
             responses = (demand_details.get('reponses') or {}).get('Reponse') or []
             comments = []
             demand_comments = []
             if responses:
                 for response in responses:
                     comment = {
-...
+                    }
                     if 'dateReponse' in response:
                         comment['date'] = dateformat.format(response['dateReponse'], DATE_FORMAT)
                     comments.append(comment)
                     demand_comments.append(comment)
             last_comment = {
             demand_comment = {
                 'text': None,
                 'date': None
+            }
             if comments:
                 last_comment = comments[-1]
             if demand_comments:
                 demand_comment = demand_comments[-1]
             data = {
                 'status': status,
                 'demand_details': demand_details,
                 'comments': comments,
                 'last_comment': last_comment,
                 'demand_comment': demand_comment,
                 'demand_details': None,
                 'demand_comments': []
+            }
             if full:
                 data['demand_details'] = demand_details
                 data['demand_comments'] = demand_comments
             if status not in ('PRISE EN COMPTE', 'ARCHIVEE'):
                 return {
                     'data': data
-...
             if not status:
                 raise APIError('Could not get a status')
             data['works_status'] = works_status
             data['status'] = status
             data['works_comment'] = works_status.get('commentaires', '')
             data['works_status'] = None
             if full:
                 data['works_status'] = works_status
             return {
                 'data': data
+            }

         assert response.json['err'] == 0
         data = response.json['data']
         assert data['status'] == u'travaux pas commencés'
         assert data['demand_comment'] == {
             'text': 'bonjour atal',
             'date': 'Thursday 24 October 2019, 16:51'
+        }
         assert data['demand_comments'] == []
         assert data['works_comment'] is None
         assert data['works_status'] is None
         assert len(data['comments']) == 2
         assert data['comments'][0] == {
         # full in query string
         monkeypatch.setattr(
             passerelle.utils.Request, 'post', mock.Mock(side_effect=[api_response1, api_response2])
+        )
         response = app.get('/atal/slug-atal/infos/DIT18050001/?full=true')
         data = response.json['data']
         assert len(data['demand_comments']) == 2
         assert data['demand_comments'][0] == {
             'text': 'OK',
             'date': 'Thursday 24 October 2019, 16:48'
+        }
-...
             'text': 'bonjour atal',
             'date': 'Thursday 24 October 2019, 16:51'
+        }
         assert data['comments'][1] == last_comment
         assert data['last_comment'] == last_comment
         assert data['demand_comments'][1] == last_comment
         assert data['demand_comment'] == last_comment
+    -

Projet

Général

Profil

Produits Entr'ouvert » Passerelle

0001-atal-return-works-comment-and-hide-raw-data-37669.patch