Merge pull request #108 from ProteinsWebTeam/dev

fix has_model

Author: gustavo-salazar

dev_requirements.txt

@@ -1,5 +1,5 @@
 # remember to check the version is compatible with python 3.6
-selenium~=3.141
+selenium==4.9.0
 django-debug-toolbar~=3.2
 ipdb==0.13.9
 coveralls==3.3.1

requirements.txt

@@ -1,11 +1,11 @@
 # remember to check the version is compatible with python 3.6
-Django==3.2.18
+Django==3.2.19
 djangorestframework==3.13.1
 PyYAML==6.0
 jsonfield2==4.0.0.post0
 pymysql==1.0.2
 django-cors-headers~=3.10
 gunicorn==20.1.0
 django-redis==5.2.0
-redis==4.3.4
+redis==4.4.4
 requests~=2.27

webfront/searcher/elastic_controller.py

@@ -268,7 +268,8 @@ def get_group_obj_of_field_by_query(
                 self.add_subterm_aggs(obj, f, rows)
                 obj = obj["aggs"]["subgroups"]
         if fq is not None:
-            query += " && " + fq
+            # the query might have a sorting parameter, so fq needs to be prepend
+            query = fq + " && " + query
         response = self._elastic_json_query(query, facet)
         buckets = response["aggregations"]["groups"]["buckets"]
         if len(buckets) > 0 and "tops" not in buckets[0]:
@@ -412,7 +413,7 @@ def execute_query(self, query, fq=None, rows=0, query_obj=None, is_ida=False):
             query = self.queryset_manager.get_searcher_query()
         q = query
         if fq is not None:
-            q = query + " && " + fq.lower()
+            q = fq.lower() + " && " + query
         q = (
             q.replace(" && ", "%20AND%20")
             .replace(" || ", "%20OR%20")