From 9509971ffd45acfe260b7285fea14968cef9decd Mon Sep 17 00:00:00 2001 From: rdbsolutions Date: Tue, 1 Oct 2024 13:51:54 +0100 Subject: [PATCH] Advanced search error --- .env.local | 44 +++++++------------ pages/api/endpoint/getadvancedsearch_api.js | 5 ++- .../endpoint/getadvancedsearchpaged_api.js | 6 +-- 3 files changed, 21 insertions(+), 34 deletions(-) diff --git a/.env.local b/.env.local index 482406d2..10bb2a17 100644 --- a/.env.local +++ b/.env.local @@ -26,6 +26,13 @@ RELAYPATH = "ar-hc-lz-pedw-cnr-uks-01" //RELAYURI = "test-pedw-ns.servicebus.windows.net" //RELAYPATH = "test-pedw-hc" +//New Test +CLIENT_ID = d40b9373-96c2-4b04-8bd8-c2a2fe6444c1 +CLIENT_SECRET = 6hT8Q~glL~jloWpGmvXw3UY37QFwjUE0r._jobEM +RELAY_ROOT = https://ar-ns-lz-pedw-test-uks-01.servicebus.windows.net/ar-hc-lz-pedw-test-uks-01/ +RELAYURI = "ar-ns-lz-pedw-test-uks-01.servicebus.windows.net" +RELAYPATH = "ar-hc-lz-pedw-test-uks-01" + //Preprod Oauth WGO //CLIENT_ID = ab6c4678-b31a-4eb3-b429-e039120e488a @@ -92,9 +99,9 @@ AZURE_TENANT_ID = $TENANT AZURE_CLIENT_SECRET = $CLIENT_SECRET // CNR key -AZURE_STORAGE_ACCOUNT_NAME = "sapltpedwcnruks" -AZURE_STORAGE_ACCOUNT_KEY = hRffHq4IwctpaTKdS/U33Xq6nyTDF1t++WJgIwsw7gzstktZin/rRwbTIAL9KKqesVsK7EHrTTG6+ASt4+7skw== -AZURE_PEDW_STORAGE_ENDPOINT = https://sapltpedwcnruks.blob.core.windows.net +# AZURE_STORAGE_ACCOUNT_NAME = "sapltpedwcnruks" +# AZURE_STORAGE_ACCOUNT_KEY = hRffHq4IwctpaTKdS/U33Xq6nyTDF1t++WJgIwsw7gzstktZin/rRwbTIAL9KKqesVsK7EHrTTG6+ASt4+7skw== +# AZURE_PEDW_STORAGE_ENDPOINT = https://sapltpedwcnruks.blob.core.windows.net // dev key @@ -108,6 +115,11 @@ AZURE_PEDW_STORAGE_ENDPOINT = https://sapltpedwcnruks.blob.core.windows.net //AZURE_STORAGE_ACCOUNT_KEY = iEQKwh4TB9BT63pU5a6+ivn6ItiDkuIkYCrUwjm9STJTdMBOKWUT06EEcP8pcy/qeQ89ogK75mFQ+AStT53G/g== //AZURE_PEDW_STORAGE_ENDPOINT = https://pedwtest.blob.core.windows.net +// New test key +AZURE_STORAGE_ACCOUNT_NAME = "sapltpedwtestuks" +AZURE_STORAGE_ACCOUNT_KEY = bqJAz5pYQVGee8dnVhlsqW+xHwinNTjgY2AmojNyB+d4uAotMR20WcO4Op13yB+9dFaXAkkjtIA4+AStHT/IYg== +AZURE_PEDW_STORAGE_ENDPOINT = https://sapltpedwtestuks.blob.core.windows.net + // preprod key //AZURE_STORAGE_ACCOUNT_NAME = "pedwpp" @@ -126,33 +138,7 @@ AZURE_PEDW_QUEUE_ENDPOINT = https://$AZURE_STORAGE_ACCOUNT_NAME.queue.core.windo //gov.notify NOTIFY_API_KEY = pedwnextauthkey-90f93710-9dae-423e-aea1-11eccd0dc132-0c9469d9-d671-444d-9e9d-3e5a62001043 - - -# //Bastion access to vnet vms -# [13:56] Suter, Matthew (COOG - DDAT - IT Services) -# Login is PEDWAdmin -# [13:57] Suter, Matthew (COOG - DDAT - IT Services) -# Pwd is -PK2_NQ-HuD2AFp - - -# [13:41] Suter, Matthew (COOG - DDAT - IT Services) -# so the admin login is PEDWSqlAdminPP -# [13:41] Suter, Matthew (COOG - DDAT - IT Services) -# password is rvJDj4ekfGSgwQpWTA38tDVJvFfSMbvmNGxd3YcII0M= - - - -# @Microsoft.KeyVault(SecretUri=https://test-pedw-kv.vault.azure.net/secrets/PEDW-FrontEnd-Test-AppReg-Secrate/) - - -# [12:24] Thompson, Phil (COOG - Planning & Environment Decisions Wales) -# {"pinswg_name":"48181 Planning Appeal E PROOF8.pdf","pinswg_DocumentIds@odata.bind":"/incidents(6CD13EF8-5BC9-ED11-A997-00224800E98C)","pinswg_isharedocumentlocations":"846040009","pinswg_isharedocumentclassification":"846040000","pinswg_uploadurl":"https://pedwinternalprod.blob.core.windows.net/crm-file-upload/6CD13EF8-5BC9-ED11-A997-00224800E98C/48181 Planning Appeal E PROOF8.pdf"} -# [12:25] Thompson, Phil (COOG - Planning & Environment Decisions Wales) -# https://crm2016.llc.gov.wales/PEDW/api/data/v8.2/pinswg_documents - -# DATABASE_URL='sqlserver://pp-pedw-sql.database.windows.net:1433;database=PEDWPreProd;user=pp-pedw-ukw;password=jscw4+896w9YaiXruOA3mtpNkio1oUZxBZcFJ9Awdz4=;encrypt=true;trustservercertificate=false;hostnameincertificate=*.database.windows.net;logintimeout=30;authentication=SqlPassword' - SHOW_DEBUG = true diff --git a/pages/api/endpoint/getadvancedsearch_api.js b/pages/api/endpoint/getadvancedsearch_api.js index 67cd2263..ec6594e9 100644 --- a/pages/api/endpoint/getadvancedsearch_api.js +++ b/pages/api/endpoint/getadvancedsearch_api.js @@ -54,6 +54,8 @@ export default async function ApiProxy(req, res) { var queryString = ""; + searchString.q = searchString.q.replace(/\'/g, "''"); + queryString += _.has(searchString, "q") && searchString.q != null ? "(contains(title, '" + @@ -79,10 +81,9 @@ export default async function ApiProxy(req, res) { : ""; //console.log(queryString); - queryString = queryString.replace(/\'/g, "''"); var queryUrl = - "incidents?$select=modifiedon,description,numberofchildincidents,_accountid_value,_customerid_value,_pinswg_associatedlpa_value,_ownerid_value,pinswg_appealcasetype,statuscode,ticketnumber,title, _primarycontactid_value,pinswg_lpareference&$expand=primarycontactid($select=fullname)&$filter=" + + "incidents?$select=modifiedon,description,numberofchildincidents,_accountid_value,_customerid_value,_pinswg_associatedlpa_value,_ownerid_value,pinswg_appealcasetype,statuscode,ticketnumber,title,_primarycontactid_value,pinswg_lpareference&$expand=primarycontactid($select=fullname)&$filter=" + queryString + " pinswg_appealcasetype ne null and pinswg_publishtoweb eq true&$orderby=createdon desc&$count=true"; diff --git a/pages/api/endpoint/getadvancedsearchpaged_api.js b/pages/api/endpoint/getadvancedsearchpaged_api.js index 0a7fc956..3a3c293d 100644 --- a/pages/api/endpoint/getadvancedsearchpaged_api.js +++ b/pages/api/endpoint/getadvancedsearchpaged_api.js @@ -89,6 +89,8 @@ export default async function ApiProxy(req, res) { var queryString = ""; + searchString.q = searchString.q.replace(/\'/g, "''"); + queryString += _.has(searchString, "q") && searchString.q != null ? "(contains(title, '" + @@ -113,10 +115,8 @@ export default async function ApiProxy(req, res) { ? " statuscode eq " + searchString.statuscode + " and" : ""; - queryString = queryString.replace(/\'/g, "''"); - var queryUrl = - "incidents?$select=modifiedon,description,numberofchildincidents,_accountid_value,_customerid_value,_pinswg_associatedlpa_value,_ownerid_value,pinswg_appealcasetype,statuscode,ticketnumber,title, _primarycontactid_value,pinswg_lpareference&$expand=primarycontactid($select=fullname)&$filter=" + + "incidents?$select=modifiedon,description,numberofchildincidents,_accountid_value,_customerid_value,_pinswg_associatedlpa_value,_ownerid_value,pinswg_appealcasetype,statuscode,ticketnumber,title,_primarycontactid_value,pinswg_lpareference&$expand=primarycontactid($select=fullname)&$filter=" + queryString + " pinswg_appealcasetype ne null and pinswg_publishtoweb eq true&$orderby=" + orderby +