Het collection now uses secondary-read-preference

Author: aafrecct

.gitignore

@@ -8,3 +8,4 @@ __pycache__
 coverage.xml
 *.py[co]
 *.egg-info
+.venv

odata_server/utils/__init__.py

@@ -448,7 +448,11 @@ def get_collection(
  orderby = parse_orderby(qs.get("$orderby", ""))
 
  # Get the results
- mongo_collection = db.get_collection(RootEntitySet.mongo_collection)
+ mongo_collection = db.get_collection(
+ RootEntitySet.mongo_collection,
+ ).with_options(
+ read_concern=pymongo.ReadPreference.SECONDARY_PREFERRED,
+ )
  if prefix:
  seq_filter = {"Seq": filters.pop("Seq")} if "Seq" in filters else None
  pipeline = [

tests/test_flask.py

@@ -252,21 +252,23 @@ def test_get_entity_collection_api_orderby(self):
  )
  for orderby_expr, expected in test_data:
  with self.subTest(orderby=orderby_expr):
- mongo.get_collection().find().sort().skip().limit.return_value = iter(
+ mongo.get_collection().with_options().find().sort().skip().limit.return_value = iter(
  ()
  )
  mongo.reset_mock()
  response = self.app.get("/Products?$orderby={}".format(orderby_expr))
- mongo.get_collection().find().max_time_ms().sort.assert_called_once_with(
+ mongo.get_collection().with_options().find().max_time_ms().sort.assert_called_once_with(
  expected
  )
  self.assertEqual(response.status_code, 200)
 
  def test_get_entity_collection_api_empty_filter(self):
- mongo.get_collection().find().skip().limit.return_value = iter(())
+ mongo.get_collection().with_options().find().skip().limit.return_value = iter(
+ ()
+ )
  mongo.reset_mock()
  response = self.app.get("/Products?$filter=")
- mongo.get_collection().find.assert_called_once_with(
+ mongo.get_collection().with_options().find.assert_called_once_with(
  {"uuid": {"$exists": True}}, ANY
  )
  self.assertEqual(response.status_code, 200)
@@ -279,7 +281,7 @@ def test_get_entity_collection_api_basic_filters(self):
  )
  for label, filter_expr in test_data:
  with self.subTest(msg=label):
- mongo.get_collection().find().max_time_ms().skip().limit.return_value = iter(
+ mongo.get_collection().with_options().find().max_time_ms().skip().limit.return_value = iter(
  ()
  )
  response = self.app.get("/Products?$filter={}".format(filter_expr))

tests/test_utils.py

@@ -117,9 +117,11 @@ def test_process_expand_fields(self):
  navprop = edm.NavigationProperty(
  {
  "Name": prop,
- "Type": prop_type
- if prop in ("prop1", "prop2")
- else "Collection({})".format(prop_type),
+ "Type": (
+ prop_type
+ if prop in ("prop1", "prop2")
+ else "Collection({})".format(prop_type)
+ ),
  }
  )
  navprop.entity_type = edm.EntityType(
@@ -144,9 +146,9 @@ def test_process_expand_fields(self):
  "A": navprop.entity_type.NavigationProperties[0]
  }
  navprop.entity_type.navproperties["A"].iscollection = False
- navprop.entity_type.navproperties[
- "A"
- ].entity_type = entity_set.entity_type
+ navprop.entity_type.navproperties["A"].entity_type = (
+ entity_set.entity_type
+ )
  navprop.entity_type.virtual_entities = {"A"}
  navprop.iscollection = prop in ("prop3", "prop4")
  entity_set.entity_type.navproperties[prop] = navprop
@@ -482,7 +484,7 @@ def test_process_collection_filters(self):
  )
  def test_get_collection(self, parse_qs):
  mongo = unittest.mock.Mock()
- mongo.get_collection().find().skip().limit.return_value = iter(
+ mongo.get_collection().with_options().find().skip().limit.return_value = iter(
  (
  {
  "ID": 1,
@@ -531,7 +533,7 @@ def test_get_collection(self, parse_qs):
  )
  def test_get_collection_orderby(self, parse_qs):
  mongo = unittest.mock.Mock()
- mongo.get_collection().find().sort().skip().limit.return_value = iter(
+ mongo.get_collection().with_options().find().sort().skip().limit.return_value = iter(
  (
  {
  "ID": 1,
@@ -576,15 +578,15 @@ def test_get_collection_orderby(self, parse_qs):
  )
  def test_get_collection_count(self, parse_qs):
  mongo = unittest.mock.Mock()
- mongo.get_collection().find().skip().limit.return_value = iter(
+ mongo.get_collection().with_options().find().skip().limit.return_value = iter(
  (
  {
  "ID": 1,
  "uuid": "abc",
  },
  )
  )
- mongo.get_collection().count_documents.return_value = 1
+ mongo.get_collection().with_options().count_documents.return_value = 1
  RootEntitySet = edm.EntitySet(
  {
  "Name": "Products",
@@ -622,7 +624,7 @@ def test_get_collection_count(self, parse_qs):
  )
  def test_get_collection_mongo_prefix_entity(self, parse_qs):
  mongo = unittest.mock.Mock()
- mongo.get_collection().aggregate.return_value = iter(
+ mongo.get_collection().with_options().aggregate.return_value = iter(
  (
  {
  "ID": 1,
@@ -671,7 +673,7 @@ def test_get_collection_mongo_prefix_entity(self, parse_qs):
  )
  def test_get_collection_mongo_prefix_entity_orderby(self, parse_qs):
  mongo = unittest.mock.Mock()
- mongo.get_collection().aggregate.return_value = iter(
+ mongo.get_collection().with_options().aggregate.return_value = iter(
  (
  {
  "ID": 1,
@@ -720,7 +722,7 @@ def test_get_collection_mongo_prefix_entity_orderby(self, parse_qs):
  )
  def test_get_collection_mongo_prefix_entity_seq_filter(self, parse_qs):
  mongo = unittest.mock.Mock()
- mongo.get_collection().aggregate.return_value = iter(
+ mongo.get_collection().with_options().aggregate.return_value = iter(
  (
  {
  "ID": 1,
@@ -765,7 +767,7 @@ def test_get_collection_mongo_prefix_entity_seq_filter(self, parse_qs):
  )
  def test_get_collection_mongo_prefix_entity_count(self, parse_qs):
  mongo = unittest.mock.Mock()
- mongo.get_collection().aggregate.side_effect = (
+ mongo.get_collection().with_options().aggregate.side_effect = (
  iter(
  (
  {
@@ -813,7 +815,7 @@ def test_get_collection_mongo_prefix_entity_count(self, parse_qs):
  )
  def test_get_collection_mongo_prefix_collection(self, parse_qs):
  mongo = unittest.mock.Mock()
- mongo.get_collection().aggregate.return_value = iter(
+ mongo.get_collection().with_options().aggregate.return_value = iter(
  (
  {
  "ID": 1,