fix tests repo

Author: ArtemHoruzhenko

redisinsight/api/src/__mocks__/common.ts

@@ -9,6 +9,7 @@ export type MockType<T> = {
 
 export const mockQueryBuilderWhere = jest.fn().mockReturnThis();
 export const mockQueryBuilderSelect = jest.fn().mockReturnThis();
+export const mockQueryBuilderLeftJoinAndSelect = jest.fn().mockReturnThis();
 export const mockQueryBuilderGetOne = jest.fn();
 export const mockQueryBuilderGetMany = jest.fn();
 export const mockQueryBuilderGetManyRaw = jest.fn();
@@ -26,7 +27,7 @@ export const mockCreateQueryBuilder = jest.fn(() => ({
   having: jest.fn().mockReturnThis(),
   limit: jest.fn().mockReturnThis(),
   leftJoin: jest.fn().mockReturnThis(),
-  leftJoinAndSelect: jest.fn().mockReturnThis(),
+  leftJoinAndSelect: mockQueryBuilderLeftJoinAndSelect,
   offset: jest.fn().mockReturnThis(),
   delete: jest.fn().mockReturnThis(),
   whereInIds: jest.fn().mockReturnThis(),

redisinsight/api/src/__mocks__/databases.ts

@@ -251,12 +251,6 @@ export const mockDatabaseRepository = jest.fn(() => ({
     pick(mockDatabase, 'id', 'name'),
     pick(mockDatabase, 'id', 'name'),
   ]),
-  createQueryBuilder: jest.fn().mockReturnThis(),
-  leftJoinAndSelect: jest.fn().mockReturnThis(),
-  where: jest.fn().mockReturnThis(),
-  select: jest.fn().mockReturnThis(),
-  getMany: jest.fn().mockResolvedValue([]),
-  findOneBy: jest.fn().mockResolvedValue(mockDatabase),
 }));
 
 export const mockDatabaseService = jest.fn(() => ({

redisinsight/api/src/modules/certificate/repositories/local.ca-certificate.repository.spec.ts

@@ -6,7 +6,6 @@ import { Repository } from 'typeorm';
 import {
   mockCaCertificate, mockCaCertificateCertificateEncrypted, mockCaCertificateCertificatePlain, mockCaCertificateEntity,
   mockCaCertificateId,
-  mockDatabaseRepository,
   mockEncryptionService,
   mockRepository,
   MockType,
@@ -22,6 +21,7 @@ describe('LocalCaCertificateRepository', () => {
   let service: LocalCaCertificateRepository;
   let encryptionService: MockType<EncryptionService>;
   let repository: MockType<Repository<CaCertificateEntity>>;
+  let databaseRepository: MockType<Repository<DatabaseEntity>>;
 
   beforeEach(async () => {
     jest.clearAllMocks();
@@ -35,7 +35,7 @@ describe('LocalCaCertificateRepository', () => {
         },
         {
           provide: getRepositoryToken(DatabaseEntity),
-          useFactory: mockDatabaseRepository,
+          useFactory: mockRepository,
         },
         {
           provide: EncryptionService,
@@ -45,6 +45,7 @@ describe('LocalCaCertificateRepository', () => {
     }).compile();
 
     repository = await module.get(getRepositoryToken(CaCertificateEntity));
+    databaseRepository = await module.get(getRepositoryToken(DatabaseEntity));
     encryptionService = await module.get(EncryptionService);
     service = await module.get(LocalCaCertificateRepository);
 
@@ -113,15 +114,7 @@ describe('LocalCaCertificateRepository', () => {
 
       // Mock findOneBy to return a certificate
       repository.findOneBy.mockResolvedValue(mockCaCertificate);
-
-      // Mock getMany to return affected databases
-      const mockQueryBuilder = {
-        leftJoinAndSelect: jest.fn().mockReturnThis(),
-        where: jest.fn().mockReturnThis(),
-        select: jest.fn().mockReturnThis(),
-        getMany: jest.fn().mockResolvedValue(mockAffectedDatabases.map((id) => ({ id }))),
-      };
-      jest.spyOn(service['databaseRepository'], 'createQueryBuilder').mockReturnValue(mockQueryBuilder as any);
+      databaseRepository.createQueryBuilder().getMany.mockResolvedValue(mockAffectedDatabases.map((id) => ({ id })));
 
       // Mock delete operation
       repository.delete.mockResolvedValue(undefined);
@@ -130,10 +123,10 @@ describe('LocalCaCertificateRepository', () => {
 
       expect(result).toEqual({ affectedDatabases: mockAffectedDatabases });
       expect(repository.findOneBy).toHaveBeenCalledWith({ id: mockId });
-      expect(service['databaseRepository'].createQueryBuilder).toHaveBeenCalledWith('d');
-      expect(mockQueryBuilder.leftJoinAndSelect).toHaveBeenCalledWith('d.caCert', 'c');
-      expect(mockQueryBuilder.where).toHaveBeenCalledWith({ caCert: mockId });
-      expect(mockQueryBuilder.select).toHaveBeenCalledWith(['d.id']);
+      expect(databaseRepository.createQueryBuilder).toHaveBeenCalledWith('d');
+      expect(databaseRepository.createQueryBuilder().leftJoinAndSelect).toHaveBeenCalledWith('d.caCert', 'c');
+      expect(databaseRepository.createQueryBuilder().where).toHaveBeenCalledWith({ caCert: mockId });
+      expect(databaseRepository.createQueryBuilder().select).toHaveBeenCalledWith(['d.id']);
       expect(repository.delete).toHaveBeenCalledWith(mockId);
     });
 

redisinsight/api/src/modules/certificate/repositories/local.client-certificate.repository.spec.ts

@@ -11,7 +11,6 @@ import {
   mockClientCertificateId,
   mockClientCertificateKeyEncrypted,
   mockClientCertificateKeyPlain,
-  mockDatabaseRepository,
   mockEncryptionService,
   mockRepository,
   MockType,
@@ -29,6 +28,7 @@ describe('LocalClientCertificateRepository', () => {
   let service: LocalClientCertificateRepository;
   let encryptionService: MockType<EncryptionService>;
   let repository: MockType<Repository<ClientCertificateEntity>>;
+  let databaseRepository: MockType<Repository<DatabaseEntity>>;
 
   beforeEach(async () => {
     jest.clearAllMocks();
@@ -42,7 +42,7 @@ describe('LocalClientCertificateRepository', () => {
         },
         {
           provide: getRepositoryToken(DatabaseEntity),
-          useFactory: mockDatabaseRepository,
+          useFactory: mockRepository,
         },
         {
           provide: EncryptionService,
@@ -52,6 +52,7 @@ describe('LocalClientCertificateRepository', () => {
     }).compile();
 
     repository = await module.get(getRepositoryToken(ClientCertificateEntity));
+    databaseRepository = await module.get(getRepositoryToken(DatabaseEntity));
     encryptionService = await module.get(EncryptionService);
     service = await module.get(LocalClientCertificateRepository);
 
@@ -133,13 +134,7 @@ describe('LocalClientCertificateRepository', () => {
     it('should delete client certificate and return affected databases', async () => {
       jest.spyOn(repository, 'findOneBy').mockResolvedValue(mockClientCertificate);
 
-      const mockQueryBuilder = {
-        leftJoinAndSelect: jest.fn().mockReturnThis(),
-        where: jest.fn().mockReturnThis(),
-        select: jest.fn().mockReturnThis(),
-        getMany: jest.fn().mockResolvedValue(mockAffectedDatabases.map((id) => ({ id })))
-      };
-      jest.spyOn(service['databaseRepository'], 'createQueryBuilder').mockReturnValue(mockQueryBuilder as any);
+      databaseRepository.createQueryBuilder().getMany.mockResolvedValue(mockAffectedDatabases.map((id) => ({ id })));
 
       jest.spyOn(repository, 'delete').mockResolvedValue(undefined);
 
@@ -148,9 +143,9 @@ describe('LocalClientCertificateRepository', () => {
       expect(result).toEqual({ affectedDatabases: mockAffectedDatabases });
       expect(repository.findOneBy).toHaveBeenCalledWith({ id: mockId });
       expect(service['databaseRepository'].createQueryBuilder).toHaveBeenCalledWith('d');
-      expect(mockQueryBuilder.leftJoinAndSelect).toHaveBeenCalledWith('d.clientCert', 'c');
-      expect(mockQueryBuilder.where).toHaveBeenCalledWith({ clientCert: mockId });
-      expect(mockQueryBuilder.select).toHaveBeenCalledWith(['d.id']);
+      expect(databaseRepository.createQueryBuilder().leftJoinAndSelect).toHaveBeenCalledWith('d.clientCert', 'c');
+      expect(databaseRepository.createQueryBuilder().where).toHaveBeenCalledWith({ clientCert: mockId });
+      expect(databaseRepository.createQueryBuilder().select).toHaveBeenCalledWith(['d.id']);
       expect(repository.delete).toHaveBeenCalledWith(mockId);
     });