From 6ae14cb04e6da2e88ef06aed26d6a3e9bd1d948e Mon Sep 17 00:00:00 2001 From: rdbsolutions Date: Mon, 17 Jan 2022 19:05:56 +0000 Subject: [PATCH] refined queries by case type --- .env.local | 2 +- actions/selectQueryTypes.js | 49 +++++++++++++++++++ .../endpoint/getbasicdnssearchdetails_api.js | 3 ++ .../getbasicdnssearchdetailspaged_api.js | 3 ++ .../api/endpoint/getbasicsearchdetails_api.js | 5 ++ .../getbasicsearchdetailspaged_api.js | 5 ++ 6 files changed, 66 insertions(+), 1 deletion(-) create mode 100644 actions/selectQueryTypes.js diff --git a/.env.local b/.env.local index 329267cc..df582cb5 100644 --- a/.env.local +++ b/.env.local @@ -66,6 +66,6 @@ GG_REDIRECT_URI = "http://localhost:3000" NEXT_PUBLIC_GG_CLIENT_ID = 5vTukeSpN7d6uBV7YLb7A5wOctzzkZ NEXT_PUBLIC_GG_REDIRECT_URI = "http://localhost:3000" -API_ROOT = "http://localhost:3000/" +API_ROOT = "http://localhost:3000" diff --git a/actions/selectQueryTypes.js b/actions/selectQueryTypes.js new file mode 100644 index 00000000..03695bea --- /dev/null +++ b/actions/selectQueryTypes.js @@ -0,0 +1,49 @@ +export const getSelectQuery = (appealTypeName) => { + switch (appealTypeName) { + case "pinswg_advertses": + return "&$select=_pinswg_appellant_value,pinswg_name,pinswg_siteaddresscounty,pinswg_siteaddressline1,pinswg_siteaddressline2,pinswg_siteaddresspostcode,pinswg_siteaddresstown,_pinswg_associatedlpa_value,pinswg_casedecisiondate,pinswg_dateeventrequested,pinswg_decision,pinswg_procedure,pinswg_questionnaireduedate,statuscode"; + break; + case "pinswg_callinss77s": + return "&$select=_pinswg_appellant_value,pinswg_name,pinswg_siteaddresscounty,pinswg_siteaddressline1,pinswg_siteaddressline2,pinswg_siteaddresspostcode,pinswg_siteaddresstown,_pinswg_associatedlpa_value,pinswg_casedecisiondate,pinswg_dateeventrequested,pinswg_decision,pinswg_finalcommentsduedate,pinswg_procedure,pinswg_proofsofevidencewrittenstatementsofeviden,pinswg_questionnaireduedate,pinswg_startdate,statuscode"; + break; + case "pinswg_commonlands": + case "pinswg_environmentalpermittings": + case "pinswg_hedgeshedgerowstreepreservationreplacems": + case "pinswg_miscellaneouscaseworks": + case "pinswg_wayleaves": + return "&$select=_pinswg_appellant_value,pinswg_name,pinswg_siteaddresscounty,pinswg_siteaddressline1,pinswg_siteaddressline2,pinswg_siteaddresspostcode,pinswg_siteaddresstown,_pinswg_associatedlpa_value,pinswg_casedecisiondate,pinswg_dateeventrequested,pinswg_decision,pinswg_finalcommentsduedate,pinswg_otherpartiesstatement,pinswg_procedure,pinswg_proofsofevidencewrittenstatementsofeviden,pinswg_questionnaireduedate,pinswg_relevantauthorityname,pinswg_startdate,statuscode"; + break; + case "pinswg_communityinfrastructurelevys117118119s": + return "&$select=_pinswg_appellant_value,pinswg_name,pinswg_siteaddresscounty,pinswg_siteaddressline1,pinswg_siteaddressline2,pinswg_siteaddresspostcode,pinswg_siteaddresstown,_pinswg_associatedlpa_value,pinswg_casedecisiondate,pinswg_dateeventrequested,pinswg_decision,pinswg_finalcommentsduedate,pinswg_procedure,pinswg_startdate,statuscode"; + break; + case "pinswg_compulsorypurchaseorderses": + return "&$select=_pinswg_appellant_value,pinswg_name,pinswg_siteaddresscounty,pinswg_siteaddressline1,pinswg_siteaddressline2,pinswg_siteaddresspostcode,pinswg_siteaddresstown,pinswg_casedecisiondate,pinswg_dateeventrequested,pinswg_decision,pinswg_finalcommentsduedate,pinswg_otherpartiesstatement,pinswg_procedure,pinswg_proofsofevidencewrittenstatementsofeviden,pinswg_questionnaireduedate,pinswg_relevantauthorityname,pinswg_startdate,statuscode"; + case "pinswg_dnses": + return "&$select=_pinswg_appellant_value,pinswg_name,pinswg_addressline1,pinswg_addressline2,pinswg_postcode,pinswg_addresstown,_pinswg_associatedlpa_value,pinswg_addresscounty,pinswg_applicationacceptedasvalid,pinswg_applicationrejectedasinvalid,pinswg_choiceofprocedure,pinswg_confirmrequesttovaryapplication,pinswg_dateeventrequested,pinswg_dateofdecision,pinswg_dateofrequesttovarytheapplication,pinswg_dateofsubmissionofapplication,pinswg_dateprojectpublishedonwebsite,pinswg_deadlineforsubmissionofapplication,pinswg_decision,pinswg_endofrepresentationperiod,pinswg_inspectorreportsubmittedtowelshgovernment,pinswg_procedureconfirmed,pinswg_projectdescription,pinswg_projectdescription,pinswg_projectlocation,pinswg_projectlocation,pinswg_recommendation,pinswg_rejectrequesttovaryapplication,pinswg_reportdueby,pinswg_suspensiondates,pinswg_suspensionenddates,pinswg_suspensionstartdates,pinswg_validnoticeofintentiontosubmitanapplicati,pinswg_webaddress,pinswg_withdrawndate,pinswg_writtenacceptanceofnotification,statuscode"; + case "pinswg_electricityacts": + return "&$select=_pinswg_appellant_value,pinswg_name,pinswg_siteaddressline1,pinswg_siteaddressline2,pinswg_siteaddresspostcode,pinswg_siteaddresstown,_pinswg_associatedlpa_value,pinswg_applicationacceptedasvalid,pinswg_applicationrejectedasinvalid,pinswg_confirmrequesttovaryapplication,pinswg_dateeventrequested,pinswg_dateofrequesttovarytheapplication,pinswg_dateofsubmissionofapplication,pinswg_dateprojectpublishedonwebsite,pinswg_deadlineforsubmissionofapplication,pinswg_decision,pinswg_endofrepresentationperiod,pinswg_inspectorreportsubmittedtowelshgovernment,pinswg_procedure,pinswg_procedureconfirmed,pinswg_projectdescription,pinswg_projectlocation,pinswg_recommendation,pinswg_rejectrequesttovaryapplication,pinswg_reportdueby,pinswg_suspensiondates,pinswg_validnoticeofintentiontosubmitanapplicati,pinswg_webaddress,pinswg_withdrawndate,pinswg_writtenacceptanceofnotification,statuscode"; + case "pinswg_householderappealhases": + return "&$select=_pinswg_appellant_value,pinswg_name,pinswg_siteaddressline1,pinswg_siteaddressline2,pinswg_siteaddresspostcode,pinswg_siteaddresstown,_pinswg_associatedlpa_value,pinswg_casedecisiondate,pinswg_dateeventrequested,pinswg_decision,pinswg_otherpartiesstatement,pinswg_otherpartiesstatement,pinswg_procedure,pinswg_questionnaireduedate,pinswg_startdate,pinswg_statementduedate,statuscode"; + case "pinswg_enforcementlistedbuildingconservationaps": + case "pinswg_enforcementnoticeappeals174s": + case "pinswg_lawfuldevelopmentcertificates": + case "pinswg_maintenanceoflands217s": + return "&$select=_pinswg_appellant_value,pinswg_name,pinswg_siteaddressline1,pinswg_siteaddressline2,pinswg_siteaddresspostcode,pinswg_siteaddresstown,_pinswg_associatedlpa_value,pinswg_casedecisiondate,pinswg_dateeventrequested,pinswg_decision,pinswg_finalcommentsduedate,pinswg_otherpartiesstatements,pinswg_procedure,pinswg_questionnaireduedate,pinswg_startdates,pinswg_statementduedate,statuscode"; + case "pinswg_lawfuldevelopmentcertificates": + return "&$select=_pinswg_appellant_value,pinswg_name,pinswg_siteaddressline1,pinswg_siteaddressline2,pinswg_siteaddresspostcode,pinswg_siteaddresstown,_pinswg_associatedlpa_value,pinswg_casedecisiondate,pinswg_dateeventrequested,pinswg_decision,pinswg_finalcommentsduedate,pinswg_otherpartiesstatements,pinswg_procedure,pinswg_questionnaireduedate,pinswg_startdate,pinswg_statementduedate,statuscode"; + case "pinswg_listedbuildingandconservationareaconsens": + return "&$select=_pinswg_appellant_value,pinswg_name,pinswg_siteaddressline1,pinswg_siteaddressline2,pinswg_sitepostcode,pinswg_siteaddresstown,_pinswg_associatedlpa_value,pinswg_casedecisiondate,pinswg_dateeventrequested,pinswg_decision,pinswg_finalcommentsduedate,pinswg_otherpartiesstatement,pinswg_procedure,pinswg_questionnaireduedate,pinswg_startdate,pinswg_statementduedate,statuscode"; + case "pinswg_planningappeals78s": + return "&$select=_pinswg_appellant_value,pinswg_name,pinswg_siteaddressline1,pinswg_siteaddressline2,pinswg_siteaddresspostcode,pinswg_siteaddresstown,pinswg_casedecisiondate,pinswg_dateeventrequested,pinswg_finalcommentsduedate,pinswg_procedure,pinswg_questionnaireduedate,pinswg_startdate,pinswg_statementduedate,statuscode"; + case "pinswg_planningconditionss73s79s": + return "&$select=_pinswg_appellant_value,pinswg_name,pinswg_siteaddressline1,pinswg_siteaddressline2,pinswg_siteaddresspostcode,pinswg_siteaddresstown,_pinswg_associatedlpa_value,pinswg_casedecisiondate,pinswg_dateeventrequested,pinswg_decision,pinswg_finalcommentsduedate,pinswg_otherpartiesstatement,pinswg_procedure,pinswg_questionnaireduedate,pinswg_startdate,pinswg_statementduedate,statuscode"; + case "pinswg_planningobligationappeals106s": + return "&$select=_pinswg_appellant_value,pinswg_name,pinswg_siteaddressline1,pinswg_siteaddressline2,pinswg_siteaddresspostcode,pinswg_siteaddresstown,_pinswg_associatedlpa_value,pinswg_casedecisiondate,pinswg_dateeventrequested,pinswg_decision,pinswg_finalcommentsduedate,pinswg_otherpartiesstatements,pinswg_procedure,pinswg_questionnaireduedate,pinswg_startdate,pinswg_statementduedate,statuscode"; + case "pinswg_rows": + return "&$select=_pinswg_appellant_value,pinswg_name,pinswg_siteaddressline1,pinswg_siteaddressline2,pinswg_siteaddresspostcode,pinswg_siteaddresstown,_pinswg_associatedlpa_value,pinswg_casedecisiondate,pinswg_dateeventrequested,pinswg_decision,pinswg_finalcommentsduedate,pinswg_otherpartiesstatement,pinswg_procedure,pinswg_proofsofevidencewrittenstatementsofeviden,pinswg_questionnaireduedate,pinswg_relevantauthorityname,pinswg_startdate,statuscode"; + break; + default: + return ""; + break; + } +}; diff --git a/pages/api/endpoint/getbasicdnssearchdetails_api.js b/pages/api/endpoint/getbasicdnssearchdetails_api.js index adfe4e76..d350307b 100644 --- a/pages/api/endpoint/getbasicdnssearchdetails_api.js +++ b/pages/api/endpoint/getbasicdnssearchdetails_api.js @@ -3,6 +3,7 @@ import https from "https"; import CryptoJS from "crypto-js"; import _ from "lodash"; import { getToken, azureHeadersPaged } from "../../../actions"; +import { getSelectQuery } from "../../../actions/selectQueryTypes"; const WORDKEY = process.env.HASHKEY; @@ -31,6 +32,8 @@ export default async function ApiProxy(req, res) { caseReference + "'&$count=true"; + queryUrl = queryUrl + getSelectQuery("pinswg_dnses"); + var apiResponse = _.isEmpty(req.query) ? res.status(400).json() : typeof caseReference != "undefined" && caseReference.length > 0 diff --git a/pages/api/endpoint/getbasicdnssearchdetailspaged_api.js b/pages/api/endpoint/getbasicdnssearchdetailspaged_api.js index 3852c7a6..38f5b440 100644 --- a/pages/api/endpoint/getbasicdnssearchdetailspaged_api.js +++ b/pages/api/endpoint/getbasicdnssearchdetailspaged_api.js @@ -3,6 +3,7 @@ import https from "https"; import CryptoJS from "crypto-js"; import _ from "lodash"; import { getToken, azureHeadersPaged } from "../../../actions"; +import { getSelectQuery } from "../../../actions/selectQueryTypes"; const WORDKEY = process.env.HASHKEY; @@ -31,6 +32,8 @@ export default async function ApiProxy(req, res) { caseReference + "'&$count=true"; + queryUrl = queryUrl + getSelectQuery("pinswg_dnses"); + var apiResponse = _.isEmpty(req.query) ? res.status(400).json() : typeof caseReference != "undefined" && caseReference.length > 0 diff --git a/pages/api/endpoint/getbasicsearchdetails_api.js b/pages/api/endpoint/getbasicsearchdetails_api.js index 8449afce..db8acb04 100644 --- a/pages/api/endpoint/getbasicsearchdetails_api.js +++ b/pages/api/endpoint/getbasicsearchdetails_api.js @@ -2,6 +2,7 @@ import axios from "axios"; import https from "https"; import CryptoJS from "crypto-js"; import { getToken, azureHeaders } from "../../../actions"; +import { getSelectQuery } from "../../../actions/selectQueryTypes"; const WORDKEY = process.env.HASHKEY; @@ -35,6 +36,10 @@ export default async function ApiProxy(req, res) { incidentID + "&$count=true"; + queryUrl = queryUrl + getSelectQuery(appealTypeName); + + console.log("query: ", queryUrl, "<<<