Merge pull request #3434 from huridocs/hotfix-snippets-search

Hotfix snippets search

app/api/search/deprecatedRoutes.js

@@ -48,7 +48,7 @@ export default app => {
     ),
     (req, res, next) =>
       search
-        .searchSnippets(req.query.searchTerm, req.query.id, req.language)
+        .searchSnippets(req.query.searchTerm, req.query.id, req.language, req.user)
         .then(results => res.json(results))
         .catch(next)
   );

app/api/search/search.js

@@ -651,7 +651,7 @@ const instanceSearch = elasticIndex => ({
     return entities.get({ user: user._id, language, published: false });
   },
 
-  async searchSnippets(searchTerm, sharedId, language) {
+  async searchSnippets(searchTerm, sharedId, language, user) {
     const templates = await templatesModel.get();
 
     const searchTextType = searchTerm
@@ -663,14 +663,16 @@ const instanceSearch = elasticIndex => ({
       .concat(['title', 'fullText']);
     const query = documentQueryBuilder()
       .fullTextSearch(searchTerm, searchFields, 9999, searchTextType)
-      .includeUnpublished()
       .filterById(sharedId)
-      .language(language)
-      .query();
+      .language(language);
+
+    if (user) {
+      query.includeUnpublished();
+    }
 
     const response = await elastic.search({
       index: elasticIndex || getCurrentTenantIndex(),
-      body: query,
+      body: query.query(),
     });
     if (response.body.hits.hits.length === 0) {
       return {

app/api/search/specs/index.spec.js

@@ -38,6 +38,7 @@ describe('index (search)', () => {
           },
         ],
         language: 'en',
+        published: true,
       };
 
       await search.bulkIndex([entity], 'index', elasticIndex);

app/api/search/specs/routes.spec.js

@@ -93,13 +93,17 @@ describe('search routes', () => {
 
     it('should search', done => {
       spyOn(search, 'searchSnippets').and.returnValue(new Promise(resolve => resolve('results')));
-      const req = { query: { searchTerm: 'test', id: 'id' }, language: 'es' };
+      const req = {
+        query: { searchTerm: 'test', id: 'id' },
+        language: 'es',
+        user: { _id: 'userId' },
+      };
 
       routes
         .get('/api/search_snippets', req)
         .then(response => {
           expect(response).toEqual('results');
-          expect(search.searchSnippets).toHaveBeenCalledWith('test', 'id', 'es');
+          expect(search.searchSnippets).toHaveBeenCalledWith('test', 'id', 'es', req.user);
           done();
         })
         .catch(catchErrors(done));

app/api/search/specs/search.spec.js

@@ -65,34 +65,42 @@ describe('search', () => {
       expect(snippets.fullText[0].text).not.toMatch('[[34]]');
     });
 
-    it('perform a search on metadata and fullText and return the snippets', done => {
-      search
-        .searchSnippets('gargoyles', ids.metadataSnippets, 'en')
-        .then(snippets => {
-          const titleSnippet = snippets.metadata.find(snippet => snippet.field === 'title');
-          const fieldSnippet = snippets.metadata.find(
-            snippet => snippet.field === 'metadata.field1.value'
-          );
-          expect(snippets.count).toBe(3);
-          expect(snippets.metadata.length).toEqual(2);
-          expect(titleSnippet.texts.length).toBe(1);
-          expect(titleSnippet.texts[0]).toMatch('gargoyles');
-          expect(fieldSnippet.texts.length).toBe(1);
-          expect(fieldSnippet.texts[0]).toMatch('gargoyles');
-          expect(snippets.fullText.length).toBe(1);
-          done();
-        })
-        .catch(catchErrors(done));
+    it('perform a search on metadata and fullText and return the snippets', async () => {
+      const user = { _id: 'userId' };
+      const snippets = await search.searchSnippets('gargoyles', ids.metadataSnippets, 'en', user);
+
+      const titleSnippet = snippets.metadata.find(snippet => snippet.field === 'title');
+      const fieldSnippet = snippets.metadata.find(
+        snippet => snippet.field === 'metadata.field1.value'
+      );
+      expect(snippets.count).toBe(3);
+      expect(snippets.metadata.length).toEqual(2);
+      expect(titleSnippet.texts.length).toBe(1);
+      expect(titleSnippet.texts[0]).toMatch('gargoyles');
+      expect(fieldSnippet.texts.length).toBe(1);
+      expect(fieldSnippet.texts[0]).toMatch('gargoyles');
+      expect(snippets.fullText.length).toBe(1);
     });
 
-    it('should perform the search on unpublished documents also', done => {
-      search
-        .searchSnippets('unpublished', 'unpublishedSharedId', 'en')
-        .then(snippets => {
-          expect(snippets.fullText.length).toBe(1);
-          done();
-        })
-        .catch(catchErrors(done));
+    it('should include unpublished documents if logged in', async () => {
+      const user = { _id: 'userId' };
+      const snippets = await search.searchSnippets(
+        'unpublished',
+        'unpublishedSharedId',
+        'en',
+        user
+      );
+      expect(snippets.fullText.length).toBe(1);
+    });
+
+    it('should not include unpublished if not logged in', async () => {
+      const snippets = await search.searchSnippets(
+        'unpublished',
+        'unpublishedSharedId',
+        'en',
+        undefined
+      );
+      expect(snippets.fullText.length).toBe(0);
     });
 
     describe('when document is not matched', () => {

package.json

@@ -1,6 +1,6 @@
 {
   "name": "uwazi",
-  "version": "1.19.3",
+  "version": "1.19.4",
   "description": "Uwazi is a free, open-source solution for organising, analysing and publishing your documents.",
   "keywords": [
     "react"