@smile-cdr/fhirts 2.3.0 → 2.4.1

package/src/library/QueryBuilder/QueryBuilder.spec.ts

@@ -1,8 +1,7 @@
-import { SORT_ORDER } from "../constants";
-import { QueryBuilder } from "./QueryBuilder";
-
-describe("QueryBuilder", () => {
+import { SORT_ORDER } from '../constants';
+import { QueryBuilder } from './QueryBuilder';
 
+describe('QueryBuilder', () => {
   let queryBuilder: QueryBuilder;
 
   beforeEach(() => {
@@ -11,124 +10,127 @@ describe("QueryBuilder", () => {
 
   it('setBaseResource() should set base resource and getBaseResource() should return correct base resource', () => {
     // setup
-    const expected: String = "Patient";
+    const expected: String = 'Patient';
     // execute
     queryBuilder.setBaseResource(expected);
     // validate
     expect(queryBuilder.getBaseResource()).toEqual(expected);
-  })
+  });
 
   it('include() should make query for _include', () => {
     // setup
-    const expected: String = "Patient?_include=Patient%3Aorganization"
+    const expected: String = 'Patient?_include=Patient%3Aorganization';
     // execute
-    queryBuilder.setBaseResource("Patient").include("organization");
+    queryBuilder.setBaseResource('Patient').include('organization');
     // validate
     expect(queryBuilder.getCompleteUrl()).toEqual(expected);
   });
 
   it('include() should make query for multiple _include', () => {
     // setup
-    const expected: String = "Patient?_include=Patient%3Aorganization&_include=Patient%3Alink"
+    const expected: String = 'Patient?_include=Patient%3Aorganization&_include=Patient%3Alink';
     // execute
-    queryBuilder.setBaseResource("Patient")
-                .include("organization")
-                .include("link");
+    queryBuilder.setBaseResource('Patient').include('organization').include('link');
     // validate
     expect(queryBuilder.getCompleteUrl()).toEqual(expected);
   });
 
   it('revinclude() should make query for _revinclude', () => {
     // setup
-    const expected: String = "MedicationRequest?_revinclude=CarePlan%3Aactivity-reference"
+    const expected: String = 'MedicationRequest?_revinclude=CarePlan%3Aactivity-reference';
     // execute
-    queryBuilder.setBaseResource("MedicationRequest")
-                .revinclude("CarePlan", "activity-reference");
+    queryBuilder.setBaseResource('MedicationRequest').revinclude('CarePlan', 'activity-reference');
     // validate
     expect(queryBuilder.getCompleteUrl()).toEqual(expected);
   });
 
   it('revinclude() should make query for multiple _revinclude', () => {
     // setup
-    const expected: String = "MedicationRequest?_revinclude=CarePlan%3Aactivity-reference&_revinclude=Observation%3Abased-on"
+    const expected: String =
+      'MedicationRequest?_revinclude=CarePlan%3Aactivity-reference&_revinclude=Observation%3Abased-on';
     // execute
-    queryBuilder.setBaseResource("MedicationRequest")
-                .revinclude("CarePlan", "activity-reference")
-                .revinclude("Observation", "based-on");
+    queryBuilder
+      .setBaseResource('MedicationRequest')
+      .revinclude('CarePlan', 'activity-reference')
+      .revinclude('Observation', 'based-on');
     // validate
     expect(queryBuilder.getCompleteUrl()).toEqual(expected);
   });
 
   it('include() and revinclude() should make query for _include & _revinclude', () => {
     // setup
-    const expected: String = "MedicationRequest?_revinclude=CarePlan%3Aactivity-reference&_include=MedicationRequest%3Aencounter"
+    const expected: String =
+      'MedicationRequest?_revinclude=CarePlan%3Aactivity-reference&_include=MedicationRequest%3Aencounter';
     // execute
-    queryBuilder.setBaseResource("MedicationRequest")
-                .revinclude("CarePlan", "activity-reference")
-                .include("encounter");
+    queryBuilder
+      .setBaseResource('MedicationRequest')
+      .revinclude('CarePlan', 'activity-reference')
+      .include('encounter');
     // validate
     expect(queryBuilder.getCompleteUrl()).toEqual(expected);
   });
 
   it('includeAll() should make query for _include all', () => {
     // setup
-    const expected: String = "MedicationRequest?_include=*"
+    const expected: String = 'MedicationRequest?_include=*';
     // execute
-    queryBuilder.setBaseResource("MedicationRequest").includeAll();
+    queryBuilder.setBaseResource('MedicationRequest').includeAll();
     // validate
     expect(queryBuilder.getCompleteUrl()).toEqual(expected);
   });
 
   it('revincludeAll() should make query for _revinclude all', () => {
     // setup
-    const expected: String = "MedicationRequest?_revinclude=*"
+    const expected: String = 'MedicationRequest?_revinclude=*';
     // execute
-    queryBuilder.setBaseResource("MedicationRequest").revincludeAll();
+    queryBuilder.setBaseResource('MedicationRequest').revincludeAll();
     // validate
     expect(queryBuilder.getCompleteUrl()).toEqual(expected);
   });
 
   it('includeAll() & revincludeAll() should make query for _include all & _revinclude all', () => {
     // setup
-    const expected: String = "MedicationRequest?_revinclude=*&_include=*"
+    const expected: String = 'MedicationRequest?_revinclude=*&_include=*';
     // execute
-    queryBuilder.setBaseResource("MedicationRequest")
-                .revincludeAll()
-                .includeAll();
+    queryBuilder.setBaseResource('MedicationRequest').revincludeAll().includeAll();
     // validate
     expect(queryBuilder.getCompleteUrl()).toEqual(expected);
   });
 
   it('sort() should make query for _sort', () => {
     // setup
-    const expected: String = "Observation?_sort=status%2C-date"
+    const expected: String = 'Observation?_sort=status%2C-date';
     // execute
-    queryBuilder.setBaseResource("Observation")
-                .sort("status", SORT_ORDER.ASCENDING)
-                .sort("date", SORT_ORDER.DESCENDING);
+    queryBuilder
+      .setBaseResource('Observation')
+      .sort('status', SORT_ORDER.ASCENDING)
+      .sort('date', SORT_ORDER.DESCENDING);
     // validate
     expect(queryBuilder.getCompleteUrl()).toEqual(expected);
   });
 
   it('sort(), include() and revincludeAll() should make query for _sort, _include & _revinclude', () => {
     // setup
-    const expected: String = "Observation?_revinclude=*&_include=Observation%3Abased-on&_sort=status"
+    const expected: String =
+      'Observation?_revinclude=*&_include=Observation%3Abased-on&_sort=status';
     // execute
-    queryBuilder.setBaseResource("Observation")
-                .revincludeAll()
-                .include("based-on")
-                .sort("status", SORT_ORDER.ASCENDING);
+    queryBuilder
+      .setBaseResource('Observation')
+      .revincludeAll()
+      .include('based-on')
+      .sort('status', SORT_ORDER.ASCENDING);
     // validate
     expect(queryBuilder.getCompleteUrl()).toEqual(expected);
   });
 
   it('resetQuery() should reset query', () => {
     // setup
-    const expected: String = ""
-    queryBuilder.setBaseResource("Observation")
-                .revincludeAll()
-                .include("based-on")
-                .sort("status", SORT_ORDER.ASCENDING);
+    const expected: String = '';
+    queryBuilder
+      .setBaseResource('Observation')
+      .revincludeAll()
+      .include('based-on')
+      .sort('status', SORT_ORDER.ASCENDING);
     // execute
     queryBuilder.resetQuery();
     // validate
@@ -137,13 +139,14 @@ describe("QueryBuilder", () => {
 
   it('getCompleteUrlDecoded() should get uri decoded query', () => {
     // setup
-    const expected: String = "Observation?_revinclude=*&_include=Observation:based-on&_sort=status"
+    const expected: String = 'Observation?_revinclude=*&_include=Observation:based-on&_sort=status';
     // execute
-    queryBuilder.setBaseResource("Observation")
-                .revincludeAll()
-                .include("based-on")
-                .sort("status", SORT_ORDER.ASCENDING);
+    queryBuilder
+      .setBaseResource('Observation')
+      .revincludeAll()
+      .include('based-on')
+      .sort('status', SORT_ORDER.ASCENDING);
     // validate
     expect(queryBuilder.getCompleteUrlDecoded()).toEqual(expected);
   });
-});
+});

package/src/library/QueryBuilder/QueryBuilder.ts

@@ -1,18 +1,17 @@
-import { SORT_ORDER } from "../constants";
+import { SORT_ORDER } from '../constants';
 
 export class QueryBuilder {
-
-  readonly REV_INCLUDE_KEYWORD = "_revinclude";
-  readonly INCLUDE_KEYWORD = "_include";
-  readonly SORT_KEYWORD = "_sort";
-  readonly WILDCARD_ASTERIK = "*";
-  readonly EQUALS = "=";
-  readonly COLON = ":";
-  readonly QUERY_DELIMETER = "&";
-  readonly COMMA = ",";
-  private baseResource: String = "";
+  readonly REV_INCLUDE_KEYWORD = '_revinclude';
+  readonly INCLUDE_KEYWORD = '_include';
+  readonly SORT_KEYWORD = '_sort';
+  readonly WILDCARD_ASTERIK = '*';
+  readonly EQUALS = '=';
+  readonly COLON = ':';
+  readonly QUERY_DELIMETER = '&';
+  readonly COMMA = ',';
+  private baseResource: String = '';
   private singularQueries: String[] = [];
-  private sortQueries: String[] =  [];
+  private sortQueries: String[] = [];
 
   /**
    * @returns base resource for the query
@@ -22,7 +21,7 @@ export class QueryBuilder {
   }
 
   /**
-   * @param resourceType Base ResourceType for the query 
+   * @param resourceType Base ResourceType for the query
    * sets base resource type for the query
    * i.e. which resource the query will performed for
    */
@@ -35,16 +34,24 @@ export class QueryBuilder {
    * @param searchParameter SearchParameter reference to targeted resource
    */
   include(searchParameter: String) {
-    this.singularQueries.push(this.INCLUDE_KEYWORD + this.EQUALS + encodeURIComponent(this.baseResource + this.COLON + searchParameter));
+    this.singularQueries.push(
+      this.INCLUDE_KEYWORD +
+        this.EQUALS +
+        encodeURIComponent(this.baseResource + this.COLON + searchParameter)
+    );
     return this;
   }
 
   /**
-   * @param resourceType Source ResourceType 
+   * @param resourceType Source ResourceType
    * @param searchParameter SearchParameter reference from target resource to baseResource
    */
   revinclude(resourceType: String, searchParameter: String) {
-    this.singularQueries.push(this.REV_INCLUDE_KEYWORD + this.EQUALS +  encodeURIComponent(resourceType + this.COLON + searchParameter));
+    this.singularQueries.push(
+      this.REV_INCLUDE_KEYWORD +
+        this.EQUALS +
+        encodeURIComponent(resourceType + this.COLON + searchParameter)
+    );
     return this;
   }
 
@@ -69,10 +76,10 @@ export class QueryBuilder {
    * @param sortOrder ASCENDING or DESCENDING
    */
   sort(searchParameter: String, sortOrder: SORT_ORDER) {
-    if(sortOrder === SORT_ORDER.ASCENDING) {
+    if (sortOrder === SORT_ORDER.ASCENDING) {
       this.sortQueries.push(searchParameter);
     } else {
-      this.sortQueries.push("-" + searchParameter);
+      this.sortQueries.push('-' + searchParameter);
     }
     return this;
   }
@@ -83,7 +90,7 @@ export class QueryBuilder {
   resetQuery() {
     this.sortQueries = [];
     this.singularQueries = [];
-    this.baseResource = "";
+    this.baseResource = '';
     return this;
   }
 
@@ -91,29 +98,32 @@ export class QueryBuilder {
    * @returns complete generated query with encoded parameter values
    */
   getCompleteUrl(): String {
-    let completeUrl = this.baseResource + "?";
+    let completeUrl = this.baseResource + '?';
     const singularQueriesLength = this.singularQueries.length;
-    if(singularQueriesLength > 0) {
-      completeUrl +=  this.singularQueries.join(this.QUERY_DELIMETER);
+    if (singularQueriesLength > 0) {
+      completeUrl += this.singularQueries.join(this.QUERY_DELIMETER);
     }
     completeUrl += this.createSortQuery(singularQueriesLength);
-    return completeUrl; 
+    return completeUrl;
   }
 
   /**
    * @returns complete generated query with decoded parameter values
    */
   getCompleteUrlDecoded(): String {
-    return decodeURIComponent(this.getCompleteUrl().toString()); 
+    return decodeURIComponent(this.getCompleteUrl().toString());
   }
-  
+
   private createSortQuery(singularQueriesLength: number): String {
-    let sortQuery = "";
-    const sortDelimeter = singularQueriesLength > 0 ? this.QUERY_DELIMETER : "";
-    if(this.sortQueries.length > 0) {
-      sortQuery += sortDelimeter + this.SORT_KEYWORD + this.EQUALS + encodeURIComponent(this.sortQueries.join(this.COMMA));
+    let sortQuery = '';
+    const sortDelimeter = singularQueriesLength > 0 ? this.QUERY_DELIMETER : '';
+    if (this.sortQueries.length > 0) {
+      sortQuery +=
+        sortDelimeter +
+        this.SORT_KEYWORD +
+        this.EQUALS +
+        encodeURIComponent(this.sortQueries.join(this.COMMA));
     }
     return sortQuery;
   }
-  
-}
+}