refactor

Author: Aschen

src/core/Observer.ts

@@ -130,27 +130,18 @@ export class Observer {
       verb?: string;
       timeout?: number;
     } = {}
-  ): Promise<SearchResult<RealtimeDocument>> {
-    let result;
-
+  ): Promise<RealtimeDocumentSearchResult> {
     return this.sdk.document['_search'](index, collection, searchBody, options)
       .then(({ response, request, opts }) => {
-        result = new RealtimeDocumentSearchResult(
+        const result = new RealtimeDocumentSearchResult(
           this.sdk,
           request,
           opts,
           response.result,
           this);
 
-        const rtDocuments = [];
-        for (const hit of result.hits) {
-          rtDocuments.push(this.addDocument(index, collection, hit));
-        }
-        result.hits = rtDocuments;
-
-        return this.resubscribe(index, collection)
-      })
-      .then(() => result);
+        return result.start();
+      });
   }
 
   observe (

src/core/RealtimeDocument.ts

@@ -10,4 +10,4 @@ export class RealtimeDocument {
     this._source = _source;
     this.deleted = false;
   }
-}
+}

src/core/searchResult/RealtimeDocument.ts

@@ -20,9 +20,22 @@ export class RealtimeDocumentSearchResult extends SearchResultBase<DocumentHit>
     this.observer = observer;
   }
 
-  protected _buildNextSearchResult (result: RealtimeDocumentSearchResult) {
+  start (): Promise<RealtimeDocumentSearchResult> {
     const { index, collection } = this._request;
 
+    const rtDocuments = [];
+
+    for (const hit of this.hits) {
+      rtDocuments.push(this.observer.addDocument(index, collection, hit));
+    }
+
+    this.hits = rtDocuments;
+
+    return this.observer.resubscribe(index, collection)
+      .then(() => this);
+  }
+
+  protected _buildNextSearchResult (result: RealtimeDocumentSearchResult) {
     const nextSearchResult = new RealtimeDocumentSearchResult(
       this._kuzzle,
       this._request,
@@ -32,13 +45,6 @@ export class RealtimeDocumentSearchResult extends SearchResultBase<DocumentHit>
 
     nextSearchResult.fetched += this.fetched;
 
-    const rtDocuments = [];
-    for (const hit of nextSearchResult.hits) {
-      rtDocuments.push(this.observer.addDocument(index, collection, hit));
-    }
-    nextSearchResult.hits = rtDocuments;
-
-    return this.observer.resubscribe(index, collection)
-      .then(() => nextSearchResult);
+    return this.start();
   }
 }