correct the precedence of filters applied

uwblueprint · Feb 7, 2024 · 68b7e76 · 68b7e76
1 parent cca13a2
commit 68b7e76
Showing 1 changed file with 3 additions and 2 deletions.
diff --git a/backend/app/services/implementations/log_records_service.py b/backend/app/services/implementations/log_records_service.py
@@ -7,6 +7,7 @@
 from datetime import datetime
 from pytz import timezone, utc
 from sqlalchemy import text
+from flask import current_app
 
 
 class LogRecordsService(ILogRecordsService):
@@ -173,11 +174,11 @@ def filter_log_records(self, filters=None):
             for filter in filters:
                 if filters.get(filter):
                     if is_first_filter:
-                        sql = sql + "\nWHERE " + options[filter](filters.get(filter))
+                        sql = sql + "\nWHERE " + "(" + options[filter](filters.get(filter)) + ")"
                         is_first_filter = False
                     else:
                         if filters.get(filter):
-                            sql = sql + "\nAND " + options[filter](filters.get(filter))
+                            sql = sql + "\nAND " + "(" + options[filter](filters.get(filter)) + ")"
         return sql
 
     def join_resident_attributes(self):