0001-cartads_cs-add-endpoint-and-job-to-send-additional-f.patch

Frédéric Péters, 13 septembre 2019 13:24

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

Subject: [PATCH 1/2] cartads_cs: add endpoint and job to send additional files
 to cartads (#36025)

 .../0005_cartadsfile_sent_to_cartads.py       | 24 +++++++
 passerelle/apps/cartads_cs/models.py          | 64 +++++++++++++++++++
 tests/test_cartads_cs.py                      | 19 ++++++
 3 files changed, 107 insertions(+)
 create mode 100644 passerelle/apps/cartads_cs/migrations/0005_cartadsfile_sent_to_cartads.py

     # -*- coding: utf-8 -*-
     # Generated by Django 1.11.12 on 2019-09-13 06:50
     from __future__ import unicode_literals
     from django.db import migrations, models
     class Migration(migrations.Migration):
         dependencies = [
             ('cartads_cs', '0004_cartadsdossier_cartads_steps_cache'),
+        ]
         operations = [
             migrations.AlterModelOptions(
                 name='cartadsfile',
                 options={'ordering': ['id']},
             ),
             migrations.AddField(
                 model_name='cartadsfile',
                 name='sent_to_cartads',
                 field=models.DateTimeField(null=True),
             ),
+        ]

     from django.db import models
     from django.http import HttpResponse
     from django.utils.encoding import force_text
     from django.utils.timezone import now
     from django.utils.translation import ugettext_lazy as _
     from django.utils.six.moves.urllib import parse as urlparse
     from jsonfield import JSONField
     import zeep.exceptions
     import zeep.helpers as zeep_helpers
     from passerelle.base.models import BaseResource
-...
         tracking_code = models.CharField(max_length=20)
         id_piece = models.CharField(max_length=20)
         uploaded_file = models.FileField(upload_to=cartads_file_location)
         sent_to_cartads = models.DateTimeField(null=True)
         last_update_datetime = models.DateTimeField(auto_now=True)
         class Meta:
             ordering = ['id']
     class CartaDSDossier(models.Model):
         email = models.CharField(max_length=256)
-...
             dossier.zip_sent = True
             dossier.zip_ack_response = str(resp)
             dossier.save()
             CartaDSFile.objects.filter(tracking_code=dossier.tracking_code).update(sent_to_cartads=now())
         @endpoint(pattern='^(?P<signed_dossier_id>[\w:_-]+)/$',
                 methods=['post'],
-...
             dossier.save()
             return HttpResponse('ok', content_type='text/plain')
         @endpoint(perm='can_access',
                   description=_('Send requested additional file items'),
                   parameters={
                       'tracking_code': TRACKING_CODE_PARAM,
                   })
         def send_additional_pieces(self, request, tracking_code):
             dossier = CartaDSDossier.objects.get(tracking_code=tracking_code)
             self.add_job('send_additional_pieces_to_cartads', dossier_id=dossier.id)
             return {'err': 0, 'dossier_id': dossier.id}
         def send_additional_pieces_to_cartads(self, dossier_id):
             dossier = CartaDSDossier.objects.get(id=dossier_id)
             client = self.soap_client(wsdl_url=self.get_wsdl_url('ServicePiece'))
             resp = client.service.GetPiecesDossierACompleter(self.get_token(), dossier.cartads_id_dossier)
             pieces = [
                 {'id': 'comp-%s-%s' % (x['IdDosPiece'], x['IdPiece']),
                  'idPiece': x['IdPiece'],
                  'codePiece': x['CodePiece'],
                 } for x in resp]
             def key_value_of_stringstring(d):
                 return {'KeyValueOfstringstring': [{'Key': x, 'Value': y} for x, y in d.items()]}
             client = self.soap_client(wsdl_url=self.get_wsdl_url('ServiceDocumentation'))
             for piece_type in pieces:
                 for i, piece in enumerate(
                         CartaDSFile.objects.filter(
                             tracking_code=dossier.tracking_code,
                             id_piece=piece_type['id'])):
                     if piece.sent_to_cartads:
                         continue
                     id_dos_piece = piece.id_piece.split('-')[1]
                     filename = '%s-%s%s%s' % (
                         piece_type['idPiece'],
                         piece_type['codePiece'],
                         '%03d' % (i+1),
                         os.path.splitext(piece.uploaded_file.name)[-1])
                     content = piece.uploaded_file.read()
                     try:
                         resp = client.service.UploadFile(FileByteStream=content,
                                 _soapheaders={
                                     'IdDossier': dossier.cartads_id_dossier,
                                     'NomFichier': filename,
                                     'Length': piece.uploaded_file.size,
                                     'Token': self.get_token(),
                                     'InformationsComplementaires': key_value_of_stringstring(
                                         {'idDosPiece': id_dos_piece}),
                                 })
                     except zeep.exceptions.Fault as e:
                         self.logger.exception('error pushing file item %d (%r)', piece.id, e.message)
                         continue
                     else:
                         assert resp is None
                         piece.sent_to_cartads = now()
                         piece.save()
         @endpoint(perm='can_access',
                   description=_('Get status of file'),
                   parameters={

                     (u'NbDocuments', 0L)]),
+            ]
         def UploadFile(self, FileByteStream, _soapheaders):
             assert FileByteStream
             assert _soapheaders
             return None
     def pdf_mock(url, request):
         return {'content': '%PDF...', 'status_code': 200}
-...
         resp = app.post(data[0]['files'][0]['url'],
                         upload_files=[('files[]', 'test.pdf', '%PDF...')])
         assert resp.json[0]['token']
         assert CartaDSFile.objects.filter(tracking_code=dossier.tracking_code,
                 sent_to_cartads=None).count() == 1
         Job.objects.all().delete()
         resp = app.get('/cartads-cs/test/send_additional_pieces?tracking_code=%s' % dossier.tracking_code)
         assert Job.objects.all().count() == 1
         with mock.patch('passerelle.apps.cartads_cs.models.CartaDSCS.soap_client') as client:
             client.return_value = mock.Mock(service=FakeService())
             connector.jobs()
             assert Job.objects.filter(method_name='send_additional_pieces_to_cartads', status='completed').count()
         assert CartaDSFile.objects.filter(tracking_code=dossier.tracking_code,
                 sent_to_cartads=None).count() == 0
+    -

Projet

Général

Profil

Produits Entr'ouvert » Passerelle

0001-cartads_cs-add-endpoint-and-job-to-send-additional-f.patch