Merge pull request #50 from jackcvr/master

refix issue #48: field_attribute validation

Author: AxeemHaider

src/fireo/fields/base_field.py

@@ -117,8 +117,9 @@ def get_value(self, val, ignore_required=False, ignore_default=False):
         -------
             DB value
         """
-        v = self.field_attribute.parse(val, ignore_required, ignore_default)
-        return self.db_value(v)
+        if val is not None or not ignore_required or self.field_attribute.default:
+            val = self.field_attribute.parse(val, ignore_required, ignore_default)
+        return self.db_value(val)
 
     def db_value(self, val):
         """How the value is going to save in firestore

src/fireo/fields/number_field.py

@@ -38,14 +38,14 @@ def attr_range(self, attr_val, field_val):
 
     def attr_int_only(self, attr_val, field_val):
         """Method for attribute int_only"""
-        if attr_val and field_val is not None and type(field_val) is not int:
+        if attr_val and type(field_val) is not int:
             raise errors.InvalidFieldType(f'Invalid field type. Field "{self.name}" expected {int} type, '
                                           f'got {type(field_val)}')
         return field_val
 
     def attr_float_only(self, attr_val, field_val):
         """Method for attribute float_only"""
-        if attr_val and field_val is not None and type(field_val) is not float:
+        if attr_val and type(field_val) is not float:
             raise errors.InvalidFieldType(f'Invalid field type. Field "{self.name}" expected {float} type, '
                                           f'got {type(field_val)}')
         return field_val

src/fireo/fields/text_field.py

@@ -31,9 +31,6 @@ def attr_format(self, attr_val, field_val):
 
     def attr_max_length(self, attr_val, field_val):
         """Method for attribute max_length"""
-        if field_val is None:
-            return field_val
-            
         return field_val[:attr_val]
 
     def attr_to_lowercase(self, attr_val, field_val):

src/tests/v12/test_fix_update_with_none_value.py

@@ -1,21 +1,40 @@
+import pytest
+
 from fireo.models import Model
 from fireo.fields.text_field import TextField
 from fireo.fields.number_field import NumberField
+from fireo.fields.errors import NumberRangeError
 
 
 def test_fix_issue_48():
     class Person(Model):
         name = TextField(required=True, max_length=10)
-        type = NumberField(required=True, int_only=True)
-
+        type = NumberField(required=True, int_only=True, range=(1, 2))
 
-    person = Person.collection.create(name="test", type=1)
+    # test TextField
+    person = Person.collection.create(name='test', type=1)
 
     assert person.name == 'test'
     assert person.type == 1
 
-    person.type = 123
+    person.type = 2
     person.update()
 
     assert person.name == 'test'
-    assert person.type == 123
+    assert person.type == 2
+
+    # test NumberField
+    person = Person.collection.create(name='test', type=1)
+
+    assert person.name == 'test'
+    assert person.type == 1
+
+    person.name = 'test2'
+    person.update()
+
+    assert person.name == 'test2'
+    assert person.type == 1
+
+    person.type = 3
+    with pytest.raises(NumberRangeError):
+        person.update()