Merge pull request #2587 from RedisInsight/be/bugfix/RI-4931-fix-cli-transaction-response

#RI-4931 convert Error to string for RAW mode to avoid empt object re…

Author: vlad-dargel

redisinsight/api/src/common/transformers/redis-reply/strategies/ascii-formatter.strategy.ts

@@ -30,8 +30,13 @@ export class ASCIIFormatterStrategy implements IFormatterStrategy {
     return result;
   }
 
-  private formatRedisObjectReply(reply: Object): object {
+  private formatRedisObjectReply(reply: Object): object | string {
     const result = {};
+
+    if (reply instanceof Error) {
+      return reply.toString();
+    }
+
     Object.keys(reply).forEach((key) => {
       result[key] = this.format(reply[key]);
     });

redisinsight/api/src/common/transformers/redis-reply/strategies/utf8-formatter.strategy.ts

@@ -30,8 +30,13 @@ export class UTF8FormatterStrategy implements IFormatterStrategy {
     return result;
   }
 
-  private formatRedisObjectReply(reply: Object): object {
+  private formatRedisObjectReply(reply: Object): object | string {
     const result = {};
+
+    if (reply instanceof Error) {
+      return reply.toString();
+    }
+
     Object.keys(reply).forEach((key) => {
       result[key] = this.format(reply[key]);
     });

redisinsight/api/src/modules/cli/controllers/cli.controller.ts

@@ -2,7 +2,6 @@ import {
   Body,
   Controller,
   Delete,
-  Param,
   Patch,
   Post,
   UsePipes,

redisinsight/api/src/modules/cli/services/cli-business/output-formatter/strategies/raw-formatter.strategy.ts

@@ -1,5 +1,6 @@
 import { isArray, isObject } from 'lodash';
 import { getASCIISafeStringFromBuffer } from 'src/utils/cli-helper';
+import { ReplyError } from 'src/models';
 import { IOutputFormatterStrategy } from '../output-formatter.interface';
 
 export class RawFormatterStrategy implements IOutputFormatterStrategy {
@@ -30,8 +31,13 @@ export class RawFormatterStrategy implements IOutputFormatterStrategy {
     return result;
   }
 
-  private formatRedisObjectReply(reply: Object): object {
+  private formatRedisObjectReply(reply: Object): object | string {
     const result = {};
+
+    if (reply instanceof Error) {
+      return reply.toString();
+    }
+
     Object.keys(reply).forEach((key) => {
       result[key] = this.format(reply[key]);
     });

redisinsight/api/src/modules/cli/services/cli-business/output-formatter/strategies/utf-8-formatter.strategy.ts

@@ -30,8 +30,13 @@ export class UTF8FormatterStrategy implements IOutputFormatterStrategy {
     return result;
   }
 
-  private formatRedisObjectReply(reply: Object): object {
+  private formatRedisObjectReply(reply: Object): object | string {
     const result = {};
+
+    if (reply instanceof Error) {
+      return reply.toString();
+    }
+
     Object.keys(reply).forEach((key) => {
       result[key] = this.format(reply[key]);
     });

redisinsight/api/test/api/cli/POST-databases-id-cli-uuid-send_command.test.ts

@@ -1039,3 +1039,63 @@ describe('POST /databases/:instanceId/cli/:uuid/send-command', () => {
     ].map(mainCheckFn);
   })
 });
+
+describe('POST /databases/:instanceId/cli/:uuid/send-command (MULTI)', () => {
+  requirements('rte.type=STANDALONE');
+
+  before(rte.data.truncate);
+  // Create Redis client for CLI
+  before(async () => await request(server).patch(`/${constants.API.DATABASES}/${constants.TEST_INSTANCE_ID}/cli/${constants.TEST_CLI_UUID_1}`))
+
+  describe('Raw output', () => {
+    [
+      {
+        name: 'Should start transaction',
+        data: {
+          command: `multi`,
+          outputFormat: 'RAW',
+        },
+        responseRawSchema,
+        checkFn: ({ body }) => {
+          expect(body.response).to.eq("OK");
+        },
+      },
+      {
+        name: 'Should create string',
+        data: {
+          command: `set ${constants.TEST_STRING_KEY_1} bar`,
+          outputFormat: 'RAW',
+        },
+        responseRawSchema,
+        checkFn: ({ body }) => {
+          expect(body.response).to.eq("QUEUED")
+        },
+      },
+      {
+        name: 'Should create string',
+        data: {
+          command: `incr ${constants.TEST_STRING_KEY_1}`,
+          outputFormat: 'RAW',
+        },
+        responseRawSchema,
+        checkFn: ({ body }) => {
+          expect(body.response).to.eq("QUEUED")
+        },
+      },
+      {
+        name: 'Should create string',
+        data: {
+          command: 'exec',
+          outputFormat: 'RAW',
+        },
+        responseRawSchema,
+        checkFn: ({ body }) => {
+          expect(body.response).to.deep.eq([
+            'OK',
+            'ReplyError: ERR value is not an integer or out of range',
+          ]);
+        },
+      },
+    ].map(mainCheckFn);
+  })
+});