Merge pull request #8 from open-contracting/fix_database_method

Bug fix; database get_or_create_collection_id method
open-contracting · Jan 10, 2019 · a12fecf · a12fecf
2 parents 96bf4fe + 4e6bd8f
commit a12fecf
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 6 deletions.
diff --git a/ocdskingfisherprocess/database.py b/ocdskingfisherprocess/database.py
@@ -186,9 +186,9 @@ def get_collection_id(self, source_id, data_version, sample):
 
     def get_or_create_collection_id(self, source_id, data_version, sample):
 
-        collection = self.get_collection_id(source_id, data_version, sample)
-        if collection:
-            return collection['id']
+        collection_id = self.get_collection_id(source_id, data_version, sample)
+        if collection_id:
+            return collection_id
 
         with self.get_engine().begin() as connection:
             value = connection.execute(self.collection_table.insert(), {

diff --git a/tests/tests.py b/tests/tests.py
@@ -15,9 +15,13 @@ def test_get_collection_id_and_get_or_create_collection_id(self):
         # Now it exists ...
         assert create_id
 
-        get_id = self.database.get_collection_id("test-source", "2019-01-20 10:00:12", False)
-        # And we can load it!
-        assert get_id == create_id
+        get1_id = self.database.get_collection_id("test-source", "2019-01-20 10:00:12", False)
+        # And we can load it using get!
+        assert get1_id == create_id
+
+        get2_id = self.database.get_or_create_collection_id("test-source", "2019-01-20 10:00:12", False)
+        # And we can load it using get or create!
+        assert get2_id == create_id
 
 
 class TestUtil(BaseTest):