resolve merge conflicts

Author: Artem

redisinsight/api/src/__mocks__/databases.ts

@@ -8,6 +8,7 @@ import { mockSentinelMasterDto } from 'src/__mocks__/redis-sentinel';
 import { pick } from 'lodash';
 import { RedisDatabaseInfoResponse } from 'src/modules/database/dto/redis-info.dto';
 import { DatabaseOverview } from 'src/modules/database/models/database-overview';
+import { ClientContext, ClientMetadata } from 'src/common/models';
 
 export const mockDatabaseId = 'a77b23c1-7816-4ea4-b61f-d37795a0f805-db-id';
 
@@ -120,8 +121,9 @@ export const mockNewDatabase = Object.assign(new Database(), {
 });
 
 export const mockClientMetadata: ClientMetadata = {
+  session: undefined,
   databaseId: mockDatabase.id,
-  namespace: AppTool.Common,
+  context: ClientContext.Common,
 };
 
 export const mockDatabaseOverview: DatabaseOverview = {

redisinsight/api/src/modules/database/database-connection.service.ts

@@ -32,7 +32,6 @@ export class DatabaseConnectionService {
     // mark database as not a new
     // will be refreshed after user navigate to particular database from the databases list
     // Note: move to a different place in case if we need to update such info more often
-    await this.repository.update(clientMetadata.databaseId, {
     const toUpdate: Partial<Database> = {
       new: false,
       lastConnection: new Date(),
@@ -52,7 +51,7 @@ export class DatabaseConnectionService {
       }));
     }
 
-    await this.repository.update(databaseId, toUpdate);
+    await this.repository.update(clientMetadata.databaseId, toUpdate);
 
     this.logger.log(`Succeed to connect to database ${clientMetadata.databaseId}`);
   }