Merge branch 'master' into feature/add_part_url

Author: adeang47

paperless/objects/customers.py

@@ -127,12 +127,14 @@ class Account(
     _json_encoder = AccountEncoder
 
     name: str = attr.ib(validator=attr.validators.instance_of(str))
-    country_code: str = attr.ib(validator=attr.validators.instance_of((str, object)))
 
     # not required for instantiation
     billing_addresses = attr.ib(
         default=[], converter=optional_convert(convert_iterable(BillingAddress))
     )
+    country_code: str = attr.ib(
+        default=NO_UPDATE, validator=attr.validators.instance_of((str, object))
+    )
     created = attr.ib(
         default=NO_UPDATE, validator=(attr.validators.instance_of((str, object)))
     )
@@ -312,12 +314,14 @@ class Contact(
     email: str = attr.ib(validator=attr.validators.instance_of(str))
     first_name: str = attr.ib(validator=attr.validators.instance_of(str))
     last_name: str = attr.ib(validator=attr.validators.instance_of(str))
-    country_code: str = attr.ib(validator=attr.validators.instance_of((str, object)))
 
     # not required for instantiation
     address = attr.ib(
         default=NO_UPDATE, converter=optional_convert(convert_cls(Address))
     )
+    country_code: str = attr.ib(
+        default=NO_UPDATE, validator=attr.validators.instance_of((str, object))
+    )
     created = attr.ib(
         default=NO_UPDATE, validator=(attr.validators.instance_of((str, object)))
     )

tests/unit/test_contacts.py

@@ -19,6 +19,15 @@ def setUp(self):
         with open('tests/unit/mock_data/contact.json') as data_file:
             self.mock_contact_json = json.load(data_file)
 
+    def test_create_contact_obj_with_only_required_args(self):
+        # should not raise any error
+        Contact(
+            account_id = 1,
+            email = "[email protected]",
+            first_name = "Contact",
+            last_name = "Paperless"
+        )
+
     def test_get_contact(self):
         self.client.get_resource = MagicMock(return_value=self.mock_contact_json)
         c = Contact.get(1)
@@ -94,6 +103,10 @@ def setUp(self):
         with open('tests/unit/mock_data/account.json') as data_file:
             self.mock_account_json = json.load(data_file)
 
+    def test_create_account_with_only_required_args(self):
+        # should not raise any error
+        Account(name="Account Name")
+
     def test_get_account(self):
         self.client.get_resource = MagicMock(return_value=self.mock_account_json)
         a = Account.get(1)