Moved helper functionality into Client

Simplifies project structure. Not enough functionality to justify explaining extra file. (?)

Author: lobrien

quickstart/AzureSearchClient.js

@@ -1,46 +1,93 @@
+const fetch = require('node-fetch');
+
 class AzureSearchClient {
-    constructor (searchServiceHelper) {
-        this.searchServiceHelper = searchServiceHelper;
+    constructor(searchServiceName, apiKey, indexName) {
+        this.searchServiceName = searchServiceName;
+        this.apiKey = apiKey;
+        this.indexName = indexName;
+        this.apiVersion = '2019-05-06';
+    }
+
+    getIndexUrl() { return `https://${this.searchServiceName}.search.windows.net/indexes/${this.indexName}?api-version=${this.apiVersion}`; }
+    
+    getPostDataUrl() { return `https://${this.searchServiceName}.search.windows.net/indexes/${this.indexName}/docs/index?api-version=${this.apiVersion}`;  }
+
+    getSearchUrl(searchTerm) { return `https://${this.searchServiceName}.search.windows.net/indexes/${this.indexName}/docs?api-version=${this.apiVersion}&search=${searchTerm}&searchMode=all`; }
+    
+    request(url, method, bodyJson = null) {
+        // Uncomment the following for request details:
+        /*
+        console.log(`\n${method} ${url}`);
+        if (bodyJson !== null) {
+            console.log(`\ncontent: ${JSON.stringify(bodyJson, null, 4)}`);
+        }
+        */
+
+        const headers = {
+            'content-type' : 'application/json',
+            'api-key' : this.apiKey
+        };
+        const init = bodyJson === null ?
+            { 
+                method : method, 
+                headers : headers
+            }
+            : 
+            {
+                method : method, 
+                headers : headers,
+                body : JSON.stringify(bodyJson)
+            };
+        return fetch(url, init);
+    }
+
+    throwOnHttpError(response) {
+        const statusCode = response.status;
+        console.log(`Response Status: ${statusCode}`);
+        if (statusCode >= 300){
+            console.log(`Request failed: ${JSON.stringify(response, null, 4)}`);
+            throw new Exception(`Failure in request. HTTP Status was ${statusCode}`);
+        }
     }
 
     async indexExistsAsync() { 
         console.log("\n Checking if index exists...");
-        const endpoint = this.searchServiceHelper.getIndexUrl();
-        const response = await this.searchServiceHelper.request(endpoint, "GET", null);
+        const endpoint = this.getIndexUrl();
+        const response = await this.request(endpoint, "GET", null);
         // Success has a few likely status codes: 200 or 204 (No Content), but accept all in 200 range...
         const exists = response.status >= 200 && response.status < 300;
         return exists;
     }
 
     async deleteIndexAsync() {
         console.log("\n Deleting existing index...");
-        const endpoint = this.searchServiceHelper.getIndexUrl();
-        const response = await this.searchServiceHelper.request(endpoint, "DELETE");
-        this.searchServiceHelper.throwOnHttpError(response);
+        const endpoint = this.getIndexUrl();
+        const response = await this.request(endpoint, "DELETE");
+        this.throwOnHttpError(response);
         return this;
     }
 
     async createIndexAsync(definition) {
         console.log("\n Creating index...");
-        const endpoint = this.searchServiceHelper.getIndexUrl();
-        const response = await this.searchServiceHelper.request(endpoint, "PUT", definition);
-        this.searchServiceHelper.throwOnHttpError(response);
+        const endpoint = this.getIndexUrl();
+        const response = await this.request(endpoint, "PUT", definition);
+        this.throwOnHttpError(response);
         return this;
     }
 
     async postDataAsync(hotelsData) {
         console.log("\n Adding hotel data...");
-        const endpoint = this.searchServiceHelper.getPostDataUrl();
-        const response = await this.searchServiceHelper.request(endpoint,"POST", hotelsData);
-        this.searchServiceHelper.throwOnHttpError(response);
+        const endpoint = this.getPostDataUrl();
+        const response = await this.request(endpoint,"POST", hotelsData);
+        this.throwOnHttpError(response);
         return this;
     }
 
     async queryAsync(searchTerm) {
         console.log("\n Querying...")
-        const endpoint = this.searchServiceHelper.getSearchUrl(searchTerm);
-        const response = await this.searchServiceHelper.request(endpoint, "GET");
-        this.searchServiceHelper.throwOnHttpError(response);
+        const endpoint = this.getSearchUrl(searchTerm);
+        const response = await this.request(endpoint, "GET");
+        this.throwOnHttpError(response);
         return response;
     }
 }

quickstart/index.js

@@ -1,7 +1,6 @@
 #!/usr/bin/env/node
 
 const nconf = require('nconf');
-const SearchServiceHelper = require('./SearchServiceHelper.js');
 const AzureSearchClient = require('./AzureSearchClient.js');
 
 function getAzureConfiguration() {
@@ -48,16 +47,18 @@ async function doQueries(client) {
 const run = async () => {
     try {
         const cfg = getAzureConfiguration();
-        const helper = new SearchServiceHelper(cfg.get("serviceName"), cfg.get("apiKey"), "hotels");
-        const client = new AzureSearchClient(helper);
+        const client = new AzureSearchClient(cfg.get("serviceName"), cfg.get("apiKey"), "hotels");
 
         const exists = await client.indexExistsAsync();
         await exists ? client.deleteIndexAsync() : Promise.resolve();
+        // Deleting index can take a few seconds
         await sleep(2000);
         const indexDefinition = require('./hotels_quickstart_index.json');
         await client.createIndexAsync(indexDefinition);
+        // Index availability can take a few seconds
         await sleep(2000);
         await client.postDataAsync(hotelData);
+        // Data availability can take a few seconds
         await sleep(5000);
         await doQueries(client);
     } catch (x) {

quickstart/package.json

@@ -11,6 +11,7 @@
     "url": "."
   },
   "dependencies": {
+    "eslint-config-prettier": "^6.0.0",
     "nconf": "^0.9.0",
     "node-fetch": "^2.6.0"
   },
@@ -19,6 +20,7 @@
   "devDependencies": {
     "eslint": "^5.3.0",
     "eslint-config-airbnb-base": "^13.2.0",
-    "eslint-plugin-import": "^2.17.2"
+    "eslint-plugin-import": "^2.17.2",
+    "prettier": "1.18.2"
   }
 }