Merge pull request #198 from alphagov/migrations-use-repository

Switch migrations to use Repository as appropriate

backdrop/core/database.py

@@ -131,7 +131,10 @@ def find(self, query, sort=None, limit=None):
 
         self._validate_sort(sort)
 
-        return self._mongo_driver.find(query.to_mongo_query(), sort, limit)
+        is_class = hasattr(query, 'to_mongo_query')
+        mongo_query = query.to_mongo_query() if is_class else query
+
+        return self._mongo_driver.find(mongo_query, sort, limit)
 
     def group(self, group_by, query, sort=None, limit=None, collect=None):
         if sort:

migrations/001_add_week_start.py

@@ -12,7 +12,7 @@
 def up(db):
     for name in db.collection_names():
         log.info("Migrating collection: {0}".format(name))
-        collection = db.get_collection(name)
+        collection = db.get_repository(name)
         query = {
             "_timestamp": {"$exists": True},
             "_week_start_at": {"$exists": False}

migrations/002_add_month_start.py

@@ -12,7 +12,7 @@
 def up(db):
     for name in db.collection_names():
         log.info("Migrating collection: {0}".format(name))
-        collection = db.get_collection(name)
+        collection = db.get_repository(name)
         query = {
             "_timestamp": {"$exists": True},
             "_month_start_at": {"$exists": False}

migrations/005_add_hour_and_day_start.py

@@ -12,7 +12,7 @@
 def up(db):
     for name in db.collection_names():
         log.info("Migrating collection: {0}".format(name))
-        collection = db.get_collection(name)
+        collection = db.get_repository(name)
         query = {
             "_timestamp": {"$exists": True},
             "_day_start_at": {"$exists": False}

migrations/007_add_quarter_start.py

@@ -12,7 +12,7 @@
 def up(db):
     for name in db.collection_names():
         log.info("Migrating collection: {0}".format(name))
-        collection = db.get_collection(name)
+        collection = db.get_repository(name)
         query = {
             "_timestamp": {"$exists": True},
             "_quarter_start_at": {"$exists": False}

tests/core/integration/test_database_integration.py

@@ -733,6 +733,33 @@ def test_period_query_for_data_with_no__week_start_at(self):
         assert_that(result, has_item(has_entry("_count", 1)))
 
 
+class TestRepositoryIntegration_Finding(RepositoryIntegrationTest):
+    def test_query_class(self):
+        self.mongo_collection.save({"foo": 1})
+        self.mongo_collection.save({"foo": 2})
+        self.mongo_collection.save({"foo": 3})
+
+        result = self.repo.find(Query.create())
+
+        assert_that(list(result), contains(
+            has_entry("foo", 1),
+            has_entry("foo", 2),
+            has_entry("foo", 3),
+        ))
+
+    def test_query_map(self):
+        self.mongo_collection.save({"foo": 1})
+        self.mongo_collection.save({"foo": 2})
+        self.mongo_collection.save({"foo": 3})
+
+        result = self.repo.find({"foo": 1})
+
+        assert_that(result.count(), equal_to(1))
+        assert_that(list(result), contains(
+            has_entry("foo", 1),
+        ))
+
+
 class TestDatabase(unittest.TestCase):
     def setUp(self):
         self.db = Database('localhost', 27017, 'backdrop_test')