Projet

Général

Profil

0001-atal-factor-endpoint-parameter-41533.patch

Emmanuel Cazenave, 09 avril 2020 16:00

Télécharger (3,51 ko)

Voir les différences:

Subject: [PATCH 1/2] atal: factor endpoint parameter (#41533)

 passerelle/apps/atal/models.py | 27 +++++++++++++--------------
 1 file changed, 13 insertions(+), 14 deletions(-)
passerelle/apps/atal/models.py
50 50
    class Meta:
51 51
        verbose_name = _('ATAL connector')
52 52

  
53
    DEMANDE_NUMBER_PARAM = {
54
        'description': _('Demande number'),
55
        'example_value': 'DIT18050001'
56
    }
57

  
53 58
    def _soap_call(self, wsdl, method, **kwargs):
54 59
        wsdl_url = urllib.parse.urljoin(self.base_soap_url, '%s?wsdl' % wsdl)
55 60
        client = self.soap_client(wsdl_url=wsdl_url)
......
171 176
        methods=['get'], perm='can_access', example_pattern='{demande_number}/',
172 177
        pattern='^(?P<demande_number>\w+)/$', name='retrieve-details-demande',
173 178
        parameters={
174
            'demande_number': {
175
                'description': _('Demande number'), 'example_value': 'DIT18050001'
176
            }
179
            'demande_number': DEMANDE_NUMBER_PARAM
177 180
        }
178 181
    )
179 182
    def retrieve_details_demande(self, request, demande_number):
......
186 189
        methods=['get'], perm='can_access', example_pattern='{demande_number}/',
187 190
        pattern='^(?P<demande_number>\w+)/$', name='retrieve-etat-travaux',
188 191
        parameters={
189
            'demande_number': {
190
                'description': _('Demande number'), 'example_value': 'DIT18050001'
191
            }
192
            'demande_number': DEMANDE_NUMBER_PARAM
192 193
        }
193 194
    )
194 195
    def retrieve_etat_travaux(self, request, demande_number):
......
198 199
        return {'data': helpers.serialize_object(soap_res)}
199 200

  
200 201
    @endpoint(
201
        methods=['get'], perm='can_access', example_pattern='{demand_number}/',
202
        pattern='^(?P<demand_number>\w+)/$',
202
        methods=['get'], perm='can_access', example_pattern='{demande_number}/',
203
        pattern='^(?P<demande_number>\w+)/$',
203 204
        parameters={
204
            'demand_number': {
205
                'description': _('Demande number'), 'example_value': 'DIT18050001'
206
            },
205
            'demande_number': DEMANDE_NUMBER_PARAM,
207 206
            'full': {
208 207
                'description': _('Full'),
209 208
                'example_value': 'true',
......
211 210
            }
212 211
        }
213 212
    )
214
    def infos(self, request, demand_number, full=False):
213
    def infos(self, request, demande_number, full=False):
215 214
        demand_details = helpers.serialize_object(
216 215
            self._soap_call(
217 216
                wsdl='DemandeService', method='retrieveDetailsDemande',
218
                demandeNumberParam=demand_number)
217
                demandeNumberParam=demande_number)
219 218
        )
220 219
        if not demand_details:
221 220
            raise APIError('Could not get a status')
......
261 260
        works_status = helpers.serialize_object(
262 261
            self._soap_call(
263 262
                wsdl='DemandeService', method='retrieveEtatTravaux',
264
                numero=demand_number
263
                numero=demande_number
265 264
            )
266 265
        )
267 266
        status = works_status.get('libelle')
268
-