Merge branch 'feature/RI-3238/prepare_for_docker' into feature/RI-966_virtual-table-resize

Author: vlad-dargel

redisinsight/api/src/core.module.ts

@@ -5,11 +5,13 @@ import { DatabaseModule } from 'src/modules/database/database.module';
 import { CertificateModule } from 'src/modules/certificate/certificate.module';
 import { EventEmitterModule } from '@nestjs/event-emitter';
 import { RedisModule } from 'src/modules/redis/redis.module';
+import { AnalyticsModule } from 'src/modules/analytics/analytics.module';
 
 @Global()
 @Module({
   imports: [
     EventEmitterModule.forRoot(),
+    AnalyticsModule,
     EncryptionModule.register(),
     SettingsModule.register(),
     CertificateModule.register(),

redisinsight/api/src/modules/analytics/analytics.module.ts

@@ -0,0 +1,9 @@
+import { Module } from '@nestjs/common';
+import { AnalyticsService } from 'src/modules/analytics/analytics.service';
+
+@Module({
+  providers: [
+    AnalyticsService,
+  ],
+})
+export class AnalyticsModule {}

redisinsight/api/src/modules/database/providers/database.factory.ts

@@ -45,6 +45,7 @@ export class DatabaseFactory {
     }
 
     model.modules = await this.databaseInfoProvider.determineDatabaseModules(client);
+    model.lastConnection = new Date();
     await client.disconnect();
 
     return model;

redisinsight/api/src/modules/redis/redis.service.ts

@@ -54,15 +54,15 @@ export class RedisService {
   ): Promise<Redis> {
     const config = await this.getRedisConnectionConfig(database);
 
-    const client = await new Promise((resolve, reject) => {
+    return await new Promise((resolve, reject) => {
       try {
         const connection = new Redis({
           ...config,
           showFriendlyErrorStack: true,
           maxRetriesPerRequest: REDIS_CLIENTS_CONFIG.maxRetriesPerRequest,
           connectionName,
           retryStrategy: useRetry ? this.retryStrategy : () => undefined,
-          db: 0, // create connection to 0 index always and select db later if needed
+          db: config.db > 0 && !database.sentinelMaster ? config.db : 0,
         });
         connection.on('error', (e): void => {
           this.logger.error('Failed connection to the redis database.', e);
@@ -79,19 +79,6 @@ export class RedisService {
         reject(e);
       }
     }) as Redis;
-
-    // do not add db index in the client construcot to avoid Sentinel select command
-    // todo: rethink how we can avoid such logic
-    if (config.db > 0 && !database.sentinelMaster) {
-      try {
-        await client.select(config.db);
-      } catch (e) {
-        client.disconnect();
-        throw e;
-      }
-    }
-
-    return client;
   }
 
   public async createClusterClient(

redisinsight/api/src/modules/workbench/entities/command-execution.entity.ts

@@ -81,6 +81,7 @@ export class CommandExecutionEntity {
   encryption: string;
 
   @Column({ nullable: true })
+  @Expose()
   executionTime?: number;
 
   @CreateDateColumn()

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

@@ -182,8 +182,8 @@ describe(`PUT /databases/:id`, () => {
           },
           after: async () => {
             newDatabase = await localDb.getInstanceById(constants.TEST_INSTANCE_ID_3);
-            expect(_.omit(newDatabase, ['modules', 'provider'])).to.deep.eq({
-              ..._.omit(oldDatabase, ['modules', 'provider']),
+            expect(newDatabase).to.contain({
+              ..._.omit(oldDatabase, ['modules', 'provider', 'lastConnection']),
               host: constants.TEST_REDIS_HOST,
               port: constants.TEST_REDIS_PORT,
             });

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

@@ -32,7 +32,7 @@ const responseSchema = Joi.object().keys({
   mode: Joi.string().required(),
   summary: Joi.string().allow(null),
   resultsMode: Joi.string().allow(null),
-  executionTime: Joi.number().allow(null),
+  executionTime: Joi.number().required(),
   nodeOptions: Joi.object().keys({
     host: Joi.string().required(),
     port: Joi.number().required(),

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

@@ -20,7 +20,7 @@ const responseSchema = Joi.array().items(Joi.object().keys({
   mode: Joi.string().required(),
   summary: Joi.string().allow(null),
   resultsMode: Joi.string().allow(null),
-  executionTime: Joi.number().allow(null),
+  executionTime: Joi.number().required(),
   nodeOptions: Joi.object().keys({
     host: Joi.string().required(),
     port: Joi.number().required(),

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

@@ -71,7 +71,7 @@ const responseSchema = Joi.array().items(Joi.object().keys({
     enableRedirection: Joi.boolean().required(),
   }).allow(null),
   createdAt: Joi.date().required(),
-  executionTime: Joi.number().integer().allow(null),
+  executionTime: Joi.number().integer(),
   isNotStored: Joi.boolean(),
   summary: Joi.object({
     total: Joi.number(),

redisinsight/api/test/helpers/local-db.ts

@@ -119,6 +119,7 @@ export const generateNCommandExecutions = async (
       role: 'ALL',
       mode: 'ASCII',
       encryption: constants.TEST_ENCRYPTION_STRATEGY,
+      executionTime: Math.round(Math.random() * 10000),
       createdAt: new Date(),
       ...partial,
     }));