chore: Update tests

Author: anth-volk

app/src/tests/adapters/ReportAdapter.test.ts

@@ -24,7 +24,9 @@ describe('ReportAdapter', () => {
 
       // Then
       expect(result).toEqual({
-        reportId: mockReportMetadata.id,
+        reportId: String(mockReportMetadata.id),
+        countryId: mockReportMetadata.country_id,
+        apiVersion: mockReportMetadata.api_version,
         simulationIds: [mockReportMetadata.simulation_1_id, mockReportMetadata.simulation_2_id],
         status: mockReportMetadata.status,
         output: mockReportOutput,
@@ -42,10 +44,12 @@ describe('ReportAdapter', () => {
 
       // Then
       expect(result).toEqual({
-        reportId: mockReportMetadataSingleSimulation.id,
+        reportId: String(mockReportMetadataSingleSimulation.id),
+        countryId: mockReportMetadataSingleSimulation.country_id,
+        apiVersion: mockReportMetadataSingleSimulation.api_version,
         simulationIds: [mockReportMetadataSingleSimulation.simulation_1_id],
         status: mockReportMetadataSingleSimulation.status,
-        output: mockReportMetadataSingleSimulation.output,
+        output: null,
         createdAt: mockReportMetadataSingleSimulation.created_at,
         updatedAt: mockReportMetadataSingleSimulation.updated_at,
       });
@@ -213,6 +217,7 @@ describe('ReportAdapter', () => {
 
       // Then
       expect(result).toEqual({
+        id: 2,
         status: expectedErrorStatus,
         output: expectedNullOutput,
       });

app/src/tests/fixtures/adapters/reportMocks.ts

@@ -15,7 +15,7 @@ export const mockReportOutput: ReportOutput = {
 };
 
 export const mockReport: Report = {
-  reportId: 'report-123',
+  reportId: '123',
   countryId: 'us',
   apiVersion: 'v1',
   simulationIds: ['sim-456', 'sim-789'],
@@ -26,7 +26,7 @@ export const mockReport: Report = {
 };
 
 export const mockPendingReport: Report = {
-  reportId: 'report-pending-001',
+  reportId: '1',
   countryId: 'us',
   apiVersion: 'v1',
   simulationIds: ['sim-111'],
@@ -37,7 +37,7 @@ export const mockPendingReport: Report = {
 };
 
 export const mockErrorReport: Report = {
-  reportId: 'report-error-002',
+  reportId: '2',
   countryId: 'us',
   apiVersion: 'v1',
   simulationIds: ['sim-222', 'sim-333'],

app/src/tests/unit/api/report.test.ts

@@ -40,10 +40,7 @@ describe('report API', () => {
           Accept: 'application/json',
         },
       });
-      expect(result).toEqual({
-        ...mockReportMetadata,
-        id: String(mockReportMetadata.id),
-      });
+      expect(result).toEqual(mockReportMetadata);
     });
 
     test('given API error then throws error', async () => {
@@ -68,7 +65,7 @@ describe('report API', () => {
       // Given
       const countryId = 'us';
       const payload = mockReportCreationPayload;
-      const mockApiResponse = { result: { id: 123 } };
+      const mockApiResponse = { result: mockReportMetadata };
       const mockResponse = {
         ok: true,
         json: vi.fn().mockResolvedValue(mockApiResponse),
@@ -84,7 +81,7 @@ describe('report API', () => {
         headers: { 'Content-Type': 'application/json' },
         body: JSON.stringify(payload),
       });
-      expect(result).toEqual({ result: { id: '123' } });
+      expect(result).toEqual(mockReportMetadata);
     });
 
     test('given API error then throws error', async () => {
@@ -118,17 +115,12 @@ describe('report API', () => {
       const result = await markReportCompleted(countryId, reportId, mockReport);
 
       // Then
-      expect(global.fetch).toHaveBeenCalledWith(`${BASE_URL}/${countryId}/report/${reportId}`, {
+      expect(global.fetch).toHaveBeenCalledWith(`${BASE_URL}/${countryId}/report`, {
         method: 'PATCH',
         headers: { 'Content-Type': 'application/json' },
         body: JSON.stringify(mockCompletedReportPayload),
       });
-      expect(result).toEqual({
-        result: {
-          ...mockReportMetadata,
-          id: String(mockReportMetadata.id),
-        },
-      });
+      expect(result).toEqual(mockReportMetadata);
     });
 
     test('given API error then throws error', async () => {
@@ -164,17 +156,12 @@ describe('report API', () => {
       const result = await markReportError(countryId, reportId, mockErrorReport);
 
       // Then
-      expect(global.fetch).toHaveBeenCalledWith(`${BASE_URL}/${countryId}/report/${reportId}`, {
+      expect(global.fetch).toHaveBeenCalledWith(`${BASE_URL}/${countryId}/report`, {
         method: 'PATCH',
         headers: { 'Content-Type': 'application/json' },
         body: JSON.stringify(mockErrorReportPayload),
       });
-      expect(result).toEqual({
-        result: {
-          ...mockReportMetadata,
-          id: String(mockReportMetadata.id),
-        },
-      });
+      expect(result).toEqual(mockReportMetadata);
     });
 
     test('given API error then throws error', async () => {