Merge branch 'feature/icat-include-filter-#143' into feature/distinct…

…-filter-included-columns-#148

LICENSE

@@ -186,7 +186,7 @@
       same "printed page" as the copyright notice for easier
       identification within third-party archives.
 
-   Copyright [yyyy] [name of copyright owner]
+   Copyright 2019 - Science and Technology Facilities Council – UK Research and Innovation
 
    Licensed under the Apache License, Version 2.0 (the "License");
    you may not use this file except in compliance with the License.

common/config.py

@@ -81,7 +81,6 @@ def get_icat_properties(self):
         properties_url = f"{config.get_icat_url()}/icat/properties"
         r = requests.request("GET", properties_url, verify=config.get_icat_check_cert())
         icat_properties = r.json()
-        log.debug("ICAT Properties: %s", icat_properties)
 
         return icat_properties
 

common/constants.py

@@ -5,3 +5,4 @@ class Constants:
     DATABASE_URL = config.get_db_url()
     ACCEPTED_DATE_FORMAT = "%Y-%m-%d %H:%M:%S"
     PYTHON_ICAT_DISTNCT_CONDITION = "!= null"
+    ICAT_PROPERTIES = config.get_icat_properties()

common/icat/filters.py

@@ -10,6 +10,7 @@
 )
 from common.exceptions import FilterError
 from common.config import config
+from common.constants import Constants
 
 log = logging.getLogger()
 
@@ -26,7 +27,7 @@ def apply_filter(self, query):
         elif self.operation == "ne":
             where_filter = self.create_condition(self.field, "!=", self.value)
         elif self.operation == "like":
-            where_filter = self.create_condition(self.field, "like", self.value)
+            where_filter = self.create_condition(self.field, "like", f"%{self.value}%")
         elif self.operation == "lt":
             where_filter = self.create_condition(self.field, "<", self.value)
         elif self.operation == "lte":
@@ -125,7 +126,7 @@ def __init__(self, skip_value):
         super().__init__(skip_value)
 
     def apply_filter(self, query):
-        icat_properties = config.get_icat_properties()
+        icat_properties = Constants.ICAT_PROPERTIES
         icat_set_limit(query, self.skip_value, icat_properties["maxEntities"])