Merge pull request #1576 from stevenc987/main

Auth -Search Name Request - Cancelled Name Request should not be selected#19703
bcgov · Sep 25, 2024 · 3d943df · 3d943df
2 parents 85a0c62 + 95a2222
commit 3d943df
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/api/namex/VERSION.py b/api/namex/VERSION.py
@@ -1 +1 @@
-__version__ = '1.2.7'
+__version__ = '1.2.8'
diff --git a/api/namex/resources/requests.py b/api/namex/resources/requests.py
@@ -453,7 +453,7 @@ def _get_next_set_from_solr(solr_query, start, rows):
  have_more_data = results['response']['numFound'] > (start + rows)
  identifiers = [name['nr_num'] for name in results['names']]
  return RequestDAO.query.filter(
- RequestDAO.nrNum.in_(identifiers),
+ RequestDAO.nrNum.in_(identifiers), RequestDAO.stateCd != State.CANCELLED,
  or_(RequestDAO.stateCd != State.EXPIRED,
  text(f"(requests.state_cd = '{State.EXPIRED}' AND CAST(requests.expiration_date AS DATE) + "
  "interval '60 day' >= CAST(now() AS DATE))"))