fixing list vaidation

Author: thingsplode

appkernel/model.py

@@ -403,7 +403,8 @@ def __init__(self, python_type,
         self.generator = generator
 
     def __getattr__(self, attribute):
-        if self.python_type == list and issubclass(self.sub_type, Model):
+        if self.python_type == list and (
+                hasattr(self, 'sub_type') and self.sub_type and issubclass(self.sub_type, Model)):
             if hasattr(self.sub_type, attribute):
                 nested_parameter = getattr(self.sub_type, attribute)
                 nested_parameter.backreference.array_parameter_name = self.backreference.parameter_name
@@ -987,6 +988,12 @@ def finalise_and_validate(self):
                 obj = obj_items.get(param_name)
                 if obj:
                     obj.finalise_and_validate()
+            if issubclass(param_object.python_type, (list, set)) and param_name in obj_items:
+                list_of_objects = obj_items.get(param_name)
+                if list_of_objects:
+                    for item in list_of_objects:
+                        if isinstance(item, Model):
+                            item.finalise_and_validate()
 
     @staticmethod
     def __check_validity(validator: Validator, param_name, obj_items):

tests/test_validators.py

@@ -1,7 +1,8 @@
 import datetime
+from datetime import timedelta
 
 import pytest
-from datetime import timedelta
+
 from appkernel import ValidationException
 from tests.utils import ExampleClass, Project, Task, Payment, PaymentMethod
 
@@ -22,6 +23,52 @@ def test_regexp_validation():
         test_model_correct_format.finalise_and_validate()
 
 
+def test_email_validator():
+    example = ExampleClass(just_numbers='1234')
+    example.finalise_and_validate()
+
+    with pytest.raises(ValidationException):
+        example.email = 'some_mail'
+        example.finalise_and_validate()
+
+    example.email = 'acme@coppa.com'
+    example.finalise_and_validate()
+
+
+def test_min_max():
+    example = ExampleClass(just_numbers='1234')
+    example.finalise_and_validate()
+
+    with pytest.raises(ValidationException):
+        example.distance = 1
+        example.finalise_and_validate()
+
+    with pytest.raises(ValidationException):
+        example.distance = 16
+        example.finalise_and_validate()
+
+    example.distance = 10
+    example.finalise_and_validate()
+
+
+def test_unique():
+    example = ExampleClass(just_numbers='1234')
+    example.finalise_and_validate()
+    with pytest.raises(ValidationException):
+        example.numbers = [1, 2, 1]
+        example.finalise_and_validate()
+
+    with pytest.raises(ValidationException):
+        example.numbers = ['a', 'b', 'a']
+        example.finalise_and_validate()
+
+    example.numbers = ['a', 'b', 'c']
+    example.finalise_and_validate()
+
+    example.numbers = [1, 2, 3]
+    example.finalise_and_validate()
+
+
 def test_not_empty_validation():
     project = Project().update(name='')
     with pytest.raises(ValidationException):
@@ -39,9 +86,13 @@ def test_past_validation():
     project.tasks[0].update(closed_date=(datetime.datetime.now() - timedelta(days=1)))
     print(('\n\n> one day in the past \n{}'.format(project)))
     project.finalise_and_validate()
+
     with pytest.raises(ValidationException):
         project.tasks[0].update(closed_date=(datetime.datetime.now() + timedelta(days=1)))
-        print(('\n\n> one day in the in the future \n{}'.format(project)))
+        project.finalise_and_validate()
+
+    with pytest.raises(ValidationException):
+        project.tasks[0].update(closed_date='past')
         project.finalise_and_validate()
 
 
@@ -56,10 +107,14 @@ def test_future_validation():
         print(('\n\n> one day in the in the future \n{}'.format(test_model)))
         test_model.finalise_and_validate()
 
+    with pytest.raises(ValidationException):
+        test_model.future_field = 'future'
+        test_model.finalise_and_validate()
+
 
 def test_validate_method():
     payment = Payment(method=PaymentMethod.MASTER, customer_id='123456', customer_secret='123')
     with pytest.raises(ValidationException):
         payment.finalise_and_validate()
-    payment.customer_id='1234567890123456'
+    payment.customer_id = '1234567890123456'
     payment.finalise_and_validate()

tests/utils.py

@@ -6,7 +6,7 @@
 from money import Money
 from passlib.hash import pbkdf2_sha256
 
-from appkernel import AuditableRepository, MongoRepository, AppKernelException, ValidationException
+from appkernel import AuditableRepository, MongoRepository, AppKernelException, ValidationException, Email, Unique
 from appkernel import IdentityMixin, Role, CurrentSubject, Anonymous, TextIndex, Index
 from appkernel import Max, Min
 from appkernel import Model, Property, UniqueIndex
@@ -247,6 +247,9 @@ def create_and_save_portfolio_with_owner():
 class ExampleClass(Model):
     just_numbers = Property(str, required=True, validators=[Regexp('^[0-9]+$')])
     future_field = Property(datetime, validators=[Future])
+    email = Property(str, validators=Email)
+    distance = Property(int, validators=[Min(10), Max(15)])
+    numbers = Property(list, validators=Unique)
 
 
 class Priority(Enum):