0001-dpark-add-support-for-methods-PLS_ENREG2-and-PLS_NOT.patch

Benjamin Dauvergne, 31 mai 2022 18:18

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

Subject: [PATCH] dpark: add support for methods PLS_ENREG2 and PLS_NOTIFCB2
 (#65777)

 passerelle/contrib/dpark/models.py |  47 ++++++----
 tests/data/dpark.awws.wsdl         |  75 ++++++++++++++-
 tests/test_dpark.py                | 144 ++++++++++++++++++++++++++++-
 3 files changed, 247 insertions(+), 19 deletions(-)

     from passerelle.base.models import BaseResource
     from passerelle.utils.api import endpoint
     from passerelle.utils.conversion import to_pdf
     from passerelle.utils.conversion import any2bool, to_pdf
     from passerelle.utils.jsonresponse import APIError
     from passerelle.views import WrongParameter
-...
         @endpoint(perm='can_access', methods=['post'], description=_('Register a subscription application'))
         def register(self, request, *args, **kwargs):
             data = json.loads(request.body)
             is_erroneous(
                 data,
+                (
                     'application_id',
                     'applicant_title',
                     'applicant_lastname',
                     'applicant_firstnames',
                     'applicant_email',
                     'address_sticode',
                     'address_zipcode',
                     'address_locality',
                     'address_district',
                 ),
+            )
             double_plaque = any2bool(data.get('double_plaque'))
             required_fields = [
                 'application_id',
                 'applicant_title',
                 'applicant_lastname',
                 'applicant_firstnames',
                 'applicant_email',
                 'address_sticode',
                 'address_zipcode',
                 'address_locality',
                 'address_district',
+            ]
             if double_plaque:
                 required_fields.extend(['id_contexte', 'id_produit'])
             is_erroneous(data, required_fields)
             application_id = data['application_id']
             applicant = {
                 'Demandeur_Civilite': data['applicant_title'],
-...
                 'Demande_IBAN': data.get('application_bank_iban', ''),
                 'Demande_BIC': data.get('application_bank_bic', ''),
+            }
             reply = self.call('PLS_ENREG', application_id, applicant, address, application)
             if double_plaque:
                 reply = self.call(
                     'PLS_ENREG2',
                     application_id,
                     applicant,
                     address,
                     application,
                     data['id_produit'],
                     data['id_contexte'],
+                )
             else:
                 reply = self.call('PLS_ENREG', application_id, applicant, address, application)
             if filenumber:
                 for pairing in Pairing.objects.filter(filenumber=filenumber):
                     pairing.clear_cache()
-...
             total_amount = int(data['total_amount']) * 100  # in cents
             if not pairings:
                 raise APIError(_('No pairing exists'))
             double_plaque = any2bool(data.get('double_plaque'))
             self.call(
                 'PLS_NOTIFCB',
                 'PLS_NOTIFCB2' if double_plaque else 'PLS_NOTIFCB',
                 data['application_external_id'],
                 data['filenumber'],
                 data['application_id'],

             </xsd:sequence>
           </xsd:complexType>
           <xsd:element name="FPS_Rech_ImmatResponse" type="s0:tFPS_Rech_ImmatResponse"/>
           <xsd:complexType name="tPLS_ENREG2">
             <xsd:sequence>
               <xsd:element name="NumeroTeledossier" type="xsd:string"/>
               <xsd:element name="Entree_Demandeur" type="s0:tEntree_Demandeur_PLS_ENREG"/>
               <xsd:element name="Entree_Adresse" type="s0:tEntree_Adresse"/>
               <xsd:element name="Entree_Demande" type="s0:tEntree_Demande_PLS_ENREG"/>
               <xsd:element name="ID_PRODUIT" type="xsd:int"/>
               <xsd:element name="ID_CONTEXTE" type="xsd:int"/>
             </xsd:sequence>
           </xsd:complexType>
           <xsd:element name="PLS_ENREG2" type="s0:tPLS_ENREG2"/>
           <xsd:complexType name="tPLS_ENREG2Response">
             <xsd:sequence>
               <xsd:element name="PLS_ENREG2Result" type="s0:tRetour_PLS_ENREG"/>
             </xsd:sequence>
           </xsd:complexType>
           <xsd:element name="PLS_ENREG2Response" type="s0:tPLS_ENREG2Response"/>
           <xsd:complexType name="tPLS_NOTIFCB2">
             <xsd:sequence>
               <xsd:element name="NumeroTeledossierPhase1" type="xsd:string"/>
               <xsd:element name="NumeroDossier" type="xsd:int"/>
               <xsd:element name="NumeroDemande" type="xsd:int"/>
               <xsd:element name="TypePaiement" type="xsd:int"/>
               <xsd:element name="MontantPaye" type="xsd:int"/>
               <xsd:element name="DatePaiement" type="xsd:string"/>
               <xsd:element name="RefTransaction" type="xsd:string"/>
             </xsd:sequence>
           </xsd:complexType>
           <xsd:element name="PLS_NOTIFCB2" type="s0:tPLS_NOTIFCB2"/>
           <xsd:complexType name="tPLS_NOTIFCB2Response">
             <xsd:sequence>
               <xsd:element name="PLS_NOTIFCB2Result" type="s0:tRetour_PLS"/>
             </xsd:sequence>
           </xsd:complexType>
           <xsd:element name="PLS_NOTIFCB2Response" type="s0:tPLS_NOTIFCB2Response"/>
         </xsd:schema>
       </types>
       <message name="Webservice_Residants_PLS_EXIST_MessageIn">
-...
       <message name="Webservice_Residants_FPS_Rech_Immat_MessageOut">
         <part name="parameters" element="s0:FPS_Rech_ImmatResponse"/>
       </message>
       <message name="Webservice_Residants_PLS_ENREG2_MessageIn">
         <part name="parameters" element="s0:PLS_ENREG2"/>
       </message>
       <message name="Webservice_Residants_PLS_ENREG2_MessageOut">
         <part name="parameters" element="s0:PLS_ENREG2Response"/>
       </message>
       <message name="Webservice_Residants_PLS_NOTIFCB2_MessageIn">
         <part name="parameters" element="s0:PLS_NOTIFCB2"/>
       </message>
       <message name="Webservice_Residants_PLS_NOTIFCB2_MessageOut">
         <part name="parameters" element="s0:PLS_NOTIFCB2Response"/>
       </message>
       <portType name="Webservice_ResidantsSOAPPortType">
         <operation name="PLS_EXIST">
           <input message="s0:Webservice_Residants_PLS_EXIST_MessageIn"/>
-...
           <input message="s0:Webservice_Residants_FPS_Rech_Immat_MessageIn"/>
           <output message="s0:Webservice_Residants_FPS_Rech_Immat_MessageOut"/>
         </operation>
         <operation name="PLS_ENREG2">
           <input message="s0:Webservice_Residants_PLS_ENREG2_MessageIn"/>
           <output message="s0:Webservice_Residants_PLS_ENREG2_MessageOut"/>
         </operation>
         <operation name="PLS_NOTIFCB2">
           <input message="s0:Webservice_Residants_PLS_NOTIFCB2_MessageIn"/>
           <output message="s0:Webservice_Residants_PLS_NOTIFCB2_MessageOut"/>
         </operation>
       </portType>
       <binding name="Webservice_ResidantsSOAPBinding" type="s0:Webservice_ResidantsSOAPPortType">
         <soap:binding transport="http://schemas.xmlsoap.org/soap/http" style="document"/>
-...
             <soap:body use="literal"/>
           </output>
         </operation>
         <operation name="PLS_ENREG2">
           <soap:operation soapAction="urn:Webservice_Residants/PLS_ENREG2" style="document"/>
           <input>
             <soap:body use="literal"/>
           </input>
           <output>
             <soap:body use="literal"/>
           </output>
         </operation>
         <operation name="PLS_NOTIFCB2">
           <soap:operation soapAction="urn:Webservice_Residants/PLS_NOTIFCB2" style="document"/>
           <input>
             <soap:body use="literal"/>
           </input>
           <output>
             <soap:body use="literal"/>
           </output>
         </operation>
       </binding>
       <service name="Webservice_Residants">
         <port name="Webservice_ResidantsSOAPPort" binding="s0:Webservice_ResidantsSOAPBinding">
           <soap:address location="http://W01DPA001T/WEBSERVICE_RESIDANTS_WEB/awws/Webservice_Residants.awws"/>
           <soap:address location="http://w01dpa001i/WEBSERVICE_RESIDANTS_WEB/awws/Webservice_Residants.awws"/>
         </port>
       </service>
     </definitions>

             '<Demande_AbonnementTiers>%s</Demande_AbonnementTiers>'
             % repr(application_thirdparty_subscription).lower()
+        )
         assert demande_abonnementtiers in force_text(dpark.mock_requests[0].body)
         body = dpark.mock_requests[0].body.decode()
         assert ':PLS_ENREG ' in body
         assert demande_abonnementtiers in body
         assert resp.json['err'] == 1
         assert resp.json['err_desc'] == 'Dossier incomplet'
         # with complete application
-...
             base64.b64encode(to_pdf(JPEG_CONTENT))
+        )
         assert base64.b64decode(pj_node.findall('Bloc_Fichiers')[3].find('Fichier').text).startswith(b'%PDF')
     @pytest.mark.parametrize('application_thirdparty_subscription', [True, False])
     def test_registration_double_plaque(dpark, app, application_thirdparty_subscription):
         url = '/dpark/test/register/'
         params = {
             "address_complement1": "",
             "address_complement2": "",
             "address_district": "PERI",
             "address_locality": "Toulouse",
             "address_sticode": "315553609651",
             "address_streetext": "1",
             "address_streetname": "",
             "address_streetno": "16",
             "address_zipcode": "31000",
             "applicant_email": "sh@eggs.org",
             "applicant_firstnames": "Spam Ham",
             "applicant_lastname": "EGGS",
             "applicant_mobilephone": "0655443322",
             "applicant_phone": "",
             "applicant_title": "1",
             "application_car1_brand": "Peugeot",
             "application_car1_exemption": "8",
             "application_car1_model": "206",
             "application_car1_plate": "AA777ZZ",
             "application_id": "12-4",
             "application_payment_type": "10",
             "application_thirdparty_subscription": application_thirdparty_subscription,
             "application_type": 1,
             'double_plaque': '1',
+        }
         # with missing parameter
         app.post_json(url, params=params, status=400)
         params.update(
+            {
                 'id_contexte': '1',
                 'id_produit': '2',
+            }
+        )
         # with an imcplete application
         dpark.mock_responses.append(
             """<?xml version="1.0" encoding="utf-8"?>
     <SOAP-ENV:Envelope xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/" xmlns:xsd="http://www.w3.org/2001/XMLSchema"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
       <SOAP-ENV:Header/>
       <SOAP-ENV:Body>
         <ns1:PLS_ENREGResponse xmlns:ns1="urn:Webservice_Residants">
           <PLS_ENREG2Result>
             <CodeRetour>02</CodeRetour>
             <MessageRetour>Dossier incomplet</MessageRetour>
           </PLS_ENREG2Result>
         </ns1:PLS_ENREGResponse>
       </SOAP-ENV:Body>
     </SOAP-ENV:Envelope>"""
+        )
         resp = app.post_json(url, params=params)
         demande_abonnementtiers = (
             '<Demande_AbonnementTiers>%s</Demande_AbonnementTiers>'
             % repr(application_thirdparty_subscription).lower()
+        )
         body = dpark.mock_requests[0].body.decode()
         assert demande_abonnementtiers in body
         assert ':PLS_ENREG2 ' in body
         assert '<ID_CONTEXTE>1<' in body
         assert '<ID_PRODUIT>2<' in body
         assert resp.json['err'] == 1
         assert resp.json['err_desc'] == 'Dossier incomplet'
         # with complete application
         dpark.mock_responses.append(
             """<?xml version="1.0" encoding="utf-8"?>
     <SOAP-ENV:Envelope xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/" xmlns:xsd="http://www.w3.org/2001/XMLSchema"
      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
       <SOAP-ENV:Header/>
       <SOAP-ENV:Body>
         <ns1:PLS_ENREGResponse xmlns:ns1="urn:Webservice_Residants">
           <PLS_ENREG2Result>
             <CodeRetour>01</CodeRetour>
             <MessageRetour/>
             <NumeroDossier>22334</NumeroDossier>
             <NumeroDemande>59492</NumeroDemande>
           </PLS_ENREG2Result>
         </ns1:PLS_ENREGResponse>
       </SOAP-ENV:Body>
     </SOAP-ENV:Envelope>"""
+        )
         resp = app.post_json(url, params=params)
         body = dpark.mock_requests[1].body.decode()
         assert demande_abonnementtiers in body
         assert resp.json['data']['numerodossier'] == 22334
         assert resp.json['data']['numerodemande'] == 59492
     @pytest.mark.parametrize(
         'transaction_datetime,expected_date',
+        [
             ('20180611', '20180611'),
             # UTC datetime should be converted to Europe/Paris date
             ('2018-06-11T23:59:00', '20180612'),
         ],
+    )
     def test_payment_notification_double_plaque(dpark, app, transaction_datetime, expected_date):
         operation = mock.Mock(name='PLS_NOTIFCB2')
         service = mock.Mock(spec=['PLS_NOTIFCB2'], PLS_NOTIFCB2=operation)
         create_service = mock.Mock(spec=[], return_value=service)
         client = mock.NonCallableMock(spec=['create_service'], create_service=create_service)
         with mock.patch('passerelle.contrib.dpark.models.get_client', return_value=client):
             nameid = 'abcd' * 8
             filenumber = '1' * 9
             params = {
                 'nameid': nameid,
                 'filenumber': filenumber,
                 'transaction_id': 'I123456789',
                 'transaction_datetime': transaction_datetime,
                 'total_amount': '125',
                 'application_id': '61718',
                 'application_external_id': 'E-8-N5UTAK6P',
                 'double_plaque': '1',
+            }
             url = '/dpark/test/notify-payment/'
             resp = app.post_json(url, params=params)
             assert resp.json['err'] == 1
             assert resp.json['err_desc'] == 'No pairing exists'
             Pairing.objects.create(
                 resource=dpark,
                 **{
                     'nameid': nameid,
                     'firstnames': 'spam eggs',
                     'lastname': 'bar',
                     'filenumber': filenumber,
                     'badgenumber': '2' * 9,
                 },
+            )
             operation.return_value = mock.Mock(CodeRetour='02', MessageRetour='Dossier inconnu')
             resp = app.post_json(url, params=params)
             assert operation.call_args_list[-1].args[5] == expected_date
             assert resp.json['err'] == 1
             assert resp.json['err_desc'] == 'Dossier inconnu'
             operation.return_value = mock.Mock(CodeRetour='01')
             resp = app.post_json(url, params=params)
             assert resp.json['data'] is True
+    -

Projet

Général

Profil

Produits Entr'ouvert » Passerelle

0001-dpark-add-support-for-methods-PLS_ENREG2-and-PLS_NOT.patch