fix: move count to base provider

This work has been done to move count to the base provider. While doing this work I also added a debug log message to state when the count had been disabled in the SQL provider.

Also, I removed some tests that were no longer needed after the introduction of the str2bool function, when getting the count value from the configuration file.

Author: mdearos

pygeoapi/provider/base.py

@@ -57,6 +57,8 @@ def __init__(self, provider_def):
         :returns: pygeoapi.provider.base.BaseProvider
         """
 
+        from pygeoapi.util import str2bool
+
         try:
             self.name = provider_def['name']
             self.type = provider_def['type']
@@ -65,6 +67,7 @@ def __init__(self, provider_def):
             raise RuntimeError('name/type/data are required')
 
         self.editable = provider_def.get('editable', False)
+        self.count = str2bool(provider_def.get('count', 'true'))
         self.options = provider_def.get('options')
         self.id_field = provider_def.get('id_field')
         self.uri_field = provider_def.get('uri_field')

pygeoapi/provider/sql.py

@@ -128,7 +128,6 @@ def __init__(
         self.id_field = provider_def['id_field']
         self.geom = provider_def.get('geom_field', 'geom')
         self.driver_name = driver_name
-        self.count = str(provider_def.get('count', 'true')).lower() == 'true'
 
         LOGGER.debug(f'Name: {self.name}')
         LOGGER.debug(f'Table: {self.table}')
@@ -225,6 +224,8 @@ def query(
                 matched = results.count()
                 response['numberMatched'] = matched
                 LOGGER.debug(f'Found {matched} result(s)')
+            else:
+                LOGGER.debug('Count disabled')
 
             if resulttype == 'hits' or not results:
                 return response

tests/provider/test_postgresql_provider.py

@@ -85,8 +85,7 @@ def config():
         },
         'id_field': 'osm_id',
         'table': 'hotosm_bdi_waterways',
-        'geom_field': 'foo_geom',
-        'count': 'true'
+        'geom_field': 'foo_geom'
     }
 
 
@@ -922,29 +921,9 @@ def test_provider_count_default_value(config):
     assert results['numberMatched'] == 14776
 
 
-@pytest.mark.parametrize("count_value", [
-    ('true'),
-    ('TRUE')
-])
-def test_provider_count_true(config, count_value):
-    # Arrange
-    config['count'] = count_value
-    provider = PostgreSQLProvider(config)
-
-    # Act
-    results = provider.query()
-
-    # Assert
-    assert results['numberMatched'] == 14776
-
-
-@pytest.mark.parametrize("count_value", [
-    ('false'),
-    ('FALSE')
-])
-def test_provider_count_false(config, count_value):
+def test_provider_count_false(config):
     # Arrange
-    config['count'] = count_value
+    config['count'] = 'false'
     provider = PostgreSQLProvider(config)
 
     # Act
@@ -964,15 +943,3 @@ def test_provider_count_false_with_resulttype_hits(config):
 
     # Assert
     assert results['numberMatched'] == 14776
-
-
-def test_provider_count_number_string(config):
-    # Arrange
-    config['count'] = '1'
-    provider = PostgreSQLProvider(config)
-
-    # Act
-    results = provider.query()
-
-    # Assert
-    assert 'numberMatched' not in results