Merge pull request #18 from AusDTO/supplier-id

Supplier ID -> Supplier Code

dmutils/documents.py

@@ -61,7 +61,7 @@ def upload_document(uploader, documents_url, service, field, file_contents, publ
     :param uploader: S3 uploader object
     :param documents_url: base assets URL used as root for creating the full
                           document URL.
-    :param service: service object used to look up service and supplier id
+    :param service: service object used to look up service and supplier code
                     for the generated document name
     :param field: name of the service field that the document URL is saved to,
                   used to generate the document name
@@ -78,7 +78,7 @@ def upload_document(uploader, documents_url, service, field, file_contents, publ
     file_path = generate_file_name(
         service['frameworkSlug'],
         uploader.bucket_short_name,
-        service['supplierId'],
+        service['supplierCode'],
         service['id'],
         field,
         file_contents.filename
@@ -174,7 +174,7 @@ def file_is_image(file_object):
     ]
 
 
-def generate_file_name(framework_slug, bucket_short_name, supplier_id, service_id, field, filename, suffix=None):
+def generate_file_name(framework_slug, bucket_short_name, supplier_code, service_id, field, filename, suffix=None):
     if suffix is None:
         suffix = default_file_suffix()
 
@@ -188,7 +188,7 @@ def generate_file_name(framework_slug, bucket_short_name, supplier_id, service_i
     return '{}/{}/{}/{}-{}-{}{}'.format(
         framework_slug,
         bucket_short_name,
-        supplier_id,
+        supplier_code,
         service_id,
         ID_TO_FILE_NAME_SUFFIX[field],
         suffix,

dmutils/user.py

@@ -23,13 +23,13 @@ def user_has_role(user, role):
 
 
 class User():
-    def __init__(self, user_id, email_address, supplier_id, supplier_name,
+    def __init__(self, user_id, email_address, supplier_code, supplier_name,
                  locked, active, name, role):
         self.id = user_id
         self.email_address = email_address
         self.name = name
         self.role = role
-        self.supplier_id = supplier_id
+        self.supplier_code = supplier_code
         self.supplier_name = supplier_name
         self.locked = locked
         self.active = active
@@ -67,23 +67,23 @@ def serialize(self):
             'id': self.id,
             'name': self.name,
             'emailAddress': self.email_address,
-            'supplierId': self.supplier_id,
+            'supplierCode': self.supplier_code,
             'supplierName': self.supplier_name,
             'locked': self.locked,
         }
 
     @staticmethod
     def from_json(user_json):
         user = user_json["users"]
-        supplier_id = None
+        supplier_code = None
         supplier_name = None
         if "supplier" in user:
-            supplier_id = user["supplier"]["supplierId"]
+            supplier_code = user["supplier"]["supplierCode"]
             supplier_name = user["supplier"]["name"]
         return User(
             user_id=user["id"],
             email_address=user['emailAddress'],
-            supplier_id=supplier_id,
+            supplier_code=supplier_code,
             supplier_name=supplier_name,
             locked=user.get('locked', False),
             active=user.get('active', True),

tests/test_documents.py

@@ -145,7 +145,7 @@ def test_document_upload(self):
                 upload_document(
                     uploader,
                     'http://assets',
-                    {'id': "123", 'supplierId': 5, 'frameworkSlug': 'g-cloud-6'},
+                    {'id': "123", 'supplierCode': 5, 'frameworkSlug': 'g-cloud-6'},
                     "pricingDocumentURL",
                     mock_file('file.pdf', 1)
                 ),
@@ -165,7 +165,7 @@ def test_document_private_upload(self):
                 upload_document(
                     uploader,
                     'http://assets',
-                    {'id': "123", 'supplierId': 5, 'frameworkSlug': 'g-cloud-6'},
+                    {'id': "123", 'supplierCode': 5, 'frameworkSlug': 'g-cloud-6'},
                     "pricingDocumentURL",
                     mock_file('file.pdf', 1),
                     public=False
@@ -186,7 +186,7 @@ def test_document_upload_s3_error(self):
             self.assertFalse(upload_document(
                 uploader,
                 'http://assets',
-                {'id': "123", 'supplierId': 5, 'frameworkSlug': 'g-cloud-6'},
+                {'id': "123", 'supplierCode': 5, 'frameworkSlug': 'g-cloud-6'},
                 "pricingDocumentURL",
                 mock_file('file.pdf', 1)
             ))
@@ -198,7 +198,7 @@ def test_document_upload_with_other_bucket_short_name(self):
                 upload_document(
                     uploader,
                     'http://assets',
-                    {'id': "123", 'supplierId': 5, 'frameworkSlug': 'g-cloud-6'},
+                    {'id': "123", 'supplierCode': 5, 'frameworkSlug': 'g-cloud-6'},
                     "pricingDocumentURL",
                     mock_file('file.pdf', 1)
                 ),
@@ -218,7 +218,7 @@ def test_document_upload_with_invalid_short_bucket_name(self):
                 upload_document(
                     uploader,
                     'http://assets',
-                    {'id': "123", 'supplierId': 5, 'frameworkSlug': 'g-cloud-6'},
+                    {'id': "123", 'supplierCode': 5, 'frameworkSlug': 'g-cloud-6'},
                     "pricingDocumentURL",
                     mock_file('file.pdf', 1)
                 ),
@@ -234,7 +234,7 @@ def setup(self):
         self.section.get_question_ids.return_value = ['pricingDocumentURL']
         self.service = {
             'frameworkSlug': 'g-cloud-7',
-            'supplierId': '12345',
+            'supplierCode': '12345',
             'id': '654321',
         }
         self.uploader = mock.Mock(bucket_short_name='documents')

tests/test_user.py

@@ -19,7 +19,7 @@ def user_json():
             "locked": False,
             "active": True,
             "supplier": {
-                "supplierId": 321,
+                "supplierCode": 321,
                 "name": "test supplier",
             }
         }
@@ -76,15 +76,15 @@ def test_User_from_json_with_supplier():
         'locked': False,
         'active': True,
         'supplier': {
-            'supplierId': 321,
+            'supplierCode': 321,
             'name': 'test supplier',
         }
     }})
     assert user.id == 123
     assert user.name == 'Name'
     assert user.role == 'supplier'
     assert user.email_address == '[email protected]'
-    assert user.supplier_id == 321
+    assert user.supplier_code == 321
     assert user.supplier_name == 'test supplier'