Merge pull request #51 from octabytes/feature

issue #45 fixed

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.5',
+    version='1.2.6',
 
     description="FireO ORM is specifically designed for the Google's Firestore",
     long_description=long_description,

src/fireo/queries/query_wrapper.py

@@ -1,4 +1,4 @@
-from fireo.fields import ReferenceField, NestedModel
+from fireo.fields import ReferenceField, NestedModel, IDField
 from fireo.queries import errors
 from fireo.utils import utils
 from google.cloud import firestore
@@ -50,6 +50,12 @@ def from_query_result(cls, model, doc, nested_doc=False):
 
         # If it is not nested model then set the id for this model
         if not nested_doc:
+            # When getting document attach the IDField if there is no user specify 
+            # it will prevent to generate new id everytime when document save
+            # For more information see issue #45 https://github.com/octabytes/FireO/issues/45
+            if model._meta.id is None:
+                model._meta.id = ('id', IDField())
+                
             setattr(model, '_id', doc.id)
             # save the firestore reference doc so that further actions can be performed (i.e. collections())
             model._meta.set_reference_doc(doc.reference)

src/tests/v010/simple_id_key_test.py

@@ -79,14 +79,17 @@ def test_without_id_field():
 
 
 def test_without_id_field_but_giving_id():
-    e1 = Employee()
+    class EmployeeIDField(mdl.Model):
+        name = mdl.TextField()
+
+    e1 = EmployeeIDField()
     e1.id = 'test_without_id_but_giving_id'
     e1.name = 'test_without_id_but_give_some_id'
     e1.save()
 
     assert e1.id != 'test_without_id_but_giving_id'
 
-    e2 = Employee.collection.get(e1.key)
+    e2 = EmployeeIDField.collection.get(e1.key)
     assert e2.id != 'test_without_id_but_giving_id'
     assert e1.name == e2.name
     assert e1.key == e2.key

src/tests/v12/test_issue_45.py

@@ -0,0 +1,30 @@
+from fireo.fields import TextField, NumberField
+from fireo.models import Model
+
+
+def test_fix_issue_45():
+    class Student(Model):
+        name = TextField()
+        age = NumberField()
+
+    s = Student()
+    s.name = 'abc'
+    s.age = 7
+    s.save()
+
+    student = Student.collection.get(s.key)
+    
+    assert student.key == s.key
+
+    student.age = 10
+    student.save()
+
+    assert student.key == s.key
+    
+    student.save()
+
+    assert student.key == s.key
+
+    student.save()
+
+    assert student.key == s.key