Projet

Général

Profil

0001-cartads-cs-add-reference-number-and-access-code-to-s.patch

Frédéric Péters, 15 octobre 2019 14:52

Télécharger (2,73 ko)

Voir les différences: 

Subject: [PATCH] cartads cs: add reference number and access code to status
 response (#36940)


 passerelle/apps/cartads_cs/models.py | 11 +++++++----
 tests/test_cartads_cs.py             |  1 +
 2 files changed, 8 insertions(+), 4 deletions(-)
passerelle/apps/cartads_cs/models.py
942 942 

  		




  943
  943
  
    
    def get_file_status(self, dossier):

  		




  944
  944
  
    
        extra = None

  		




  
  945
  
    
        response = {}

  		




  945
  946
  
    
        if dossier.cartads_id_dossier:

  		




  946
  947
  
    
            if dossier.cartads_steps_cache:

  		




  947
  948
  
    
                steps = dossier.cartads_steps_cache['steps']

  		




  ......




  953
  954
  
    
            steps.sort(key=lambda x: x['DateReference'])

  		




  954
  955
  
    
            status_id = 'cartads-%s' % steps[-1]['IdEtape']

  		




  955
  956
  
    
            status_label = steps[-1]['LibelleEtape']

  		




  956
  
  
    
            extra = {}

  		




  
  957
  
    
            response['extra'] = {}

  		




  957
  958
  
    
            for key in steps[-1]:

  		




  958
  
  
    
                extra[key] = steps[-1][key]

  		




  
  959
  
    
                response['extra'][key] = steps[-1][key]

  		




  
  960
  
    
            response['cartads_reference_dossier'] = dossier.cartads_numero_dossier

  		




  
  961
  
    
            response['cartads_code_acces'] = dossier.cartads_cache_code_acces

  		




  959
  962
  
    
        elif dossier.notification_message:  # but not dossier id -> error

  		




  960
  963
  
    
            status_id = 'refused'

  		




  961
  964
  
    
            notification = etree.fromstring(dossier.notification_message.encode('utf-8'))

  		




  ......




  973
  976
  
    
        else:

  		




  974
  977
  
    
            status_id = 'pending'

  		




  975
  978
  
    
            status_label = _('Pending')

  		




  976
  
  
    
        return {'status_id': status_id, 'status_label': status_label, 'extra': extra}

  		




  977
  
  
    

  		




  
  979
  
    
        response.update({'status_id': status_id, 'status_label': status_label})

  		




  
  980
  
    
        return response

  		




  978
  981
  
    

  		




  979
  982
  
    
    @endpoint(perm='can_access',

  		




  980
  983
  
    
              description=_('Get status of file'),

  		












  

    
      tests/test_cartads_cs.py
    
  





  390
  390
  
    
        client.return_value = mock.Mock(service=FakeService())

  		




  391
  391
  
    
        resp = app.get('/cartads-cs/test/status?dossier_id=%s' % dossier.id)

  		




  392
  392
  
    
        assert resp.json['status_label'] == 'En cours de saisie'

  		




  
  393
  
    
        assert resp.json['cartads_reference_dossier'] == 'CU 044 043 19 A0006'

  		




  393
  394
  
    

  		




  394
  395
  
    
    # test it got cached

  		




  395
  396
  
    
    resp = app.get('/cartads-cs/test/status?dossier_id=%s' % dossier.id)

  		




  396
  
  
    
-