Merge back from production and Bump rc version

app/api/files.v2/FilesHealthCheck.ts

@@ -3,7 +3,10 @@ import { FileStorage } from './contracts/FileStorage';
 import { URLAttachment } from './model/URLAttachment';
 
 function filterFilesInStorage(files: string[]) {
-  return files.filter(file => !file.endsWith('activity.log'));
+  return files.filter(
+    file =>
+      !file.includes('/log/') && !file.includes('/segmentation/') && !file.includes('index.html')
+  );
 }
 
 export class FilesHealthCheck {

app/api/files.v2/infrastructure/S3FileStorage.ts

@@ -37,7 +37,7 @@ export class S3FileStorage implements FileStorage {
       const response = await this.s3Client.send(
         new ListObjectsV2Command({
           Bucket: config.s3.bucket,
-          Prefix: this.tenant.name,
+          Prefix: `${this.tenant.name}/`,
           ContinuationToken: token,
           MaxKeys: config.s3.batchSize,
         })

app/api/files.v2/infrastructure/specs/S3FileStorage.spec.ts

@@ -75,6 +75,37 @@ describe('S3FileStorage', () => {
   });
 
   describe('list', () => {
+    it('should list all s3 keys', async () => {
+      await s3Client.send(
+        new PutObjectCommand({
+          Bucket: 'uwazi-development',
+          Key: 'test-tenant/documents/document1',
+          Body: 'body',
+        })
+      );
+
+      await s3Client.send(
+        new PutObjectCommand({
+          Bucket: 'uwazi-development',
+          Key: 'test-tenant/documents/document2',
+          Body: 'body',
+        })
+      );
+
+      await s3Client.send(
+        new PutObjectCommand({
+          Bucket: 'uwazi-development',
+          Key: 'test-tenant-2/documents/document3',
+          Body: 'body',
+        })
+      );
+
+      const listedFiles = await s3fileStorage.list();
+
+      expect(listedFiles.sort()).toEqual(
+        ['test-tenant/documents/document1', 'test-tenant/documents/document2'].sort()
+      );
+    });
     it('should list all s3 keys', async () => {
       await s3Client.send(
         new PutObjectCommand({

app/api/files.v2/specs/FilesHealthCheck.spec.ts

@@ -95,14 +95,53 @@ describe('FilesHealthCheck', () => {
     });
   });
 
-  it('should ignore activity.log files', async () => {
-    testStorageFiles = ['log/1-activity.log', 'log/2-activity.log', 'document/file1'];
+  it('should ignore all /log files', async () => {
+    testStorageFiles = [
+      '/log/1-activity.log',
+      '/log/log.log',
+      '/log/error.log',
+      '/log/debug.log',
+      '/document/file1',
+    ];
     await testingEnvironment.setUp({ files: [] });
 
     const summary = await filesHealthCheck.execute();
 
     expect(summary).toMatchObject({
-      missingInDbList: ['document/file1'],
+      missingInDbList: ['/document/file1'],
+      missingInDb: 1,
+    });
+  });
+
+  it('should ignore all /segmentation files', async () => {
+    testStorageFiles = [
+      '/segmentation/1-activity.log',
+      '/documents/segmentation/1-activity.log',
+      '/document/file1',
+    ];
+    await testingEnvironment.setUp({ files: [] });
+
+    const summary = await filesHealthCheck.execute();
+
+    expect(summary).toMatchObject({
+      missingInDbList: ['/document/file1'],
+      missingInDb: 1,
+    });
+  });
+
+  it('should ignore all index.html files', async () => {
+    testStorageFiles = [
+      '/documents/index.html',
+      '/index.html',
+      '/segmentation/index.html',
+      '/document/file1',
+    ];
+    await testingEnvironment.setUp({ files: [] });
+
+    const summary = await filesHealthCheck.execute();
+
+    expect(summary).toMatchObject({
+      missingInDbList: ['/document/file1'],
       missingInDb: 1,
     });
   });

package.json

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