Update consent query for name-examination search (#1516)

* Merge branch 'main' of https://github.com/eve-git/namex into main * update consent query for search
bcgov · Mar 20, 2024 · bc7e19c · bc7e19c
1 parent 0478cc7
commit bc7e19c
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/api/namex/VERSION.py b/api/namex/VERSION.py
@@ -1,2 +1,2 @@
-__version__ = '1.1.50'
+__version__ = '1.1.51'
 
diff --git a/api/namex/resources/requests.py b/api/namex/resources/requests.py
@@ -254,11 +254,13 @@ def get(*args, **kwargs):
             q = q.join(RequestDAO.applicants).filter(Applicant.lastName.ilike('%' + lastName + '%'))
 
         if consentOption == 'Received':
-            q = q.filter(or_(RequestDAO.consentFlag == 'R', RequestDAO.consent_dt.isnot(None)))
+            q = q.filter(RequestDAO.consentFlag == 'R')
         if consentOption == 'Yes':
             q = q.filter(RequestDAO.consentFlag == 'Y')
+        elif consentOption == 'Waived':
+            q = q.filter(RequestDAO.consentFlag == 'N')
         elif consentOption == 'No':
-            q = q.filter(and_(RequestDAO.consentFlag == 'N', RequestDAO.consent_dt == None))
+            q = q.filter(RequestDAO.consentFlag.is_(None))
 
         if priority == 'Standard':
             q = q.filter(RequestDAO.priorityCd != 'Y')