deleting database now also clears Solr indexes

2 files changed, 16 insertions, 2 deletions

diff --git a/src/server/Search.ts b/src/server/Search.ts
index f9babc433..7d8602346 100644
--- a/src/server/Search.ts
+++ b/src/server/Search.ts
@@ -24,4 +24,15 @@ export class Search {
         const docIds = docs.map((doc: any) => doc._id);
         return docIds;
     }
+
+    public async clear() {
+        return rp.post(this.url + "dash/update", {
+            body: {
+                delete: {
+                    query: "*:*"
+                }
+            },
+            json: true
+        });
+    }
 }
\ No newline at end of file
diff --git a/src/server/index.ts b/src/server/index.ts
index bea84c6ed..cb4268a2d 100644
--- a/src/server/index.ts
+++ b/src/server/index.ts
@@ -11,6 +11,7 @@ import { ObservableMap } from 'mobx';
 import * as passport from 'passport';
 import * as path from 'path';
 import * as request from 'request';
+import * as rp from 'request-promise';
 import * as io from 'socket.io';
 import { Socket } from 'socket.io';
 import * as webpack from 'webpack';
@@ -241,14 +242,16 @@ server.on("connection", function (socket: Socket) {
     Utils.AddServerHandler(socket, MessageStore.DeleteAll, deleteFields);
 });
 
-function deleteFields() {
-    return Database.Instance.deleteAll();
+async function deleteFields() {
+    await Database.Instance.deleteAll();
+    await Search.Instance.clear();
 }
 
 async function deleteAll() {
     await Database.Instance.deleteAll();
     await Database.Instance.deleteAll('sessions');
     await Database.Instance.deleteAll('users');
+    await Search.Instance.clear();
 }
 
 function barReceived(guid: String) {