Merge pull request #2422 from RedisInsight/be/feature/RI-4650_trim_bulk_import

Be/feature/ri 4650 trim bulk import

Author: mariasergeenko

redisinsight/api/src/modules/bulk-actions/bulk-import.service.spec.ts

@@ -232,6 +232,17 @@ describe('BulkImportService', () => {
       expect(mockIORedisClient.disconnect).toHaveBeenCalled();
     });
 
+    it('should ignore blank lines', async () => {
+      await service.import(mockClientMetadata, {
+        file: {
+          ...mockUploadImportFileDto.file,
+          buffer: Buffer.from('\n SET foo bar \n     \n SET foo bar \n    '),
+        } as unknown as MemoryStoredFile,
+      })
+      expect(spy).toBeCalledWith(mockIORedisClient, [['set', ['foo', 'bar']], ['set', ['foo', 'bar']]])
+      expect(mockIORedisClient.disconnect).toHaveBeenCalled();
+    });
+
     it('should throw an error in case of global error', async () => {
       try {
         databaseConnectionService.createClient.mockRejectedValueOnce(new NotFoundException());

redisinsight/api/src/modules/bulk-actions/bulk-import.service.ts

@@ -101,13 +101,14 @@ export class BulkImportService {
         const rl = readline.createInterface(stream);
         rl.on('line', (line) => {
           try {
-            const [command, ...args] = splitCliCommandLine((line));
+            const [command, ...args] = splitCliCommandLine((line.trim()));
             if (batch.length >= BATCH_LIMIT) {
               batchResults.push(this.executeBatch(client, batch));
               batch = [];
             }
-
-            batch.push([command.toLowerCase(), args]);
+            if (command) {
+              batch.push([command.toLowerCase(), args]);
+            }
           } catch (e) {
             parseErrors += 1;
           }

redisinsight/api/test/api/bulk-actions/POST-databases-id-bulk_actions-import.test.ts

@@ -138,6 +138,40 @@ describe('POST /databases/:id/bulk-actions/import', () => {
         },
       });
     });
+    it('Should ignore blank lines', async () => {
+      await validateApiCall({
+        endpoint,
+        attach: [
+          'file',
+          Buffer.from(`
+            \n
+            \n
+            SET key0 value0
+            \n
+                  \n
+            SET key1 value1
+            \n
+            \n
+          `),
+          'any_filename_and_ext',
+        ],
+        responseBody: {
+          id: 'empty',
+          databaseId: constants.TEST_INSTANCE_ID,
+          type: 'upload',
+          summary: { processed: 2, succeed: 2, failed: 0, errors: [] },
+          progress: null,
+          filter: null,
+          status: 'completed',
+        },
+        checkFn: async ({ body }) => {
+          expect(body.duration).to.gt(0);
+
+          expect(await rte.client.get('key0')).to.eq('value0');
+          expect(await rte.client.get('key1')).to.eq('value1');
+        },
+      });
+    });
     it('Should import 100K strings', async () => {
       const b =           Buffer.from(
         (new Array(100_000)).fill(1).map(