Merge pull request #41 from octabytes/feature

Text field lowercase bug fix

Author: AxeemHaider

setup.py

@@ -16,7 +16,7 @@
     # Versions should comply with PEP440.  For a discussion on single-sourcing
     # the version across setup.py and the project code, see
     # https://packaging.python.org/en/latest/single_source_version.html
-    version='1.2.0',
+    version='1.2.1',
 
     description="FireO ORM is specifically designed for the Google's Firestore",
     long_description=long_description,

src/fireo/fields/text_field.py

@@ -39,7 +39,7 @@ def attr_to_lowercase(self, attr_val, field_val):
             Convert text into lowercase
         """
         if attr_val:
-            return field_val.lower()
+            return field_val.lower() if field_val is not None else None
         return field_val
 
     def _titlecase(self, s):
@@ -53,7 +53,7 @@ def db_value(self, val):
         if type(val) is str or val is None:
             # check if user defined to set the value as lower case
             if self.model_cls._meta.to_lowercase:
-                return val.lower()
+                return val.lower() if val is not None else None
             return val
         raise errors.InvalidFieldType(f'Invalid field type. Field "{self.name}" expected {str}, '
                                       f'got {type(val)}')

src/tests/v121/test_lowercase_with_none.py

@@ -0,0 +1,37 @@
+from fireo.fields import TextField
+from fireo.models import Model
+
+
+def test_lowercase_model_with_none_value():
+    class LowercaseNone(Model):
+        name = TextField()
+        address = TextField()
+
+        class Meta:
+            to_lowercase = True
+
+
+    ln = LowercaseNone()
+    ln.name = 'name'
+    ln.save()
+
+    ln2 = LowercaseNone.collection.get(ln.key)
+
+    assert ln2.name == 'name'
+    assert ln2.address is None
+
+
+def test_lowercase_field_with_none_value():
+    class LowercaseNone(Model):
+        name = TextField()
+        address = TextField(to_lowercase=True)
+
+
+    ln = LowercaseNone()
+    ln.name = 'name'
+    ln.save()
+
+    ln2 = LowercaseNone.collection.get(ln.key)
+
+    assert ln2.name == 'name'
+    assert ln2.address is None