0004-handle-rejection-of-incoming-mails-to-be-rebased.patch

Benjamin Dauvergne, 22 mai 2018 09:16

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

Subject: [PATCH 4/4] handle rejection of incoming mails (to be rebased)

 welco/sources/mail/utils.py | 13 ++++++++++---
 welco/sources/mail/views.py |  9 ++++++++-
 2 files changed, 18 insertions(+), 4 deletions(-)

     class WelcoMaarchCourrier(MaarchCourrier):
         def __init__(self, url, username, password, grc_status,
                      grc_received_status, grc_send_status, batch_size=10):
                      grc_received_status, grc_send_status, grc_refused_status,
                      batch_size=10):
             super(WelcoMaarchCourrier, self).__init__(url, username, password)
             self.grc_status = grc_status
             self.grc_received_status = grc_received_status
             self.grc_send_status = grc_send_status
             self.grc_refused_status = grc_refused_status
             self.batch_size = batch_size
         def get_mails(self):
-...
             mail.external_link = formdata_url_backoffice
             self.update_external_infos_url([mail], self.grc_send_status)
         def set_grc_refused_status(self, mail_pk):
             mail = self.Courrier(pk=mail_pk)
             self.update_status([mail], self.grc_refused_status)
     def get_maarch():
         config = getattr(settings, 'MAARCH_FEED', {})
-...
             username=username,
             password=password,
             grc_status=config.get('STATUS_GRC', 'GRC'),
             grc_received_status=config.get('STATUS_GRC', 'GRC_TRT'),
             grc_send_status=config.get('STATUS_GRC', 'GRCSENT'))
             grc_received_status=config.get('STATUS_RECEIVED', 'GRC_TRT'),
             grc_send_status=config.get('STATUS_SEND', 'GRCSENT'),
             grc_refused_status=config.get('STATUS_REFUSED', 'GRCREFUSED'))

     from .models import Mail
     from .forms import MailQualificationForm
     from .utils import get_maarch
     def viewer(request, *args, **kwargs):
         if not 'file' in request.GET:
-...
     @login_required
     @csrf_exempt
     def reject(request, *args, **kwargs):
         Mail.objects.filter(id=request.POST['source_pk']).delete()
         maarch = get_maarch()
         mail = Mail.objects.filter(id=request.POST['source_pk']).first()
         if mail:
             if maarch and mail.registered_mail_number and mail.registered_mail_number.startswith('maarch-'):
                 mail_pk = mail.registered_mail_number.split('-', 1)[1]
                 maarch.set_grc_refused_status(mail_pk)
             mail.delete()
         return HttpResponse()
+    -

Projet

Général

Profil

Produits Entr'ouvert » Welco

0004-handle-rejection-of-incoming-mails-to-be-rebased.patch