improve code quality

Author: Philip-Carneiro

src/classes/insightsConnection.ts

@@ -316,20 +316,45 @@ export class InsightsConnection {
     }
   }
 
-  public async getDataInsights(
-    targetUrl: string,
-    body: string,
+  public generateDatasourceEndpoints(
+    type: DataSourceTypes,
+    udaName: string,
+  ): string {
+    let endpoint: string = "";
+    switch (type) {
+      case DataSourceTypes.UDA:
+        endpoint =
+          this.retrieveEndpoints("serviceGateway", "udaBase") +
+          udaName.split(".").slice(1).join("/");
+        break;
+      case DataSourceTypes.API:
+        endpoint = this.retrieveEndpoints("serviceGateway", "data") || "";
+        break;
+      case DataSourceTypes.SQL:
+        endpoint = this.retrieveEndpoints("serviceGateway", "sql") || "";
+        break;
+      case DataSourceTypes.QSQL:
+      default:
+        endpoint = this.retrieveEndpoints("serviceGateway", "qsql") || "";
+        break;
+    }
+    return new url.URL(endpoint, this.node.details.server).toString();
+  }
+
+  public async getDatasourceQuery(
+    type: DataSourceTypes,
+    body: any,
   ): Promise<GetDataObjectPayload | undefined> {
     if (this.connected) {
-      const requestUrl = new url.URL(
-        targetUrl,
-        this.node.details.server,
-      ).toString();
+      const udaName = (body as UDARequestBody).name
+        ? (body as UDARequestBody).name
+        : "";
+      const requestUrl = this.generateDatasourceEndpoints(type, udaName);
       const options = await this.getOptions(
         false,
         customHeadersOctet,
         "POST",
-        requestUrl.toString(),
+        requestUrl,
         body,
       );
 
@@ -493,72 +518,6 @@ export class InsightsConnection {
     return token;
   }
 
-  public async getUDAQuery(
-    udaReqBody: UDARequestBody,
-  ): Promise<any | undefined> {
-    if (this.connected && this.connEndpoints) {
-      const udaEndpoint =
-        this.connEndpoints.serviceGateway.udaBase +
-        udaReqBody.name.split(".").slice(1).join("/");
-      const udaURL = new url.URL(udaEndpoint, this.node.details.server);
-      const options = await this.getOptions(
-        false,
-        customHeadersOctet,
-        "POST",
-        udaURL.toString(),
-        udaReqBody.params,
-      );
-
-      if (!options) {
-        return;
-      }
-
-      options.responseType = "arraybuffer";
-
-      const results = await window.withProgress(
-        {
-          location: ProgressLocation.Notification,
-          cancellable: false,
-        },
-        async (progress, token) => {
-          token.onCancellationRequested(() => {
-            kdbOutputLog(`User cancelled the Datasource Run.`, "WARNING");
-          });
-
-          progress.report({ message: "Query executing..." });
-
-          return await axios(options)
-            .then((response: any) => {
-              kdbOutputLog(
-                `[Datasource RUN] Status: ${response.status}.`,
-                "INFO",
-              );
-              if (isCompressed(response.data)) {
-                response.data = uncompress(response.data);
-              }
-              return {
-                error: "",
-                arrayBuffer: response.data.buffer
-                  ? response.data.buffer
-                  : response.data,
-              };
-            })
-            .catch((error: any) => {
-              kdbOutputLog(
-                `[Datasource RUN] Status: ${error.response.status}.`,
-                "INFO",
-              );
-              return {
-                error: { buffer: error.response.data },
-                arrayBuffer: undefined,
-              };
-            });
-        },
-      );
-      return results;
-    }
-  }
-
   public async getUDAScratchpadQuery(
     udaReqBody: UDARequestBody,
   ): Promise<any | undefined> {

src/commands/dataSourceCommand.ts

@@ -304,8 +304,8 @@ export async function runApiDataSource(
     return;
   }
   const apiBody = getApiBody(fileContent);
-  const apiCall = await selectedConn.getDataInsights(
-    ext.insightsServiceGatewayUrls.data,
+  const apiCall = await selectedConn.getDatasourceQuery(
+    DataSourceTypes.API,
     JSON.stringify(apiBody),
   );
 
@@ -415,8 +415,8 @@ export async function runQsqlDataSource(
     target: target,
     query: fileContent.dataSource.qsql.query,
   };
-  const qsqlCall = await selectedConn.getDataInsights(
-    ext.insightsServiceGatewayUrls.qsql,
+  const qsqlCall = await selectedConn.getDatasourceQuery(
+    DataSourceTypes.QSQL,
     JSON.stringify(qsqlBody),
   );
 
@@ -437,8 +437,8 @@ export async function runSqlDataSource(
   const sqlBody = {
     query: fileContent.dataSource.sql.query,
   };
-  const sqlCall = await selectedConn.getDataInsights(
-    ext.insightsServiceGatewayUrls.sql,
+  const sqlCall = await selectedConn.getDatasourceQuery(
+    DataSourceTypes.SQL,
     JSON.stringify(sqlBody),
   );
 
@@ -478,10 +478,6 @@ export async function runUDADataSource(
       }
     });
   }
-  // if (Object.keys(params).length === 0) {
-  //   params["table"] = "nsansUdaTable";
-  //   parameterTypes["table"] = -10;
-  // }
   const udaReqBody: UDARequestBody = {
     language: "q",
     name: UDA.name,
@@ -492,7 +488,10 @@ export async function runUDADataSource(
     sampleSize: 10000,
   };
 
-  const udaCall = await selectedConn.getUDAQuery(udaReqBody);
+  const udaCall = await selectedConn.getDatasourceQuery(
+    DataSourceTypes.UDA,
+    udaReqBody,
+  );
 
   if (udaCall?.error) {
     return parseError(udaCall.error);

test/suite/commands.test.ts

@@ -362,7 +362,7 @@ describe("dataSourceCommand2", () => {
         dataSourceUtils,
         "checkIfTimeParamIsCorrect",
       );
-      getDataInsightsStub = sinon.stub(insightsConn, "getDataInsights");
+      getDataInsightsStub = sinon.stub(insightsConn, "getDatasourceQuery");
       handleWSResultsStub = sinon.stub(queryUtils, "handleWSResults");
       handleScratchpadTableRes = sinon.stub(
         queryUtils,
@@ -432,7 +432,7 @@ describe("dataSourceCommand2", () => {
 
     beforeEach(() => {
       windowMock = sinon.mock(vscode.window);
-      getDataInsightsStub = sinon.stub(insightsConn, "getDataInsights");
+      getDataInsightsStub = sinon.stub(insightsConn, "getDatasourceQuery");
       handleWSResultsStub = sinon.stub(queryUtils, "handleWSResults");
       handleScratchpadTableRes = sinon.stub(
         queryUtils,
@@ -480,7 +480,7 @@ describe("dataSourceCommand2", () => {
 
     beforeEach(() => {
       windowMock = sinon.mock(vscode.window);
-      getDataInsightsStub = sinon.stub(insightsConn, "getDataInsights");
+      getDataInsightsStub = sinon.stub(insightsConn, "getDatasourceQuery");
       handleWSResultsStub = sinon.stub(queryUtils, "handleWSResults");
       handleScratchpadTableRes = sinon.stub(
         queryUtils,
@@ -637,7 +637,7 @@ describe("dataSourceCommand2", () => {
       handleScratchpadTableRes = sinon
         .stub(queryUtils, "handleScratchpadTableRes")
         .returns("dummy results");
-      getDataInsightsStub = sinon.stub(insightsConn, "getDataInsights");
+      getDataInsightsStub = sinon.stub(insightsConn, "getDatasourceQuery");
       writeQueryResultsToViewStub = sinon.stub(
         serverCommand,
         "writeQueryResultsToView",