update error and response handling

pages/api/endpoint/createaccount_api.js

@@ -11,40 +11,51 @@
  */
 
 import axios from "axios";
-import CryptoJS from "crypto-js";
 import { consoleLogger } from "../../../actions/core/logger";
 import { getToken } from "../../../actions/core/token";
 import { hashAPIPath } from "../../../actions/core/hash";
+import { respondError, respondSuccess } from "../middleware/apiResponse";
 
 const WEBAPI_URL =
     process.env.RELAY_ROOT ||
     "https://dev-pedw-ns.servicebus.windows.net/dev-pedw-hc/";
 
 export default async function ApiProxy(req, res) {
-    var token = await getToken();
-    var queryUrl = "contacts";
-    var data = JSON.stringify(req.body);
-
-    var config = {
-        method: "post",
-        url: WEBAPI_URL + queryUrl + hashAPIPath(queryUrl),
-        headers: {
-            "OData-MaxVersion": "4.0",
-            "OData-Version": "4.0",
-            "Accept": "application/json",
-            "Prefer": 'odata.include-annotations="*",return=representation',
-            "Authorization": "Bearer " + token.access_token,
-            "Content-Type": "application/json"
-        },
-        data: data
-    };
-
-    return axios(config)
-        .then(({ data }) => {
-            res.status(200).json(data);
-        })
-        .catch((error) => {
-            consoleLogger(error);
-            res.status(400).json(error);
+    if (!req.body || Object.keys(req.body).length === 0) {
+        return respondError(res, {
+            status: 400,
+            code: "ACCOUNT_PAYLOAD_REQUIRED",
+            message: "Account payload is required"
         });
+    }
+
+    try {
+        const token = await getToken();
+        const queryUrl = "contacts";
+        const data = JSON.stringify(req.body);
+
+        const config = {
+            method: "post",
+            url: WEBAPI_URL + queryUrl + hashAPIPath(queryUrl),
+            headers: {
+                "OData-MaxVersion": "4.0",
+                "OData-Version": "4.0",
+                Accept: "application/json",
+                Prefer: 'odata.include-annotations="*",return=representation',
+                Authorization: "Bearer " + token.access_token,
+                "Content-Type": "application/json"
+            },
+            data
+        };
+
+        const response = await axios(config);
+        return respondSuccess(res, response.data);
+    } catch (error) {
+        consoleLogger(error);
+        return respondError(res, {
+            status: 400,
+            code: "ACCOUNT_CREATE_FAILED",
+            message: "Failed to create account"
+        });
+    }
 }

pages/api/endpoint/getadvancedsearch_api.js

@@ -22,149 +22,149 @@
  */
 
 import axios from "axios";
-import CryptoJS from "crypto-js";
-import _ from "lodash";
 import { azureHeadersPaged } from "../../../actions/core/headers";
 import { consoleLogger } from "../../../actions/core/logger";
 import { getToken } from "../../../actions/core/token";
 import { hashAPIPath } from "../../../actions/core/hash";
+import { respondError, respondSuccess } from "../middleware/apiResponse";
 
 const WEBAPI_URL =
     process.env.RELAY_ROOT ||
     "https://dev-pedw-ns.servicebus.windows.net/dev-pedw-hc/";
 
 export default async function ApiProxy(req, res) {
-    var searchString = req.query.searchstring;
-    var token = await getToken();
+    const encodedSearchString = req.query.searchstring;
 
-    searchString = _.isEmpty(searchString)
-        ? searchString
-        : JSON.parse(decodeURI(searchString));
+    if (
+        typeof encodedSearchString !== "string" ||
+        encodedSearchString.trim().length === 0
+    ) {
+        return respondError(res, {
+            status: 400,
+            code: "SEARCH_STRING_REQUIRED",
+            message: "searchstring is required"
+        });
+    }
 
-    var queryString = "";
+    let searchString;
+    try {
+        searchString = JSON.parse(decodeURI(encodedSearchString));
+    } catch (error) {
+        return respondError(res, {
+            status: 400,
+            code: "INVALID_SEARCH_STRING",
+            message: "searchstring must be valid JSON"
+        });
+    }
+
+    if (
+        !searchString ||
+        typeof searchString !== "object" ||
+        Object.keys(searchString).length === 0
+    ) {
+        return respondError(res, {
+            status: 400,
+            code: "SEARCH_STRING_REQUIRED",
+            message: "searchstring is required"
+        });
+    }
+
+    const toEscapedString = (value) => String(value).replace(/\'/g, "''");
+    let queryString = "";
 
     queryString +=
-        _.has(searchString, "q") && searchString.q != null
+        searchString.q != null
             ? "(contains(title, '" +
-              searchString.q.replace(/\'/g, "''") +
+              toEscapedString(searchString.q) +
               "') or contains(ticketnumber,'" +
-              searchString.q.replace(/\'/g, "''") +
+              toEscapedString(searchString.q) +
               "')) and"
             : "";
 
     queryString +=
-        _.has(searchString, "lpaRef") && searchString.lpaRef != null
+        searchString.lpaRef != null
             ? "(contains(pinswg_lpareference, '" +
-              searchString.lpaRef.replace(/\'/g, "''") +
+              toEscapedString(searchString.lpaRef) +
               "')) and"
             : "";
 
     queryString +=
-        (_.has(searchString, "lpa") || _.has(searchString, "LPA")) &&
+        (searchString.lpa != null || searchString.LPA != null) &&
         searchString.lpa != null
             ? " _pinswg_associatedlpa_value eq " + searchString.lpa + " and"
             : "";
 
     queryString +=
-        _.has(searchString, "apt") && searchString.apt != null
+        searchString.apt != null
             ? " pinswg_appealcasetype eq " + searchString.apt + " and"
             : "";
 
     queryString +=
-        _.has(searchString, "statuscode") && searchString.statuscode != null
+        searchString.statuscode != null
             ? " statuscode eq " + searchString.statuscode + " and"
             : "";
 
-    //console.log(queryString);
-
-    var queryUrl =
+    const queryUrl =
         "incidents?$select=pinswg_environmentalstatementlocation,pinswg_caseaddress,modifiedon,description,numberofchildincidents,_accountid_value,_customerid_value,_pinswg_associatedlpa_value,_ownerid_value,pinswg_appealcasetype,statuscode,ticketnumber,title,_primarycontactid_value,pinswg_lpareference,pinswg_appellantagent,pinswg_appellantfirstname,pinswg_appellantlastname&$expand=primarycontactid($select=fullname)&$filter=" +
         queryString +
         " pinswg_appealcasetype ne null and pinswg_publishtoweb eq true&$orderby=createdon desc&$count=true";
 
-    //console.log(queryString, "\n", queryUrl);
+    try {
+        const token = await getToken();
+        const { data } = await axios.get(
+            WEBAPI_URL + queryUrl + hashAPIPath(queryUrl),
+            azureHeadersPaged(token.access_token)
+        );
 
-    var apiResponse = _.isEmpty(searchString)
-        ? res.status(400).json()
-        : axios
-              .get(
-                  WEBAPI_URL + queryUrl + hashAPIPath(queryUrl),
-                  azureHeadersPaged(token.access_token)
-              )
-              .then(async ({ data }) => {
-                  var dataStr;
-                  _.has(data, "@odata.nextLink") == true &&
-                      ((dataStr = JSON.stringify(data["@odata.nextLink"])),
-                      (data["@odata.nextLink"] = dataStr.split("/v8.2/")[1]));
+        if (Object.prototype.hasOwnProperty.call(data, "@odata.nextLink")) {
+            const dataStr = JSON.stringify(data["@odata.nextLink"]);
+            data["@odata.nextLink"] = dataStr.split("/v8.2/")[1];
+        }
 
-                  if (_.has(searchString, "projecttype")) {
-                      await updateValueArray(data, token);
+        if (searchString.projecttype != null) {
+            for (let i = 0; i < data.value.length; i++) {
+                const item = data.value[i];
 
-                      async function updateValueArray(data, token) {
-                          for (let i = 0; i < data.value.length; i++) {
-                              const item = data.value[i];
+                try {
+                    const projectTypeQuery =
+                        "pinswg_sipses?$filter=_pinswg_sipscase_value eq " +
+                        item.incidentid +
+                        " and _pinswg_projecttype_value eq " +
+                        searchString.projecttype +
+                        "&$select=_pinswg_projecttype_value";
 
-                              try {
-                                  // Axios call using the `incidentid` to fetch additional data
-                                  const response = await axios.get(
-                                      WEBAPI_URL +
-                                          "pinswg_sipses?$filter=_pinswg_sipscase_value eq " +
-                                          item.incidentid +
-                                          " and _pinswg_projecttype_value eq " +
-                                          searchString.projecttype +
-                                          "&$select=_pinswg_projecttype_value" +
-                                          hashAPIPath(
-                                              "pinswg_sipses?$filter=_pinswg_sipscase_value eq " +
-                                                  item.incidentid +
-                                                  " and _pinswg_projecttype_value eq " +
-                                                  searchString.projecttype +
-                                                  "&$select=_pinswg_projecttype_value"
-                                          ),
-                                      azureHeadersPaged(token.access_token)
-                                  );
+                    const response = await axios.get(
+                        WEBAPI_URL +
+                            projectTypeQuery +
+                            hashAPIPath(projectTypeQuery),
+                        azureHeadersPaged(token.access_token)
+                    );
 
-                                  // Assuming the response contains the additional data you want to add
-                                  //   console.log(response.data.value[0]);
-                                  console.log(response.data.value);
+                    if (
+                        response.data.value.length > 0 &&
+                        response.data.value[0]._pinswg_projecttype_value != null
+                    ) {
+                        Object.assign(item, response.data.value[0]);
+                    }
+                } catch (error) {
+                    consoleLogger(error);
+                }
+            }
 
-                                  if (
-                                      response.data.value.length > 0 &&
-                                      response.data.value[0]
-                                          ._pinswg_projecttype_value != null
-                                  ) {
-                                      Object.assign(
-                                          item,
-                                          response.data.value[0]
-                                      ); // Update item with new data
-                                  } else {
-                                      console.log(
-                                          `No project type found for incident ID ${item.incidentid}`
-                                      );
-                                  }
-                              } catch (error) {
-                                  console.error(
-                                      `Error fetching data for incident ID ${item.incidentid}:`,
-                                      error
-                                  );
-                              }
-                          }
-                      }
+            data.value = data.value.filter(
+                (item) => item._pinswg_projecttype_value != null
+            );
 
-                      data.value = data.value.filter(
-                          (item) => item._pinswg_projecttype_value != null
-                      );
+            data["@odata.count"] = data.value.length;
+        }
 
-                      data["@odata.count"] = data.value.length;
-
-                      // console.log(newDataObj);
-                  }
-
-                  res.status(200).json(data);
-              })
-              .catch((error) => {
-                  consoleLogger(error);
-                  res.status(400).json(error);
-              });
-
-    return apiResponse;
+        return respondSuccess(res, data);
+    } catch (error) {
+        consoleLogger(error);
+        return respondError(res, {
+            status: 400,
+            code: "ADVANCED_SEARCH_FETCH_FAILED",
+            message: "Failed to fetch advanced search results"
+        });
+    }
 }

pages/api/endpoint/getawaitingsubmissionproxy_api.js

@@ -11,39 +11,53 @@
  */
 
 import axios from "axios";
-import CryptoJS from "crypto-js";
 import { azureHeaders } from "../../../actions/core/headers";
 import { consoleLogger } from "../../../actions/core/logger";
 import { getToken } from "../../../actions/core/token";
 import { hashAPIPath } from "../../../actions/core/hash";
+import { respondError, respondSuccess } from "../middleware/apiResponse";
 
 const WEBAPI_URL =
     process.env.RELAY_ROOT ||
     "https://dev-pedw-ns.servicebus.windows.net/dev-pedw-hc/";
 
 export default async function ApiProxy(req, res) {
-    var loggedInUserId = req.query.loggedInUserId;
-    var token = await getToken();
+    const loggedInUserId = req.query.loggedInUserId;
 
-    var queryUrl =
-        "incidents?$select=pinswg_environmentalstatementlocation,modifiedon,description,numberofchildincidents,_accountid_value,_customerid_value,_pinswg_associatedlpa_value,_ownerid_value,pinswg_appealcasetype,statuscode,ticketnumber,title, _primarycontactid_value,pinswg_lpareference,pinswg_appellantlastname,pinswg_appellantfirstname,pinswg_appellantagent,pinswg_agentfirstname,pinswg_agentlastname,pinswg_agentcompanyname&$expand=primarycontactid($select=fullname)&$filter=_customerid_value eq " +
-        loggedInUserId +
-        " and pinswg_appealcasetype ne null&$orderby=createdon desc&$count=true";
+    if (
+        typeof loggedInUserId !== "string" ||
+        loggedInUserId.trim().length === 0
+    ) {
+        return respondError(res, {
+            status: 400,
+            code: "LOGGED_IN_USER_ID_REQUIRED",
+            message: "loggedInUserId is required"
+        });
+    }
 
-    //console.log(WEBAPI_URL + queryUrl + hashAPIPath(queryUrl));
-    return axios
-        .get(
+    try {
+        const token = await getToken();
+        const queryUrl =
+            "incidents?$select=pinswg_environmentalstatementlocation,modifiedon,description,numberofchildincidents,_accountid_value,_customerid_value,_pinswg_associatedlpa_value,_ownerid_value,pinswg_appealcasetype,statuscode,ticketnumber,title, _primarycontactid_value,pinswg_lpareference,pinswg_appellantlastname,pinswg_appellantfirstname,pinswg_appellantagent,pinswg_agentfirstname,pinswg_agentlastname,pinswg_agentcompanyname&$expand=primarycontactid($select=fullname)&$filter=_customerid_value eq " +
+            loggedInUserId +
+            " and pinswg_appealcasetype ne null&$orderby=createdon desc&$count=true";
+
+        const { data } = await axios.get(
             WEBAPI_URL + queryUrl + hashAPIPath(queryUrl),
             azureHeaders(token.access_token)
-        )
-        .then(({ data }) => {
-            data.value.forEach(function (element) {
-                element.pinswg_title = element.title;
-            });
-            res.status(200).json(data);
-        })
-        .catch((error) => {
-            consoleLogger(error);
-            res.status(400).json(error);
+        );
+
+        data.value.forEach(function (element) {
+            element.pinswg_title = element.title;
         });
+
+        return respondSuccess(res, data);
+    } catch (error) {
+        consoleLogger(error);
+        return respondError(res, {
+            status: 400,
+            code: "AWAITING_SUBMISSION_PROXY_FETCH_FAILED",
+            message: "Failed to fetch awaiting submission proxy details"
+        });
+    }
 }

pages/api/endpoint/getbasicsearch_api.js

@@ -16,65 +16,61 @@
  */
 
 import axios from "axios";
-import CryptoJS from "crypto-js";
-import _ from "lodash";
 import { azureHeadersPaged } from "../../../actions/core/headers";
 import { consoleLogger } from "../../../actions/core/logger";
 import { getToken } from "../../../actions/core/token";
 import { hashAPIPath } from "../../../actions/core/hash";
+import { respondError, respondSuccess } from "../middleware/apiResponse";
 
 const WEBAPI_URL =
     process.env.RELAY_ROOT ||
     "https://dev-pedw-ns.servicebus.windows.net/dev-pedw-hc/";
 
 export default async function ApiProxy(req, res) {
-    var searchString = req.query.searchString;
-    var token = await getToken();
+    const searchString = req.query.searchString;
 
-    searchString = searchString.replace(/\'/g, "''");
+    if (typeof searchString !== "string" || searchString.trim().length === 0) {
+        return respondError(res, {
+            status: 400,
+            code: "SEARCH_STRING_REQUIRED",
+            message: "searchString is required"
+        });
+    }
 
-    var queryUrl =
-        "incidents?$select=pinswg_environmentalstatementlocation,pinswg_caseaddress,modifiedon,description,numberofchildincidents,_accountid_value,_customerid_value,_pinswg_associatedlpa_value,_ownerid_value,pinswg_appealcasetype,statuscode,ticketnumber,title, _primarycontactid_value,pinswg_lpareference,pinswg_appellantagent,pinswg_appellantfirstname,pinswg_appellantlastname&$expand=primarycontactid($select=fullname)&$filter=(contains(title, '" +
-        searchString +
-        "') or contains(ticketnumber, '" +
-        searchString +
-        "') or contains(pinswg_lpareference, '" +
-        searchString +
-        "')) and pinswg_appealcasetype ne null " +
-        (process.env.SHOWSIPS !== "true"
-            ? "and pinswg_appealcasetype ne 846040002 "
-            : "") +
-        "and pinswg_publishtoweb eq true&$orderby=createdon desc&$count=true";
+    try {
+        const token = await getToken();
+        const escapedSearchString = searchString.replace(/\'/g, "''");
 
-    console.log(
-        "\n==========================================\n",
-        "\nBasic search ",
-        "\nSearch String: " + searchString,
-        "\n\nQuery url: " + queryUrl,
-        "\n\nRelay link: " + WEBAPI_URL + queryUrl + hashAPIPath(queryUrl),
-        "\n==========================================\n"
-    );
+        const queryUrl =
+            "incidents?$select=pinswg_environmentalstatementlocation,pinswg_caseaddress,modifiedon,description,numberofchildincidents,_accountid_value,_customerid_value,_pinswg_associatedlpa_value,_ownerid_value,pinswg_appealcasetype,statuscode,ticketnumber,title, _primarycontactid_value,pinswg_lpareference,pinswg_appellantagent,pinswg_appellantfirstname,pinswg_appellantlastname&$expand=primarycontactid($select=fullname)&$filter=(contains(title, '" +
+            escapedSearchString +
+            "') or contains(ticketnumber, '" +
+            escapedSearchString +
+            "') or contains(pinswg_lpareference, '" +
+            escapedSearchString +
+            "')) and pinswg_appealcasetype ne null " +
+            (process.env.SHOWSIPS !== "true"
+                ? "and pinswg_appealcasetype ne 846040002 "
+                : "") +
+            "and pinswg_publishtoweb eq true&$orderby=createdon desc&$count=true";
 
-    var apiResponse = _.isEmpty(req.query)
-        ? res.status(400).json()
-        : searchString.length > 0
-          ? axios
-                .get(
-                    WEBAPI_URL + queryUrl + hashAPIPath(queryUrl),
-                    azureHeadersPaged(token.access_token)
-                )
-                .then(({ data }) => {
-                    var dataStr;
-                    _.has(data, "@odata.nextLink") == true &&
-                        ((dataStr = JSON.stringify(data["@odata.nextLink"])),
-                        (data["@odata.nextLink"] = dataStr.split("/v8.2/")[1]));
-                    res.status(200).json(data);
-                })
-                .catch((error) => {
-                    consoleLogger(error);
-                    res.status(400).json(error);
-                })
-          : res.status(400).json();
+        const { data } = await axios.get(
+            WEBAPI_URL + queryUrl + hashAPIPath(queryUrl),
+            azureHeadersPaged(token.access_token)
+        );
 
-    return apiResponse;
+        if (Object.prototype.hasOwnProperty.call(data, "@odata.nextLink")) {
+            const dataStr = JSON.stringify(data["@odata.nextLink"]);
+            data["@odata.nextLink"] = dataStr.split("/v8.2/")[1];
+        }
+
+        return respondSuccess(res, data);
+    } catch (error) {
+        consoleLogger(error);
+        return respondError(res, {
+            status: 400,
+            code: "BASIC_SEARCH_FETCH_FAILED",
+            message: "Failed to fetch basic search results"
+        });
+    }
 }

pages/api/endpoint/getcasemessage_api.js

@@ -16,48 +16,47 @@
  */
 
 import axios from "axios";
-import CryptoJS from "crypto-js";
-import _ from "lodash";
 import { azureHeadersPaged } from "../../../actions/core/headers";
 import { consoleLogger } from "../../../actions/core/logger";
 import { getToken } from "../../../actions/core/token";
 import { hashAPIPath } from "../../../actions/core/hash";
+import { respondError, respondSuccess } from "../middleware/apiResponse";
 
 const WEBAPI_URL =
     process.env.RELAY_ROOT ||
     "https://dev-pedw-ns.servicebus.windows.net/dev-pedw-hc/";
 
 export default async function ApiProxy(req, res) {
-    var searchString = req.query.id;
-    var token = await getToken();
+    const caseId = req.query.id;
 
-    var queryUrl = `tasks?$select=_regardingobjectid_value,subject,description,createdon,statuscode,scheduledend,scheduledstart&$count=true&$filter=_regardingobjectid_value eq ${searchString} and contains(subject, 'Banner') and statuscode ne 5&$orderby=createdon desc`;
+    if (typeof caseId !== "string" || caseId.trim().length === 0) {
+        return respondError(res, {
+            status: 400,
+            code: "CASE_ID_REQUIRED",
+            message: "id is required"
+        });
+    }
 
-    console.log(
-        "\n==========================================\n",
-        "\nCase messages  ",
-        "\nSearch String: " + searchString,
-        "\n\nQuery url: " + queryUrl,
-        "\n\nRelay link: " + WEBAPI_URL + queryUrl + hashAPIPath(queryUrl),
-        "\n==========================================\n"
-    );
+    try {
+        const token = await getToken();
 
-    var apiResponse = _.isEmpty(req.query)
-        ? res.status(400).json()
-        : searchString.length > 0
-          ? axios
-                .get(
-                    WEBAPI_URL + queryUrl + hashAPIPath(queryUrl),
-                    azureHeadersPaged(token.access_token)
-                )
-                .then(({ data }) => {
-                    res.status(200).json(data);
-                })
-                .catch((error) => {
-                    consoleLogger(error);
-                    res.status(400).json(error);
-                })
-          : res.status(400).json();
+        const queryUrl =
+            "tasks?$select=_regardingobjectid_value,subject,description,createdon,statuscode,scheduledend,scheduledstart&$count=true&$filter=_regardingobjectid_value eq " +
+            caseId +
+            " and contains(subject, 'Banner') and statuscode ne 5&$orderby=createdon desc";
 
-    return apiResponse;
+        const { data } = await axios.get(
+            WEBAPI_URL + queryUrl + hashAPIPath(queryUrl),
+            azureHeadersPaged(token.access_token)
+        );
+
+        return respondSuccess(res, data);
+    } catch (error) {
+        consoleLogger(error);
+        return respondError(res, {
+            status: 400,
+            code: "CASE_MESSAGE_FETCH_FAILED",
+            message: "Failed to fetch case messages"
+        });
+    }
 }

pages/api/endpoint/getmyrepresentationsproxy_api.js

@@ -18,35 +18,50 @@
  */
 
 import axios from "axios";
-import CryptoJS from "crypto-js";
 import { azureHeaders } from "../../../actions/core/headers";
 import { consoleLogger } from "../../../actions/core/logger";
 import { getToken } from "../../../actions/core/token";
 import { hashAPIPath } from "../../../actions/core/hash";
+import { respondError, respondSuccess } from "../middleware/apiResponse";
 
 const WEBAPI_URL =
     process.env.RELAY_ROOT ||
     "https://dev-pedw-ns.servicebus.windows.net/dev-pedw-hc/";
 
 export default async function ApiProxy(req, res) {
-    var loggedInUserId = req.query.loggedInUserId;
-    var token = await getToken();
+    const loggedInUserId = req.query.loggedInUserId;
 
-    var queryUrl =
-        "pinswg_representationses?$filter= _pinswg_contact_value eq " +
-        loggedInUserId +
-        "&$count=true&$orderby=createdon desc";
+    if (
+        typeof loggedInUserId !== "string" ||
+        loggedInUserId.trim().length === 0
+    ) {
+        return respondError(res, {
+            status: 400,
+            code: "LOGGED_IN_USER_ID_REQUIRED",
+            message: "loggedInUserId is required"
+        });
+    }
 
-    return axios
-        .get(
+    try {
+        const token = await getToken();
+
+        const queryUrl =
+            "pinswg_representationses?$filter= _pinswg_contact_value eq " +
+            loggedInUserId +
+            "&$count=true&$orderby=createdon desc";
+
+        const { data } = await axios.get(
             WEBAPI_URL + queryUrl + hashAPIPath(queryUrl),
             azureHeaders(token.access_token)
-        )
-        .then(({ data }) => {
-            res.status(200).json(data);
-        })
-        .catch((error) => {
-            consoleLogger(error);
-            res.status(400).json(error);
+        );
+
+        return respondSuccess(res, data);
+    } catch (error) {
+        consoleLogger(error);
+        return respondError(res, {
+            status: 400,
+            code: "MY_REPRESENTATIONS_PROXY_FETCH_FAILED",
+            message: "Failed to fetch my representations proxy details"
         });
+    }
 }

pages/api/endpoint/getrepresentationsproxy_api.js

@@ -18,35 +18,47 @@
  */
 
 import axios from "axios";
-import CryptoJS from "crypto-js";
 import { azureHeaders } from "../../../actions/core/headers";
 import { consoleLogger } from "../../../actions/core/logger";
 import { getToken } from "../../../actions/core/token";
 import { hashAPIPath } from "../../../actions/core/hash";
+import { respondError, respondSuccess } from "../middleware/apiResponse";
 
 const WEBAPI_URL =
     process.env.RELAY_ROOT ||
     "https://dev-pedw-ns.servicebus.windows.net/dev-pedw-hc/";
 
 export default async function ApiProxy(req, res) {
-    var incidentID = req.query.incidentID;
-    var token = await getToken();
+    const incidentID = req.query.incidentID;
 
-    var queryUrl =
-        "pinswg_representationses?$filter= _pinswg_case_value eq " +
-        incidentID +
-        "&$count=true&$orderby=createdon desc";
+    if (typeof incidentID !== "string" || incidentID.trim().length === 0) {
+        return respondError(res, {
+            status: 400,
+            code: "INCIDENT_ID_REQUIRED",
+            message: "incidentID is required"
+        });
+    }
 
-    return axios
-        .get(
+    try {
+        const token = await getToken();
+
+        const queryUrl =
+            "pinswg_representationses?$filter= _pinswg_case_value eq " +
+            incidentID +
+            "&$count=true&$orderby=createdon desc";
+
+        const { data } = await axios.get(
             WEBAPI_URL + queryUrl + hashAPIPath(queryUrl),
             azureHeaders(token.access_token)
-        )
-        .then(({ data }) => {
-            res.status(200).json(data);
-        })
-        .catch((error) => {
-            consoleLogger(error);
-            res.status(400).json(error);
+        );
+
+        return respondSuccess(res, data);
+    } catch (error) {
+        consoleLogger(error);
+        return respondError(res, {
+            status: 400,
+            code: "REPRESENTATIONS_PROXY_FETCH_FAILED",
+            message: "Failed to fetch representations proxy details"
         });
+    }
 }

pages/api/endpoint/getwatchedcasesproxy_api.js

@@ -18,69 +18,75 @@
  */
 
 import axios from "axios";
-import CryptoJS from "crypto-js";
 import { azureHeaders } from "../../../actions/core/headers";
 import { consoleLogger } from "../../../actions/core/logger";
 import { getToken } from "../../../actions/core/token";
 import { hashAPIPath } from "../../../actions/core/hash";
+import { respondError, respondSuccess } from "../middleware/apiResponse";
 
 const WEBAPI_URL =
     process.env.RELAY_ROOT ||
     "https://dev-pedw-ns.servicebus.windows.net/dev-pedw-hc/";
 
-const BASE_URL = process.env.API_ROOT || `http://localhost:${port}`;
-
 export default async function ApiProxy(req, res) {
-    var loggedInUserId = req.query.loggedInUserId;
-    var token = await getToken();
+    const loggedInUserId = req.query.loggedInUserId;
 
-    // var queryUrl =
-    //     "pinswg_watchlists?$filter= _pinswg_contact_value eq " +
-    //     loggedInUserId +
-    //     "&$select=pinswg_emailnotifications,modifiedon,pinswg_appealcasetype,pinswg_watchlistid,_pinswg_watchedcase_value,statuscode,pinswg_representationsubmitted,pinswg_representationtype&$count=true&$orderby=createdon desc&$expand=pinswg_WatchedCase($select=pinswg_AssociatedLPA)";
+    if (
+        typeof loggedInUserId !== "string" ||
+        loggedInUserId.trim().length === 0
+    ) {
+        return respondError(res, {
+            status: 400,
+            code: "LOGGED_IN_USER_ID_REQUIRED",
+            message: "loggedInUserId is required"
+        });
+    }
 
-    var queryUrl =
-        "pinswg_watchlists?$filter= _pinswg_contact_value eq " +
-        loggedInUserId +
-        "&$select=modifiedon,pinswg_appealcasetype,pinswg_watchlistid,_pinswg_watchedcase_value,statuscode,pinswg_representationsubmitted,pinswg_representationtype&$count=true&$orderby=createdon desc&$expand=pinswg_WatchedCase($select=pinswg_AssociatedLPA)";
+    try {
+        const token = await getToken();
+        const queryUrl =
+            "pinswg_watchlists?$filter= _pinswg_contact_value eq " +
+            loggedInUserId +
+            "&$select=modifiedon,pinswg_appealcasetype,pinswg_watchlistid,_pinswg_watchedcase_value,statuscode,pinswg_representationsubmitted,pinswg_representationtype&$count=true&$orderby=createdon desc&$expand=pinswg_WatchedCase($select=pinswg_AssociatedLPA)";
 
-    return axios
-        .get(
+        const { data } = await axios.get(
             WEBAPI_URL + queryUrl + hashAPIPath(queryUrl),
             azureHeaders(token.access_token)
-        )
-        .then(({ data }) => {
-            data.value.forEach(function (element) {
-                element.ticketnumber = element.pinswg_WatchedCase.ticketnumber;
-                element.pinswg_title =
-                    element[
-                        "_pinswg_watchedcase_value@OData.Community.Display.V1.FormattedValue"
-                    ];
+        );
 
+        data.value.forEach(function (element) {
+            element.ticketnumber = element.pinswg_WatchedCase.ticketnumber;
+            element.pinswg_title =
                 element[
+                    "_pinswg_watchedcase_value@OData.Community.Display.V1.FormattedValue"
+                ];
+
+            element[
+                "_pinswg_associatedlpa_value@OData.Community.Display.V1.FormattedValue"
+            ] =
+                element.pinswg_WatchedCase[
                     "_pinswg_associatedlpa_value@OData.Community.Display.V1.FormattedValue"
-                ] =
-                    element.pinswg_WatchedCase[
-                        "_pinswg_associatedlpa_value@OData.Community.Display.V1.FormattedValue"
-                    ];
-                element._pinswg_associatedlpa_value =
-                    element.pinswg_WatchedCase._pinswg_associatedlpa_value;
-                element[
+                ];
+            element._pinswg_associatedlpa_value =
+                element.pinswg_WatchedCase._pinswg_associatedlpa_value;
+            element[
+                "_ownerid_value@OData.Community.Display.V1.FormattedValue"
+            ] =
+                element.pinswg_WatchedCase[
                     "_ownerid_value@OData.Community.Display.V1.FormattedValue"
-                ] =
-                    element.pinswg_WatchedCase[
-                        "_ownerid_value@OData.Community.Display.V1.FormattedValue"
-                    ];
-                element._ownerid_value =
-                    element.pinswg_WatchedCase._ownerid_value;
+                ];
+            element._ownerid_value = element.pinswg_WatchedCase._ownerid_value;
 
-                delete element.pinswg_WatchedCase;
-            });
-
-            res.status(200).json(data);
-        })
-        .catch((error) => {
-            consoleLogger(error);
-            res.status(400).json(error);
+            delete element.pinswg_WatchedCase;
         });
+
+        return respondSuccess(res, data);
+    } catch (error) {
+        consoleLogger(error);
+        return respondError(res, {
+            status: 400,
+            code: "WATCHED_CASES_PROXY_FETCH_FAILED",
+            message: "Failed to fetch watched cases proxy details"
+        });
+    }
 }

pages/api/endpoint/updateaccount_api.js

@@ -11,43 +11,61 @@
  */
 
 import axios from "axios";
-import CryptoJS from "crypto-js";
 import { consoleLogger } from "../../../actions/core/logger";
 import { getToken } from "../../../actions/core/token";
 import { hashAPIPath } from "../../../actions/core/hash";
+import { respondError, respondSuccess } from "../middleware/apiResponse";
 
 const WEBAPI_URL =
     process.env.RELAY_ROOT ||
     "https://dev-pedw-ns.servicebus.windows.net/dev-pedw-hc/";
 
 export default async function ApiProxy(req, res) {
-    var contactId = req.query.contactId;
-    var token = await getToken();
-    var data = JSON.stringify(req.body);
-    var queryUrl = "contacts(" + contactId + ")";
+    const contactId = req.query.contactId;
 
-    var config = {
-        method: "patch",
-        url: WEBAPI_URL + queryUrl + hashAPIPath(queryUrl),
-        headers: {
-            "OData-MaxVersion": "4.0",
-            "OData-Version": "4.0",
-            "Accept": "application/json",
-            "Prefer": 'odata.include-annotations="*",return=representation',
-            "Authorization": "Bearer " + token.access_token,
-            "Content-Type": "application/json"
-        },
-        data: data
-    };
-
-    console.log(config);
-
-    return axios(config)
-        .then(({ data }) => {
-            res.status(200).json(data);
-        })
-        .catch((error) => {
-            consoleLogger(error);
-            res.status(400).json(error);
+    if (typeof contactId !== "string" || contactId.trim().length === 0) {
+        return respondError(res, {
+            status: 400,
+            code: "CONTACT_ID_REQUIRED",
+            message: "contactId is required"
         });
+    }
+
+    if (!req.body || Object.keys(req.body).length === 0) {
+        return respondError(res, {
+            status: 400,
+            code: "ACCOUNT_UPDATE_PAYLOAD_REQUIRED",
+            message: "Account update payload is required"
+        });
+    }
+
+    try {
+        const token = await getToken();
+        const data = JSON.stringify(req.body);
+        const queryUrl = "contacts(" + contactId + ")";
+
+        const config = {
+            method: "patch",
+            url: WEBAPI_URL + queryUrl + hashAPIPath(queryUrl),
+            headers: {
+                "OData-MaxVersion": "4.0",
+                "OData-Version": "4.0",
+                Accept: "application/json",
+                Prefer: 'odata.include-annotations="*",return=representation',
+                Authorization: "Bearer " + token.access_token,
+                "Content-Type": "application/json"
+            },
+            data
+        };
+
+        const response = await axios(config);
+        return respondSuccess(res, response.data);
+    } catch (error) {
+        consoleLogger(error);
+        return respondError(res, {
+            status: 400,
+            code: "ACCOUNT_UPDATE_FAILED",
+            message: "Failed to update account"
+        });
+    }
 }

pages/api/endpoint/updatepassword_api.js

@@ -11,41 +11,61 @@
  */
 
 import axios from "axios";
-import CryptoJS from "crypto-js";
 import { consoleLogger } from "../../../actions/core/logger";
 import { getToken } from "../../../actions/core/token";
 import { hashAPIPath } from "../../../actions/core/hash";
+import { respondError, respondSuccess } from "../middleware/apiResponse";
 
 const WEBAPI_URL =
     process.env.RELAY_ROOT ||
     "https://dev-pedw-ns.servicebus.windows.net/dev-pedw-hc/";
 
 export default async function ApiProxy(req, res) {
-    var contactId = req.query.contactId;
-    var token = await getToken();
-    var data = JSON.stringify(req.body);
-    var queryUrl = "contacts(" + contactId + ")";
+    const contactId = req.query.contactId;
 
-    var config = {
-        method: "patch",
-        url: WEBAPI_URL + queryUrl + hashAPIPath(queryUrl),
-        headers: {
-            "OData-MaxVersion": "4.0",
-            "OData-Version": "4.0",
-            "Accept": "application/json",
-            "Prefer": 'odata.include-annotations="*",return=representation',
-            "Authorization": "Bearer " + token.access_token,
-            "Content-Type": "application/json"
-        },
-        data: data
-    };
-
-    return axios(config)
-        .then(({ data }) => {
-            res.status(200).json(data);
-        })
-        .catch((error) => {
-            consoleLogger(error);
-            res.status(400).json(error);
+    if (typeof contactId !== "string" || contactId.trim().length === 0) {
+        return respondError(res, {
+            status: 400,
+            code: "CONTACT_ID_REQUIRED",
+            message: "contactId is required"
         });
+    }
+
+    if (!req.body || Object.keys(req.body).length === 0) {
+        return respondError(res, {
+            status: 400,
+            code: "PASSWORD_UPDATE_PAYLOAD_REQUIRED",
+            message: "Password update payload is required"
+        });
+    }
+
+    try {
+        const token = await getToken();
+        const data = JSON.stringify(req.body);
+        const queryUrl = "contacts(" + contactId + ")";
+
+        const config = {
+            method: "patch",
+            url: WEBAPI_URL + queryUrl + hashAPIPath(queryUrl),
+            headers: {
+                "OData-MaxVersion": "4.0",
+                "OData-Version": "4.0",
+                Accept: "application/json",
+                Prefer: 'odata.include-annotations="*",return=representation',
+                Authorization: "Bearer " + token.access_token,
+                "Content-Type": "application/json"
+            },
+            data
+        };
+
+        const response = await axios(config);
+        return respondSuccess(res, response.data);
+    } catch (error) {
+        consoleLogger(error);
+        return respondError(res, {
+            status: 400,
+            code: "PASSWORD_UPDATE_FAILED",
+            message: "Failed to update password"
+        });
+    }
 }