test: Fix tests

package.json

@@ -68,6 +68,7 @@
     "@map-colonies/openapi-helpers": "^2.0.0",
     "@map-colonies/prettier-config": "0.0.1",
     "@map-colonies/tsconfig": "^1.0.1",
+    "@faker-js/faker": "^10.4.0",
     "@redocly/cli": "^1.34.0",
     "@swc/core": "^1.15.11",
     "@swc/jest": "^0.2.37",
@@ -85,6 +86,7 @@
     "docker-compose": "^1.3.1",
     "eslint": "^9.23.0",
     "eslint-plugin-jest": "^28.11.0",
+    "geojson": "^0.5.0",
     "husky": "^9.1.7",
     "jest": "^29.7.0",
     "jest-html-reporters": "^3.1.4",

src/records/models/recordsManager.ts

@@ -172,7 +172,7 @@ export class RecordsManager {
     }
   }
 
-  private getPolygonByPointAndRadius(coordinates: [number, number], radiusInMeters = 1): BBox {
+  private getPolygonByPointAndRadius(coordinates: [number, number], radiusInMeters: number): BBox {
     const tPoint = point(coordinates);
     const circ = circle(tPoint, radiusInMeters, { units: 'meters' });
     const bb = bbox(circ) as [number, number, number, number];

tests/configurations/integration/jest.config.js

@@ -18,15 +18,7 @@ module.exports = {
   testMatch: ['<rootDir>/tests/integration/**/*.spec.ts'],
 
   collectCoverage: true,
-  collectCoverageFrom: [
-    '<rootDir>/src/**/*.ts',
-    '!*/node_modules/',
-    '!/vendor/**',
-    '!*/common/**',
-    '!**/models/**',
-    '!<rootDir>/src/*',
-    '!<rootDir>/src/externalServices/catalog/cswClient.ts',
-  ],
+  collectCoverageFrom: ['<rootDir>/src/**/*.ts', '!*/node_modules/', '!/vendor/**', '!*/common/**', '!**/models/**', '!<rootDir>/src/*'],
 
   coverageReporters: ['text', 'html'],
   coverageDirectory: '<rootDir>/coverage/integration',

tests/configurations/unit/jest.config.js

@@ -6,7 +6,7 @@ module.exports = {
     '^.+\\.(ts|js)$': ['@swc/jest'],
   },
   transformIgnorePatterns: [
-    '/node_modules/(?!(@map-colonies/mc-model-types|concaveman|@turf/convex|@turf/turf|@turf/clusters-dbscan|geokdbush|kdbush|tinyqueue|rbush|quickselect|robust-predicates)/)',
+    '/node_modules/(?!(@map-colonies/mc-model-types|concaveman|@faker-js/faker|@turf/convex|@turf/turf|@turf/clusters-dbscan|geokdbush|kdbush|tinyqueue|rbush|quickselect|robust-predicates)/)',
   ],
   moduleNameMapper: pathsToModuleNameMapper(tsconfigJson.compilerOptions.paths, {
     prefix: '<rootDir>/',
@@ -22,7 +22,6 @@ module.exports = {
     '!**/controllers/**',
     '!**/routes/**',
     '!<rootDir>/src/*',
-    '!<rootDir>/src/externalServices/catalog/cswClient.ts',
   ],
   coverageDirectory: '<rootDir>/coverage/unit',
   reporters: [
@@ -43,10 +42,10 @@ module.exports = {
   extensionsToTreatAsEsm: ['.ts'],
   coverageThreshold: {
     global: {
-      branches: 66,
+      branches: 80,
       functions: 80,
       lines: 80,
-      statements: -30,
+      statements: -10,
     },
   },
 };

tests/integration/audit/audit.spec.ts

@@ -1,39 +1,42 @@
+import jsLogger from '@map-colonies/js-logger';
+import { trace } from '@opentelemetry/api';
 import httpStatusCodes from 'http-status-codes';
-import axios from 'axios';
+import mockAxios from 'jest-mock-axios';
 import { container as tsyringeContainer } from 'tsyringe';
 import { createRequestSender, RequestSender } from '@map-colonies/openapi-helpers/requestSender';
 import { paths, operations } from '@openapi';
 import { getApp } from '@src/app';
+import { CatalogCall } from '@src/externalServices/catalog/catalogCall';
 import { SERVICES } from '@common/constants';
 import { initConfig } from '@src/common/config';
 import { ConnectionManager } from '@src/DAL/connectionManager';
 import { IAuditAction } from '@src/common/interfaces';
 import { AuditManager } from '@src/audit_logs/models/auditManager';
 import { validCredentials, recordInstance } from '@tests/mocks/generalMocks';
 import { getAxiosPostMockResponse } from '@tests/mocks/integrationMocks';
-
-jest.mock('axios');
-
-const mockedAxios = axios as jest.Mocked<typeof axios>;
-
-jest.mock('@src/externalServices/catalog/catalogCall', () => ({
-  // eslint-disable-next-line @typescript-eslint/naming-convention
-  CatalogCall: jest.fn().mockImplementation(() => ({
-    findPublishedRecord: jest.fn().mockResolvedValue(true),
-  })),
-}));
+// ensure modules that import 'axios' get the jest-mock-axios instance
+// eslint-disable-next-line @typescript-eslint/no-unsafe-return, @typescript-eslint/no-require-imports, @typescript-eslint/no-unsafe-member-access
+jest.mock('axios', () => require('@tests/mocks/axios').default);
 
 describe('records', function () {
   let requestSender: RequestSender<paths, operations>;
 
   beforeAll(async () => {
-    mockedAxios.post.mockResolvedValue(getAxiosPostMockResponse());
+    mockAxios.post.mockResolvedValue(getAxiosPostMockResponse());
+    // prevent real network calls to catalog service during tests
+    jest.spyOn(CatalogCall.prototype, 'findPublishedRecord').mockResolvedValue(true);
 
     await initConfig(true);
 
     console.log('✅ ConnectionManager DataSource initialized.');
 
-    const [app] = await getApp({ useChild: false });
+    const [app] = await getApp({
+      useChild: false,
+      override: [
+        { token: SERVICES.LOGGER, provider: { useValue: jsLogger({ enabled: false }) } },
+        { token: SERVICES.TRACER, provider: { useValue: trace.getTracer('testTracer') } },
+      ],
+    });
 
     requestSender = await createRequestSender('openapi3.yaml', app);
   });
@@ -147,7 +150,7 @@ describe('records', function () {
         authorizedAt: new Date().toISOString(),
       };
 
-      jest.spyOn(AuditManager.prototype, 'getAuditLogs').mockResolvedValueOnce({
+      const getAuditLogsSpy = jest.spyOn(AuditManager.prototype, 'getAuditLogs').mockResolvedValueOnce({
         numberOfRecords: 50,
         numberOfRecordsReturned: 10,
         nextRecord: 11,
@@ -170,7 +173,6 @@ describe('records', function () {
       expect(body.numberOfRecordsReturned).toBe(10);
       expect(body.nextRecord).toBe(11);
       expect(Array.isArray(body.records)).toBe(true);
-      const getAuditLogsSpy = jest.spyOn(AuditManager.prototype, 'getAuditLogs');
       expect(getAuditLogsSpy).toHaveBeenCalledWith('rec_pagination_test', 1, 10);
     });
   });

tests/integration/externalServices/catalog/catalog.spec.ts

@@ -1,29 +1,30 @@
-import axios from 'axios';
+import { trace } from '@opentelemetry/api';
+import mockAxios from 'jest-mock-axios';
 import { StatusCodes } from 'http-status-codes';
 import { RecordStatus } from '@map-colonies/mc-model-types';
 import type { IConfig } from '@src/common/interfaces';
 import { CatalogCall } from '@src/externalServices/catalog/catalogCall';
 import { AppError } from '@src/utils/appError';
-import { createTracerMock, createLoggerMock } from '@tests/mocks/integrationMocks';
+import { createLoggerMock } from '@tests/mocks/integrationMocks';
 
-jest.mock('axios');
-const mockedAxios = axios as jest.Mocked<typeof axios>;
+// ensure modules that import 'axios' get the jest-mock-axios instance
+// eslint-disable-next-line @typescript-eslint/no-unsafe-return, @typescript-eslint/no-require-imports, @typescript-eslint/no-unsafe-member-access
+jest.mock('axios', () => require('@tests/mocks/axios').default);
 
 describe('CatalogCall Integration (axios mocked)', () => {
   let catalogCall: CatalogCall;
   const loggerMock = createLoggerMock();
-  const tracerMock = createTracerMock();
   const configMock = {
     get: jest.fn().mockReturnValue('http://mock-catalog-service'),
   } as unknown as jest.Mocked<IConfig>;
 
   beforeEach(() => {
     jest.clearAllMocks();
-    catalogCall = new CatalogCall(configMock, loggerMock, tracerMock);
+    catalogCall = new CatalogCall(configMock, loggerMock, trace.getTracer('testTracer'));
   });
 
   it('should throw AppError for axios rejection', async () => {
-    mockedAxios.post.mockRejectedValueOnce(new Error('Network error'));
+    mockAxios.post.mockRejectedValueOnce(new Error('Network error'));
 
     await expect(catalogCall.findPublishedRecord('rec_fail')).rejects.toThrow(AppError);
 
@@ -33,7 +34,7 @@ describe('CatalogCall Integration (axios mocked)', () => {
   });
 
   it('should throw AppError for unexpected status', async () => {
-    mockedAxios.post.mockResolvedValueOnce({
+    mockAxios.post.mockResolvedValueOnce({
       status: StatusCodes.BAD_REQUEST,
       data: [],
     });
@@ -46,7 +47,7 @@ describe('CatalogCall Integration (axios mocked)', () => {
   });
 
   it('should return false when record exists but not published', async () => {
-    mockedAxios.post.mockResolvedValueOnce({
+    mockAxios.post.mockResolvedValueOnce({
       status: StatusCodes.OK,
       data: [{ id: '123', name: 'rec_unpublished', productStatus: 'draft' }],
     });
@@ -60,7 +61,7 @@ describe('CatalogCall Integration (axios mocked)', () => {
   });
 
   it('should return true when record exists and is published', async () => {
-    mockedAxios.post.mockResolvedValueOnce({
+    mockAxios.post.mockResolvedValueOnce({
       status: StatusCodes.OK,
       data: [{ id: '123', name: 'rec_published', productStatus: RecordStatus.PUBLISHED }],
     });
@@ -74,7 +75,7 @@ describe('CatalogCall Integration (axios mocked)', () => {
   });
 
   it('should return false when no records are found', async () => {
-    mockedAxios.post.mockResolvedValueOnce({
+    mockAxios.post.mockResolvedValueOnce({
       status: StatusCodes.OK,
       data: [],
     });