#RI-4813 - fix tests

Author: egor-zalenski

redisinsight/api/src/modules/database-import/database-import.service.spec.ts

@@ -168,7 +168,7 @@ describe('DatabaseImportService', () => {
         ...pick(mockDatabase, ['host', 'port', 'name', 'connectionType', 'timeout', 'compressor']),
         provider: 'RE_CLOUD',
         new: true,
-      });
+      }, false);
     });
     it('should create standalone with created name', async () => {
       await service['createDatabase']({
@@ -180,7 +180,7 @@ describe('DatabaseImportService', () => {
         ...pick(mockDatabase, ['host', 'port', 'name', 'connectionType', 'timeout', 'compressor']),
         name: `${mockDatabase.host}:${mockDatabase.port}`,
         new: true,
-      });
+      }, false);
     });
     it('should create standalone with none compressor', async () => {
       await service['createDatabase']({
@@ -192,7 +192,7 @@ describe('DatabaseImportService', () => {
         ...pick(mockDatabase, ['host', 'port', 'name', 'connectionType', 'timeout', 'compressor']),
         compressor: Compressor.NONE,
         new: true,
-      });
+      }, false);
     });
     it('should create standalone with compressor', async () => {
       await service['createDatabase']({
@@ -204,7 +204,7 @@ describe('DatabaseImportService', () => {
         ...pick(mockDatabase, ['host', 'port', 'name', 'connectionType', 'timeout', 'compressor']),
         compressor: Compressor.GZIP,
         new: true,
-      });
+      }, false);
     });
     it('should create cluster database', async () => {
       await service['createDatabase']({
@@ -217,7 +217,7 @@ describe('DatabaseImportService', () => {
         ...pick(mockDatabase, ['host', 'port', 'name', 'timeout', 'compressor']),
         connectionType: ConnectionType.CLUSTER,
         new: true,
-      });
+      }, false);
     });
   });
 

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

@@ -242,7 +242,7 @@ export class DatabaseImportService {
 
       const database = classToClass(Database, dto);
 
-      await this.databaseRepository.create(database);
+      await this.databaseRepository.create(database, false);
 
       return {
         index,

redisinsight/api/src/modules/database/database.controller.ts

@@ -98,7 +98,7 @@ export class DatabaseController {
   async create(
     @Body() dto: CreateDatabaseDto,
   ): Promise<Database> {
-    return await this.service.create(dto);
+    return await this.service.create(dto, true);
   }
 
   @UseInterceptors(ClassSerializerInterceptor)

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

@@ -98,15 +98,16 @@ export class DatabaseService {
   /**
    * Create new database with auto-detection of database type, modules, etc.
    * @param dto
+   * @param uniqueCheck
    */
-  async create(dto: CreateDatabaseDto): Promise<Database> {
+  async create(dto: CreateDatabaseDto, uniqueCheck = false): Promise<Database> {
     try {
       this.logger.log('Creating new database.');
 
       const database = await this.repository.create({
         ...await this.databaseFactory.createDatabaseModel(classToClass(Database, dto)),
         new: true,
-      });
+      }, uniqueCheck);
 
       // todo: clarify if we need this and if yes - rethink implementation
       try {

redisinsight/api/src/modules/database/repositories/database.repository.ts

@@ -27,8 +27,9 @@ export abstract class DatabaseRepository {
   /**
    * Create database
    * @param database
+   * @param uniqueCheck
    */
-  abstract create(database: Database): Promise<Database>;
+  abstract create(database: Database, uniqueCheck: boolean): Promise<Database>;
 
   /**
    * Update database with new data

redisinsight/api/src/modules/database/repositories/local.database.repository.spec.ts

@@ -253,18 +253,17 @@ describe('LocalDatabaseRepository', () => {
 
   describe('create', () => {
     it('should create standalone database', async () => {
-      const result = await service.create(mockDatabase);
+      const result = await service.create(mockDatabase, false);
 
       expect(result).toEqual(mockDatabase);
       expect(caCertRepository.create).not.toHaveBeenCalled();
       expect(clientCertRepository.create).not.toHaveBeenCalled();
     });
 
     it('should create standalone database with cloud details', async () => {
-      repository.findOneBy.mockResolvedValueOnce(null);
       repository.save.mockResolvedValue(mockDatabaseEntityWithCloudDetails);
 
-      const result = await service.create(mockDatabaseWithCloudDetails);
+      const result = await service.create(mockDatabaseWithCloudDetails, false);
 
       expect(result).toEqual(mockDatabaseWithCloudDetails);
       expect(caCertRepository.create).not.toHaveBeenCalled();
@@ -274,7 +273,7 @@ describe('LocalDatabaseRepository', () => {
     it('should create standalone database (with existing certificates)', async () => {
       repository.save.mockResolvedValueOnce(mockDatabaseWithTlsAuthEntity);
 
-      const result = await service.create(mockDatabaseWithTlsAuth);
+      const result = await service.create(mockDatabaseWithTlsAuth, false);
 
       expect(result).toEqual(mockDatabaseWithTlsAuth);
       expect(caCertRepository.create).not.toHaveBeenCalled();
@@ -286,6 +285,7 @@ describe('LocalDatabaseRepository', () => {
 
       const result = await service.create(
         omit(cloneClassInstance(mockDatabaseWithTlsAuth), 'caCert.id', 'clientCert.id'),
+        false,
       );
 
       expect(result).toEqual(mockDatabaseWithTlsAuth);
@@ -296,7 +296,7 @@ describe('LocalDatabaseRepository', () => {
     it('should throw an error if create called with cloud details and have the same entity', async () => {
       repository.findOneBy.mockResolvedValueOnce(mockDatabaseEntity);
       try {
-        await service.create(mockDatabaseEntityWithCloudDetails);
+        await service.create(mockDatabaseEntityWithCloudDetails, true);
         fail();
       } catch (e) {
         expect(e).toBeInstanceOf(DatabaseAlreadyExistsException);

redisinsight/api/src/modules/database/repositories/local.database.repository.ts

@@ -100,10 +100,12 @@ export class LocalDatabaseRepository extends DatabaseRepository {
   /**
    * Create database with encrypted sensitive fields
    * @param database
+   * @param uniqueCheck
    */
-  public async create(database: Database): Promise<Database> {
-    await this.checkUniqueness(database);
-
+  public async create(database: Database, uniqueCheck: boolean): Promise<Database> {
+    if (uniqueCheck) {
+      await this.checkUniqueness(database);
+    }
     const entity = classToClass(DatabaseEntity, await this.populateCertificates(database));
     return classToClass(
       Database,
@@ -248,7 +250,6 @@ export class LocalDatabaseRepository extends DatabaseRepository {
         set(query, field, get(entity, field));
       });
 
-
       const existingDatabase = await this.repository.findOneBy(query);
       if (existingDatabase) {
         throw new DatabaseAlreadyExistsException(existingDatabase.id);

redisinsight/api/src/modules/database/repositories/stack.databases.repository.ts

@@ -82,7 +82,7 @@ export class StackDatabasesRepository extends LocalDatabaseRepository implements
           verifyServerCert: false,
           connectionType: ConnectionType.STANDALONE,
           lastConnection: null,
-        });
+        }, false);
       }
       this.logger.log(`Succeed to set predefined database ${id}`);
     } catch (error) {