fix manager transaction evaluation (#1104)

Author: tomkralidis

pycsw/ogc/api/oapi.py

@@ -31,6 +31,7 @@
 import logging
 
 from pycsw import __version__
+from pycsw.core.util import str2bool
 from pycsw.ogc.api.util import yaml_load
 
 LOGGER = logging.getLogger(__name__)
@@ -429,7 +430,7 @@ def gen_oapi(config, oapi_filepath, mode='ogcapi-records'):
         }
     }
 
-    if config['manager'].get('transactions', False):
+    if str2bool(config['manager'].get('transactions', False)):
         LOGGER.debug('Transactions enabled; adding post')
 
         path['post'] = {
@@ -499,7 +500,7 @@ def gen_oapi(config, oapi_filepath, mode='ogcapi-records'):
         }
     }
 
-    if config['manager'].get('transactions', False):
+    if str2bool(config['manager'].get('transactions', False)):
         LOGGER.debug('Transactions enabled; adding put/delete')
 
         path['put'] = {

pycsw/ogc/api/records.py

@@ -286,7 +286,7 @@ def landing_page(self, headers_, args):
               'type': 'application/json',
               'title': 'Main collection',
               'href': f"{self.config['server']['url']}/collections/metadata:main"
-            },{
+            }, {
               'rel': 'http://www.opengis.net/def/rel/ogc/1.0/ogc-catalog',
               'type': 'application/json',
               'title': 'Record catalogue collection',
@@ -912,7 +912,7 @@ def manage_collection_item(self, headers_, action='create', item=None, data=None
         :returns: tuple of headers, status code, content
         """
 
-        if not self.config['manager']['transactions']:
+        if not str2bool(self.config['manager'].get('transactions', False)):
             return self.get_exception(
                     405, headers_, 'InvalidParameterValue',
                     'transactions not allowed')
@@ -1284,10 +1284,15 @@ def record2json(record, url, collection, mode='ogcapi-records'):
         try:
             for theme in json.loads(record.themes):
                 try:
-                    ogcapi_themes.append({
-                        'scheme': theme['thesaurus'].get('url') or theme['thesaurus'].get('title'),
+                    theme_ = {
                         'concepts': [{'id': c.get('name', '')} for c in theme.get('keywords', []) if 'name' in c and c['name'] not in [None, '']]
-                    })
+                    }
+                    if 'thesaurus' in theme:
+                        theme_['scheme'] = theme['thesaurus'].get('url') or theme['thesaurus'].get('title'),
+                    elif 'scheme' in theme:
+                        theme_['scheme'] = theme['scheme']
+
+                    ogcapi_themes.append(theme_)
                 except Exception as err:
                     LOGGER.exception(f"failed to parse theme of {record.identifier}: {err}")
         except Exception as err:

pycsw/server.py

@@ -745,7 +745,7 @@ def _gen_soap_wrapper(self):
 
     def _gen_manager(self):
         """ Update self.context.model with CSW-T advertising """
-        if self.config['manager'].get('transactions', False):
+        if util.str2bool(self.config['manager'].get('transactions', False)):
 
             self.manager = True
 
@@ -792,7 +792,7 @@ def _gen_manager(self):
     def _test_manager(self):
         """ Verify that transactions are allowed """
 
-        if not self.config['manager'].get('transactions', False):
+        if not util.str2bool(self.config['manager'].get('transactions', False)):
             raise RuntimeError('CSW-T interface is disabled')
 
         # get the client first forwarded ip

tests/functionaltests/suites/oarec/test_oarec_functional.py

@@ -31,6 +31,7 @@
 #
 # =================================================================
 
+from copy import deepcopy
 import json
 from xml.etree import ElementTree as etree
 
@@ -131,6 +132,7 @@ def test_items(config):
 
     params = {'q': 'Lorem'}
     content = json.loads(api.items({}, None, params)[2])
+
     assert content['numberMatched'] == 5
     assert content['numberReturned'] == 5
     assert len(content['features']) == content['numberReturned']
@@ -357,6 +359,33 @@ def test_json_transaction(config, sample_record):
 
     assert status == 404
 
+    config2 = deepcopy(config)
+    config2['manager']['transactions'] = False
+
+    api = API(config2)
+    request_headers = {
+        'Content-Type': 'application/json'
+    }
+
+    # fail on insert record attempt
+    headers, status, content = api.manage_collection_item(
+        request_headers, 'create', data=sample_record)
+
+    assert status == 405
+
+    config2['manager']['transactions'] = 'false'
+
+    api = API(config2)
+    request_headers = {
+        'Content-Type': 'application/json'
+    }
+
+    # fail on insert record attempt
+    headers, status, content = api.manage_collection_item(
+        request_headers, 'create', data=sample_record)
+
+    assert status == 405
+
 
 def test_xml_transaction(config):
     api = API(config)