Merge pull request #3575 from RedisInsight/be/bugfix/RI-5820-fix-reply-transform

fix transform reply

Author: vlad-dargel

redisinsight/api/src/modules/browser/constants/browser-tool-commands.ts

@@ -20,6 +20,8 @@ export enum BrowserToolStringCommands {
 
 export enum BrowserToolHashCommands {
   HSet = 'hset',
+  HGetAll = 'hgetall',
+  HGETALL = 'HGETALL',
   HGet = 'hget',
   HLen = 'hlen',
   HScan = 'hscan',

redisinsight/api/src/modules/redis/client/ioredis/ioredis.client.ts

@@ -10,6 +10,9 @@ import { RedisString } from 'src/common/constants';
 import { ClientMetadata } from 'src/common/models';
 import { BrowserToolHashCommands } from 'src/modules/browser/constants/browser-tool-commands';
 
+// should return array (same as original reply)
+Redis.Command.setReplyTransformer(BrowserToolHashCommands.HGetAll, (result) => result);
+
 export abstract class IoredisClient extends RedisClient {
   constructor(
     public readonly clientMetadata: ClientMetadata,
@@ -20,6 +23,8 @@ export abstract class IoredisClient extends RedisClient {
     client.addBuiltinCommand(BrowserToolHashCommands.HExpire);
     client.addBuiltinCommand(BrowserToolHashCommands.HTtl);
     client.addBuiltinCommand(BrowserToolHashCommands.HPersist);
+    // fix not existing command in pipeline
+    client.addBuiltinCommand(BrowserToolHashCommands.HGETALL);
   }
 
   static prepareCommandOptions(options: IRedisClientCommandOptions): any {

redisinsight/api/src/modules/redis/connection/ioredis.redis.connection.strategy.spec.ts

@@ -3,8 +3,10 @@ import * as Redis from 'ioredis';
 import {
   mockClientMetadata, mockClusterDatabaseWithTlsAuth,
   mockDatabase, mockDatabaseWithSshBasic,
-  mockDatabaseWithTlsAuth, mockIORedisClient,
-  mockSentinelDatabaseWithTlsAuth, mockSshTunnel, mockSshTunnelProvider, mockStandaloneRedisClient
+  mockDatabaseWithTlsAuth,
+  mockSentinelDatabaseWithTlsAuth,
+  mockSshTunnelProvider,
+  mockStandaloneRedisClient,
 } from 'src/__mocks__';
 import { EventEmitter } from 'events';
 import apiConfig, { Config } from 'src/utils/config';

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

@@ -12,6 +12,7 @@ import {
   requirements, serverConfig
 } from '../deps';
 import { ServerService } from 'src/modules/server/server.service';
+import { convertArrayReplyToObject } from 'src/modules/redis/utils';
 const { server, request, constants, rte, analytics } = deps;
 
 // endpoint to test
@@ -292,7 +293,7 @@ describe('POST /databases/:instanceId/cli/:uuid/send-command', () => {
             expect(await rte.client.exists(constants.TEST_HASH_KEY_1)).to.eql(0);
           },
           after: async () => {
-            expect(await rte.client.hgetall(constants.TEST_HASH_KEY_1)).to.deep.eql({
+            expect(convertArrayReplyToObject(await rte.client.hgetall(constants.TEST_HASH_KEY_1))).to.deep.eql({
               [constants.TEST_HASH_FIELD_1_NAME]: constants.TEST_HASH_FIELD_1_VALUE,
             });
           },

redisinsight/api/test/api/hash/DELETE-databases-id-hash-fields.test.ts

@@ -10,6 +10,7 @@ import {
 } from '../deps';
 const { server, request, constants, rte } = deps;
 import * as Joi from 'joi';
+import { convertArrayReplyToObject } from 'src/modules/redis/utils';
 
 // endpoint to test
 const endpoint = (instanceId = constants.TEST_INSTANCE_ID) =>
@@ -89,7 +90,7 @@ describe('DELETE /databases/:instanceId/hash/fields', () => {
             affected: 0,
           },
           after: async () => {
-            const fields = await rte.client.hgetall(constants.TEST_HASH_KEY_2);
+            const fields = convertArrayReplyToObject(await rte.client.hgetall(constants.TEST_HASH_KEY_2));
             (new Array(3000).fill(0)).map((_, i) => {
               expect(fields[`field_${i + 1}`]).to.eql(`value_${i + 1}`);
             });
@@ -106,7 +107,7 @@ describe('DELETE /databases/:instanceId/hash/fields', () => {
             affected: 1,
           },
           after: async () => {
-            const fields = await rte.client.hgetall(constants.TEST_HASH_KEY_2);
+            const fields = convertArrayReplyToObject(await rte.client.hgetall(constants.TEST_HASH_KEY_2));
             (new Array(2999).fill(0)).map((_, i) => {
               expect(fields[`field_${i + 1}`]).to.eql(`value_${i + 1}`);
             });
@@ -123,7 +124,7 @@ describe('DELETE /databases/:instanceId/hash/fields', () => {
             affected: 4,
           },
           after: async () => {
-            const fields = await rte.client.hgetall(constants.TEST_HASH_KEY_2);
+            const fields = convertArrayReplyToObject(await rte.client.hgetall(constants.TEST_HASH_KEY_2));
             (new Array(2995).fill(0)).map((_, i) => {
               expect(fields[`field_${i + 3}`]).to.eql(`value_${i + 3}`);
             });

redisinsight/api/test/api/hash/POST-databases-id-hash.test.ts

@@ -11,6 +11,7 @@ import {
 } from '../deps';
 const { server, request, constants, rte } = deps;
 import * as Joi from 'joi';
+import { convertArrayReplyToObject } from 'src/modules/redis/utils';
 
 // endpoint to test
 const endpoint = (instanceId = constants.TEST_INSTANCE_ID) =>
@@ -62,7 +63,7 @@ const createCheckFn = async (testCase) => {
     } else {
       if (testCase.statusCode === 201) {
         expect(await rte.client.exists(testCase.data.keyName)).to.eql(1);
-        expect(await rte.client.hgetall(testCase.data.keyName)).to.eql({
+        expect(convertArrayReplyToObject(await rte.client.hgetall(testCase.data.keyName))).to.eql({
           [testCase.data.fields[0].field]: testCase.data.fields[0].value,
         });
         if (testCase.data.expire) {
@@ -188,7 +189,7 @@ describe('POST /databases/:instanceId/hash', () => {
           },
           after: async () =>
             // check that value was not overwritten
-            expect(await rte.client.hgetall(constants.TEST_HASH_KEY_1)).to.deep.eql({
+            expect(convertArrayReplyToObject(await rte.client.hgetall(constants.TEST_HASH_KEY_1))).to.deep.eql({
               [constants.TEST_HASH_FIELD_1_NAME]: constants.TEST_HASH_FIELD_1_VALUE,
             })
         },

redisinsight/api/test/api/hash/PUT-databases-id-hash.test.ts

@@ -10,6 +10,7 @@ import {
 } from '../deps';
 const { server, request, constants, rte } = deps;
 import * as Joi from 'joi';
+import { convertArrayReplyToObject } from 'src/modules/redis/utils';
 
 // endpoint to test
 const endpoint = (instanceId = constants.TEST_INSTANCE_ID) =>
@@ -111,7 +112,7 @@ describe('PUT /databases/:instanceId/hash', () => {
           },
           statusCode: 200,
           after: async () => {
-            expect(await rte.client.hgetall(constants.TEST_HASH_KEY_1)).to.eql({
+            expect(convertArrayReplyToObject(await rte.client.hgetall(constants.TEST_HASH_KEY_1))).to.eql({
               [constants.TEST_HASH_FIELD_1_NAME]: '',
               [constants.TEST_HASH_FIELD_2_NAME]: constants.TEST_HASH_FIELD_2_VALUE,
               ['new_field']: 'new_value',

redisinsight/api/test/api/workbench/POST-databases-id-workbench-command_executions.test.ts

@@ -11,6 +11,7 @@ import {
   validateApiCall,
   requirements,
 } from '../deps';
+import { convertArrayReplyToObject } from 'src/modules/redis/utils';
 const { server, request, constants, rte, localDb } = deps;
 
 // endpoint to test
@@ -369,7 +370,7 @@ describe('POST /databases/:instanceId/workbench/command-executions', () => {
             expect(await rte.client.exists(constants.TEST_HASH_KEY_1)).to.eql(0);
           },
           after: async () => {
-            expect(await rte.client.hgetall(constants.TEST_HASH_KEY_1)).to.deep.eql({
+            expect(convertArrayReplyToObject(await rte.client.hgetall(constants.TEST_HASH_KEY_1))).to.deep.eql({
               [constants.TEST_HASH_FIELD_1_NAME]: constants.TEST_HASH_FIELD_1_VALUE,
             });
           },