strict order of address fields

Author: vesellov

Makefile

@@ -21,7 +21,7 @@ test: venv
 	PYTHONPATH=./src ./venv/bin/pytest -vv --color=yes --capture=no --log-cli-level=DEBUG ./tests
 
 test/%:
-	PYTHONPATH=./src ./venv/bin/pytest -vv $*
+	PYTHONPATH=./src ./venv/bin/pytest -vvv $*
 
 rabbitmq_server_dev:
 	@echo "Starting RabbitMQ server, admin dashboard is available here: http://127.0.0.1:15672"

setup.py

@@ -2,7 +2,7 @@
 
 setup_params = dict(
     name='epp-python-client',
-    version='0.0.18',
+    version='0.0.19',
     author='Veselin Penev',
     author_email='[email protected]',
     packages=find_packages(where='src'),

src/epp/commands/contact.py

@@ -59,9 +59,10 @@
         <create>
             <contact:create xmlns:contact="urn:ietf:params:xml:ns:contact-1.0">
                 <contact:id>%(contact_id)s</contact:id>
-%(contact_fields)s
 %(postal_infos)s
-            %(auth_info)s</contact:create>
+%(contact_fields)s
+            %(auth_info)s
+            </contact:create>
         </create>
         <clTRID>%(cltrid)s</clTRID>
     </command>
@@ -75,9 +76,10 @@
             <contact:update xmlns:contact="urn:ietf:params:xml:ns:contact-1.0">
                 <contact:id>%(contact_id)s</contact:id>
                 <contact:chg>
-%(contact_fields)s
 %(postal_infos)s
-                %(auth_info)s</contact:chg>
+%(contact_fields)s
+                %(auth_info)s
+                </contact:chg>
             </contact:update>
         </update>
         <clTRID>%(cltrid)s</clTRID>

src/epp/epp_client.py

@@ -55,6 +55,17 @@ def int_from_net(data, format_32):
 def int_to_net(value, format_32):
     return struct.pack(format_32, value)
 
+
+def sort_address_fields(fields):
+    weights = {
+        "street": 100,
+        "city": 90,
+        "sp": 80,
+        "pc": 70,
+        "cc": 60,
+    }
+    return sorted(fields, key=lambda field: -weights.get(field[0], 10))
+
 #------------------------------------------------------------------------------
 
 class EPPConnectionAlreadyClosedError(Exception):
@@ -382,7 +393,7 @@ def contact_create(self, contact_id, voice=None, fax=None, email=None, contacts=
                         commands.contact.field3 % dict(
                             field=afield,
                             value=', '.join(avalue) if isinstance(avalue, list) else avalue,
-                        ) for (afield, avalue) in cont['address'].items() if avalue
+                        ) for (afield, avalue) in sort_address_fields(cont['address'].items()) if avalue
                     ])
                 ) for cont in contacts
             ]),
@@ -411,7 +422,7 @@ def contact_update(self, contact_id, voice=None, fax=None, email=None, contacts=
                         commands.contact.field4 % dict(
                             field=afield,
                             value=', '.join(avalue) if isinstance(avalue, list) else avalue,
-                        ) for (afield, avalue) in cont['address'].items() if avalue
+                        ) for (afield, avalue) in sort_address_fields(cont['address'].items()) if avalue
                     ])
                 ) for cont in contacts
             ]),

tests/epp/test_rpc_server.py

@@ -442,18 +442,15 @@ def test_cmd_contact_create(self):
         <create>
             <contact:create xmlns:contact="urn:ietf:params:xml:ns:contact-1.0">
                 <contact:id>epp_id_new_123</contact:id>
-                <contact:voice>+1234567890</contact:voice>
-                <contact:fax>0987654321</contact:fax>
-                <contact:email>[email protected]</contact:email>
                 <contact:postalInfo type="int">
                     <contact:name>Tester</contact:name>
                     <contact:org>TestingCorp</contact:org>
                     <contact:addr>
                         <contact:street>Street, 1234</contact:street>
                         <contact:city>TrialTown</contact:city>
                         <contact:sp>North Side</contact:sp>
-                        <contact:cc>AI</contact:cc>
                         <contact:pc>1234AB</contact:pc>
+                        <contact:cc>AI</contact:cc>
                     </contact:addr>
                 </contact:postalInfo>
                 <contact:postalInfo type="loc">
@@ -463,11 +460,15 @@ def test_cmd_contact_create(self):
                         <contact:street>Street, 1234</contact:street>
                         <contact:city>TrialTown</contact:city>
                         <contact:sp>North Side</contact:sp>
-                        <contact:cc>AI</contact:cc>
                         <contact:pc>1234AB</contact:pc>
+                        <contact:cc>AI</contact:cc>
                     </contact:addr>
                 </contact:postalInfo>
+                <contact:voice>+1234567890</contact:voice>
+                <contact:fax>0987654321</contact:fax>
+                <contact:email>[email protected]</contact:email>
                 <contact:authInfo><contact:pw>123456</contact:pw></contact:authInfo>
+            
             </contact:create>
         </create>
         <clTRID>c5bc8f94103f1a47019a09049dff5aec</clTRID>