PPR API account registrations filter query updates. (#2259)

Signed-off-by: Doug Lovett <doug@diamante.ca>

Author: doug-lovett

ppr-api/src/ppr_api/models/registration_utils.py

@@ -233,30 +233,30 @@
 QUERY_ACCOUNT_CHANGE_DEFAULT_ORDER = " ORDER BY arv2.registration_ts DESC"
 QUERY_ACCOUNT_REG_LIMIT = " LIMIT :page_size OFFSET :page_offset"
 QUERY_ACCOUNT_REG_NUM_CLAUSE = """
- AND (arv.registration_number LIKE :reg_num || '%' OR
+ AND (position(:reg_num in arv.registration_number) > 0 OR
       EXISTS (SELECT arv2.financing_id
                 FROM account_registration_vw arv2
                WHERE arv2.financing_id = arv.financing_id
                  AND arv2.registration_type_cl NOT IN ('CROWNLIEN', 'MISCLIEN', 'PPSALIEN')
-                 AND arv2.registration_number LIKE :reg_num || '%'))
+                 AND position(:reg_num in arv2.registration_number) > 0))
 """
-QUERY_ACCOUNT_CLIENT_REF_CLAUSE = " AND arv.client_reference_id LIKE '%' || :client_reference_id || '%'"
+QUERY_ACCOUNT_CLIENT_REF_CLAUSE = " AND position(:client_reference_id in UPPER(arv.client_reference_id)) > 0"
 QUERY_ACCOUNT_CLIENT_REF_CLAUSE_NEW = """
- AND (arv.client_reference_id ILIKE '%' || :client_reference_id || '%' OR
+ AND (position(:client_reference_id in UPPER(arv.client_reference_id)) > 0 OR
     EXISTS (SELECT arv2.financing_id
             FROM account_registration_vw arv2
             WHERE arv2.financing_id = arv.financing_id
                 AND arv2.registration_type_cl NOT IN ('CROWNLIEN', 'MISCLIEN', 'PPSALIEN')
-                AND arv2.client_reference_id ILIKE :client_reference_id || '%'))
+                AND position(:client_reference_id in UPPER(arv2.client_reference_id)) > 0))
 """
-QUERY_ACCOUNT_REG_NAME_CLAUSE = " AND arv.registering_name LIKE '%' || :registering_name || '%'"
+QUERY_ACCOUNT_REG_NAME_CLAUSE = " AND position(:registering_name in UPPER(arv.registering_name)) > 0"
 QUERY_ACCOUNT_REG_NAME_CLAUSE_NEW = """
- AND (arv.registering_name ILIKE '%' || :registering_name || '%' OR
+ AND (position(:registering_name in UPPER(arv.registering_name)) > 0 OR
     EXISTS (SELECT arv2.financing_id
             FROM account_registration_vw arv2
             WHERE arv2.financing_id = arv.financing_id
                 AND arv2.registration_type_cl NOT IN ('CROWNLIEN', 'MISCLIEN', 'PPSALIEN')
-                AND arv2.registering_name ILIKE '%' || :registering_name || '%'))
+                AND position(:registering_name in UPPER(arv2.registering_name)) > 0))
 """
 QUERY_ACCOUNT_STATUS_CLAUSE = " AND arv.state = :status_type"
 QUERY_ACCOUNT_REG_TYPE_CLAUSE = " AND arv.registration_type = :registration_type"

ppr-api/src/ppr_api/models/utils.py

@@ -256,11 +256,11 @@
 """
 QUERY_ACCOUNT_DRAFTS_LIMIT = " FETCH FIRST :max_results_size ROWS ONLY"
 QUERY_ACCOUNT_DRAFTS_DEFAULT_ORDER = " ORDER BY create_ts DESC"
-QUERY_ACCOUNT_DRAFTS_DOC_NUM_CLAUSE = " AND document_number LIKE :doc_num || '%'"
-QUERY_ACCOUNT_DRAFTS_CLIENT_REF_CLAUSE = " AND client_reference_id LIKE '%' || :client_reference_id || '%'"
-QUERY_ACCOUNT_DRAFTS_CLIENT_REF_CLAUSE_NEW = " AND client_reference_id ILIKE '%' || :client_reference_id || '%'"
-QUERY_ACCOUNT_DRAFTS_REG_NAME_CLAUSE = " AND registering_name LIKE '%' || :registering_name || '%'"
-QUERY_ACCOUNT_DRAFTS_REG_NAME_CLAUSE_NEW = " AND registering_name ILIKE '%' || :registering_name || '%'"
+QUERY_ACCOUNT_DRAFTS_DOC_NUM_CLAUSE = " AND position(:doc_num in q.document_number) > 0"
+QUERY_ACCOUNT_DRAFTS_CLIENT_REF_CLAUSE = " AND position(:client_reference_id in UPPER(q.client_reference_id)) > 0"
+QUERY_ACCOUNT_DRAFTS_CLIENT_REF_CLAUSE_NEW = " AND position(:client_reference_id in UPPER(q.client_reference_id)) > 0"
+QUERY_ACCOUNT_DRAFTS_REG_NAME_CLAUSE = " AND position(:registering_name in UPPER(q.registering_name)) > 0"
+QUERY_ACCOUNT_DRAFTS_REG_NAME_CLAUSE_NEW = " AND position(:registering_name in UPPER(q.registering_name)) > 0"
 QUERY_ACCOUNT_DRAFTS_REG_TYPE_CLAUSE = " AND registration_type = :registration_type"
 QUERY_ACCOUNT_DRAFTS_DATE_CLAUSE = """
  AND create_ts BETWEEN (TO_TIMESTAMP(:start_date_time, 'YYYY-MM-DD HH24:MI:SS') at time zone 'utc') AND

ppr-api/src/ppr_api/resources/utils.py

@@ -704,10 +704,18 @@ def get_account_registration_params(req: request, params: AccountRegistrationPar
     if start_ts and end_ts:
         params.start_date_time = start_ts
         params.end_date_time = end_ts
-    if params.sort_direction is not None:
+    if params.sort_direction:
         params.sort_direction = params.sort_direction.lower()
-    if params.registration_number is not None:
+    if params.registration_number:
         params.registration_number = params.registration_number.strip().upper()
+    if params.registration_type:
+        params.registration_type = params.registration_type.strip().upper()
+    if params.status_type:
+        params.status_type = params.status_type.strip().upper()
+    if params.client_reference_id:
+        params.client_reference_id = params.client_reference_id.strip().upper()
+    if params.registering_name:
+        params.registering_name = params.registering_name.strip().upper()
     return params