fix: align with main

src/couchdb/couch-db-client.service.ts

@@ -4,7 +4,7 @@ import { HttpService } from '@nestjs/axios';
 import { AxiosHeaders } from 'axios';
 import { CouchDbChangesResponse } from './dtos';
 
-@Injectable({})
+@Injectable()
 export class CouchDbClient {
   private readonly logger = new Logger(CouchDbClient.name);
 

src/report/core/sqs-report-calculator.service.spec.ts

@@ -1,12 +1,21 @@
 import { Test, TestingModule } from '@nestjs/testing';
 import { SqsReportCalculator } from './sqs-report-calculator.service';
+import { DefaultReportStorage } from '../storage/report-storage.service';
+import { CouchSqsClient } from '../../couchdb/couch-sqs.client';
 
 describe('SqsReportCalculatorService', () => {
   let service: SqsReportCalculator;
 
+  let mockCouchSqsClient: { executeQuery: jest.Mock };
+  let mockReportStorage: { fetchAllReports: jest.Mock };
+
   beforeEach(async () => {
     const module: TestingModule = await Test.createTestingModule({
-      providers: [SqsReportCalculator],
+      providers: [
+        SqsReportCalculator,
+        { provide: CouchSqsClient, useValue: mockCouchSqsClient },
+        { provide: DefaultReportStorage, useValue: mockReportStorage },
+      ],
     }).compile();
 
     service = module.get<SqsReportCalculator>(SqsReportCalculator);

src/report/core/sqs-report-calculator.service.ts

@@ -1,6 +1,7 @@
 import {
   BadRequestException,
   Injectable,
+  InternalServerErrorException,
   NotFoundException,
 } from '@nestjs/common';
 import { ReportCalculator } from './report-calculator';
@@ -31,7 +32,7 @@ export class SqsReportCalculator implements ReportCalculator {
         }
 
         if (report.queries.length === 0) {
-          throw new BadRequestException();
+          throw new InternalServerErrorException();
         }
 
         return report.queries.flatMap((query) => {

src/report/tasks/report-calculation-processor.service.spec.ts

@@ -1,36 +1,21 @@
 import { Test, TestingModule } from '@nestjs/testing';
 import { ReportCalculationProcessor } from './report-calculation-processor.service';
 import { DefaultReportStorage } from '../storage/report-storage.service';
-import { HttpModule } from '@nestjs/axios';
-import { CouchDbClient } from '../../couchdb/couch-db-client.service';
-import { ReportCalculationTask } from './report-calculation-task.service';
 import { SqsReportCalculator } from '../core/sqs-report-calculator.service';
-import { ReportRepository } from '../repository/report-repository.service';
-import { ReportCalculationRepository } from '../repository/report-calculation-repository.service';
-import { ConfigService } from '@nestjs/config';
 
 describe('ReportCalculationProcessorService', () => {
   let service: ReportCalculationProcessor;
 
+  let mockReportStorage: { fetchAllReports: jest.Mock };
+  let mockSqsReportCalculator: { calculate: jest.Mock };
+
   beforeEach(async () => {
     const module: TestingModule = await Test.createTestingModule({
-      imports: [HttpModule],
+      imports: [],
       providers: [
-        CouchDbClient,
-        ReportCalculationTask,
-        DefaultReportStorage,
         ReportCalculationProcessor,
-        SqsReportCalculator,
-        ReportRepository,
-        ReportCalculationRepository,
-        {
-          provide: ConfigService,
-          useValue: {
-            getOrThrow: jest.fn((key) => {
-              return 'foo';
-            }),
-          },
-        },
+        { provide: DefaultReportStorage, useValue: mockReportStorage },
+        { provide: SqsReportCalculator, useValue: mockSqsReportCalculator },
       ],
     }).compile();
 

src/report/tasks/report-calculation-task.service.spec.ts

@@ -1,35 +1,26 @@
 import { Test, TestingModule } from '@nestjs/testing';
 import { ReportCalculationTask } from './report-calculation-task.service';
 import { ReportCalculationProcessor } from './report-calculation-processor.service';
-import { SqsReportCalculator } from '../core/sqs-report-calculator.service';
-import { DefaultReportStorage } from '../storage/report-storage.service';
-import { ConfigService } from '@nestjs/config';
-import { ReportRepository } from '../repository/report-repository.service';
-import { ReportCalculationRepository } from '../repository/report-calculation-repository.service';
-import { HttpModule } from '@nestjs/axios';
-import { CouchDbClient } from '../../couchdb/couch-db-client.service';
 
 describe('ReportCalculationTaskService', () => {
   let service: ReportCalculationTask;
 
+  let mockReportCalculationProcessor: {
+    processNextPendingCalculation: jest.Mock;
+  };
+
   beforeEach(async () => {
+    mockReportCalculationProcessor = {
+      processNextPendingCalculation: jest.fn(),
+    };
+
     const module: TestingModule = await Test.createTestingModule({
-      imports: [HttpModule],
+      imports: [],
       providers: [
-        CouchDbClient,
         ReportCalculationTask,
-        DefaultReportStorage,
-        ReportCalculationProcessor,
-        SqsReportCalculator,
-        ReportRepository,
-        ReportCalculationRepository,
         {
-          provide: ConfigService,
-          useValue: {
-            getOrThrow: jest.fn((key) => {
-              return 'foo';
-            }),
-          },
+          provide: ReportCalculationProcessor,
+          useValue: mockReportCalculationProcessor,
         },
       ],
     }).compile();