Merge branch 'master' of https://swopt.com:3000/enzo/Fis-SearchUtility

index.ts

@@ -1,4 +1,4 @@
-import { queryService } from "./services/query.service";
+import { SearchService } from "./services/query.service";
 
 const express = require('express');
 const bodyParser = require('body-parser');

services/query.service.ts

@@ -1,9 +1,9 @@
 import * as fs from 'fs'
-import { _, isObject, get } from 'lodash'
+import {  isObject, get } from 'lodash'
 import { Observable, Subject, interval, map, of } from 'rxjs'
 import { DataPrepService } from './dataprep.service'
-
-export class queryService {
+import _ = require("lodash")
+export class SearchService {
 
     private dataPrepService : DataPrepService
     constructor(){

test/test1.ts

@@ -3,11 +3,12 @@ pass in the conditions of their search enquiries. We will aslo have to cater to
 data to be filtered
  */
 import { Observable } from "rxjs"
-import { queryService } from "../services/query.service"
+import { SearchService } from "../services/query.service"
 import { Conditions, Storage } from "../services/query.service"
-import { _, isObject } from 'lodash'
+import {  isObject } from 'lodash'
+import _ = require("lodash")
 
-let query = new queryService()
+let query = new SearchService()
 
 //For now just local file storage. More will be preapred in the design phase later.
 let storageAddress: Storage = {

test/test2.ts

@@ -3,11 +3,12 @@ pass in the conditions of their search enquiries. We will aslo have to cater to
 data to be filtered
  */
 import { Observable } from "rxjs"
-import { queryService } from "../services/query.service"
+import { SearchService } from "../services/query.service"
 import { Conditions, Storage } from "../services/query.service"
-import { _, isObject } from 'lodash'
+import { isObject } from 'lodash'
+import _ = require("lodash")
 
-let query = new queryService()
+let query = new SearchService()
 
 let mongoStorage : any = {
     type: `MongoDB`,

test/test3.ts

@@ -2,7 +2,7 @@
 
 import mongoose, { Model } from "mongoose";
 import { Subject, from, map, of, interval, buffer, asyncScheduler, observeOn, takeUntil, delay, queueScheduler, bufferWhen } from "rxjs";
-import { queryService } from "../services/query.service";
+import { SearchService } from "../services/query.service";
 const used = process.memoryUsage();
 
 let MongooseConnection: mongoose.Connection
@@ -89,7 +89,7 @@ function handlers(element: any) {
     }, randomInt * 1000)
 }
 function printLog() {
-    let service = new queryService()
+    let service = new SearchService()
     service.callFromOtherClass()
 }