Merge pull request #3913 from RedisInsight/be/bugfix/RI-6141-rdi-last-connection-is-not-updated

RI-6141 update rdi last connection on each connect

Author: mariasergeenko

redisinsight/api/src/modules/rdi/providers/rdi.client.provider.spec.ts

@@ -46,11 +46,13 @@ describe('RdiClientProvider', () => {
       const metadata: RdiClientMetadata = { id: '123', sessionMetadata: undefined };
       const client: RdiClient = generateMockRdiClient(metadata);
       rdiClientStorage.getByMetadata.mockResolvedValue(client);
+      repository.update.mockResolvedValue(mockRdi);
 
       const result = await provider.getOrCreate(metadata);
 
       expect(rdiClientStorage.getByMetadata).toHaveBeenCalledWith(metadata);
       expect(client.ensureAuth).toHaveBeenCalled();
+      expect(repository.update).toHaveBeenCalled();
       expect(result).toEqual(client);
     });
 
@@ -84,11 +86,13 @@ describe('RdiClientProvider', () => {
       const client: RdiClient = generateMockRdiClient(metadata);
       repository.get.mockResolvedValue(mockRdi);
       rdiClientFactory.createClient.mockResolvedValue(client);
+      repository.update.mockResolvedValue(mockRdi);
 
       const result = await provider.create(metadata);
 
       expect(repository.get).toHaveBeenCalledWith(metadata.id);
       expect(rdiClientFactory.createClient).toHaveBeenCalledWith(metadata, mockRdi);
+      expect(repository.update).toHaveBeenCalled();
       expect(result).toEqual(client);
     });
   });
@@ -128,4 +132,15 @@ describe('RdiClientProvider', () => {
       expect(result).toEqual(2);
     });
   });
+
+  describe('updateLastConnection', () => {
+    it('should update rdi lastConnection', async () => {
+      const metadata: RdiClientMetadata = { id: '123', sessionMetadata: undefined };
+      repository.update.mockResolvedValue(mockRdi);
+
+      await provider['updateLastConnection'](metadata);
+
+      expect(repository.update).toHaveBeenCalled();
+    });
+  });
 });

redisinsight/api/src/modules/rdi/providers/rdi.client.provider.ts

@@ -1,6 +1,6 @@
 import { RdiClient } from 'src/modules/rdi/client/rdi.client';
 import { Injectable, Logger, NotFoundException } from '@nestjs/common';
-import { RdiClientMetadata } from 'src/modules/rdi/models';
+import { Rdi, RdiClientMetadata } from 'src/modules/rdi/models';
 import { RdiClientStorage } from 'src/modules/rdi/providers/rdi.client.storage';
 import { RdiClientFactory } from 'src/modules/rdi/providers/rdi.client.factory';
 import { RdiRepository } from 'src/modules/rdi/repository/rdi.repository';
@@ -20,6 +20,7 @@ export class RdiClientProvider {
     let client = await this.rdiClientStorage.getByMetadata(rdiClientMetadata);
     if (client) {
       await client.ensureAuth();
+      this.updateLastConnection(rdiClientMetadata);
       return client;
     }
 
@@ -35,7 +36,11 @@ export class RdiClientProvider {
       this.logger.error(`RDI with ${clientMetadata.id} was not Found`);
       throw new NotFoundException(ERROR_MESSAGES.INVALID_RDI_INSTANCE_ID);
     }
-    return this.rdiClientFactory.createClient(clientMetadata, rdi);
+    const rdiClient = await this.rdiClientFactory.createClient(clientMetadata, rdi);
+    if (rdiClient) {
+      this.updateLastConnection(clientMetadata);
+    }
+    return rdiClient;
   }
 
   async delete(rdiClientMetadata: RdiClientMetadata): Promise<number> {
@@ -49,4 +54,12 @@ export class RdiClientProvider {
   async deleteManyByRdiId(id: string): Promise<number> {
     return this.rdiClientStorage.deleteManyByRdiId(id);
   }
+
+  private async updateLastConnection(rdiClientMetadata: RdiClientMetadata): Promise<void> {
+    try {
+      await this.repository.update(rdiClientMetadata.id, { lastConnection: new Date() });
+    } catch (e) {
+      // ignore the error
+    }
+  }
 }

redisinsight/api/src/modules/rdi/repository/local.rdi.repository.ts

@@ -75,9 +75,8 @@ export class LocalRdiRepository extends RdiRepository {
     const newEntity = classToClass(RdiEntity, rdi);
 
     const encrypted = await this.modelEncryptor.encryptEntity(this.repository.merge(oldEntity, newEntity));
-    await this.repository.save(encrypted);
 
-    return this.get(id);
+    return classToClass(Rdi, await this.modelEncryptor.decryptEntity(await this.repository.save(encrypted)));
   }
 
   /**