Removed references to old mot service from frontend (#1814)

dvsa · Nov 14, 2024 · 8a56db3 · 8a56db3
1 parent bd7d192
commit 8a56db3
Show file tree

Hide file tree

Showing 14 changed files with 3 additions and 68 deletions.
diff --git a/src/app/providers/app-config/__mocks__/app-config.mock.ts b/src/app/providers/app-config/__mocks__/app-config.mock.ts
@@ -11,7 +11,6 @@ export class AppConfigProviderMock {
     daysToCacheLogs: localEnvironmentMock.daysToCacheLogs,
     logoutClearsTestPersistence: localEnvironmentMock.logoutClearsTestPersistence,
     logsPostApiKey: localEnvironmentMock.logsPostApiKey,
-    taxMotApiKey: localEnvironmentMock.taxMotApiKey,
     logsApiUrl: localEnvironmentMock.logsApiUrl,
     logsAutoSendInterval: localEnvironmentMock.logsAutoSendInterval,
     authentication: {
@@ -59,9 +58,6 @@ export class AppConfigProviderMock {
     mot: {
       motHistoryUrl: localEnvironmentMock.mot.motHistoryUrl,
     },
-    vehicle: {
-      taxMotUrl: localEnvironmentMock.vehicle.taxMotUrl,
-    },
     refData: {
       testCentreUrl: localEnvironmentMock.refData.testCentreUrl,
     },

diff --git a/src/app/providers/app-config/__mocks__/environment-response.mock.ts b/src/app/providers/app-config/__mocks__/environment-response.mock.ts
@@ -30,9 +30,6 @@ export const environmentResponseMock = {
   mot: {
     motHistoryUrl: 'https://www.example.com/api/v1/mot/12345',
   },
-  vehicle: {
-    taxMotUrl: 'https://www.example.com/api/v1/vehicle/12345',
-  },
   refData: {
     testCentreUrl: 'some url',
   },

diff --git a/src/app/providers/app-config/__mocks__/environment.mock.ts b/src/app/providers/app-config/__mocks__/environment.mock.ts
@@ -85,9 +85,6 @@ export const localEnvironmentMock: LocalEnvironmentFile = {
   mot: {
     motHistoryUrl: null,
   },
-  vehicle: {
-    taxMotUrl: null,
-  },
   driver: {
     photographUrl: null,
     signatureUrl: null,

diff --git a/src/app/providers/app-config/app-config.model.ts b/src/app/providers/app-config/app-config.model.ts
@@ -12,7 +12,6 @@ export type AppConfig = {
   daysToCacheLogs: number;
   logoutClearsTestPersistence?: boolean;
   logsPostApiKey: string;
-  taxMotApiKey: string;
   logsApiUrl: string;
   logsAutoSendInterval: number;
   authentication: {
@@ -60,9 +59,6 @@ export type AppConfig = {
   mot: {
     motHistoryUrl: string;
   };
-  vehicle: {
-    taxMotUrl: string;
-  };
   refData: {
     testCentreUrl: string;
   };

diff --git a/src/app/providers/app-config/app-config.ts b/src/app/providers/app-config/app-config.ts
@@ -151,7 +151,6 @@ export class AppConfigProvider {
       },
       daysToCacheLogs: await this.getManagedConfigValueNumber('daysToCacheLogs'),
       logsPostApiKey: await this.getManagedConfigValueString('logsPostApiKey'),
-      taxMotApiKey: await this.getManagedConfigValueString('taxMotApiKey'),
       logsApiUrl: await this.getManagedConfigValueString('logsApiUrl'),
       logsAutoSendInterval: await this.getManagedConfigValueNumber('logsAutoSendInterval'),
       authentication: {
@@ -296,7 +295,6 @@ export class AppConfigProvider {
       },
       logoutClearsTestPersistence: data.logoutClearsTestPersistence,
       logsPostApiKey: data.logsPostApiKey,
-      taxMotApiKey: data.taxMotApiKey,
       logsApiUrl: data.logsApiUrl,
       logsAutoSendInterval: data.logsAutoSendInterval,
       authentication: {
@@ -351,9 +349,6 @@ export class AppConfigProvider {
         photographUrl: data.driver.photographUrl,
         standardUrl: data.driver.standardUrl,
       },
-      vehicle: {
-        taxMotUrl: data.vehicle.taxMotUrl,
-      },
       mot: {
         motHistoryUrl: data.mot.motHistoryUrl,
       },

diff --git a/src/app/providers/mot-history-api/__tests__/mot-history-api.service.spec.ts b/src/app/providers/mot-history-api/__tests__/mot-history-api.service.spec.ts
@@ -1,4 +1,4 @@
-import { HttpHeaders, HttpResponse } from '@angular/common/http';
+import { HttpResponse } from '@angular/common/http';
 import { HttpClientTestingModule } from '@angular/common/http/testing';
 import { TestBed } from '@angular/core/testing';
 import { PracticeModeMOTType } from '@pages/waiting-room-to-car/components/mot-components/practice-mode-mot-modal/practice-mode-mot-modal.component';
@@ -296,14 +296,6 @@ describe('MotHistoryApiService', () => {
     });
   });
 
-  describe('getRequestHeaders', () => {
-    it('should return a header with the correct key', () => {
-      spyOn(vehicleDetailsService['urlProvider'], 'getTaxMotApiKey').and.returnValue('test-key');
-      const result = vehicleDetailsService['getRequestHeaders']();
-      expect(result.get('x-api-key')).toBe('test-key');
-    });
-  });
-
   describe('getVehicleByIdentifier', () => {
     it('should return cached vehicle details if vehicle is cached', (done) => {
       spyOn(vehicleDetailsService, 'isResultCached').and.returnValue(true);
@@ -323,7 +315,6 @@ describe('MotHistoryApiService', () => {
 
     it('should fetch vehicle details from API if vehicle is not cached', (done) => {
       spyOn(vehicleDetailsService, 'isResultCached').and.returnValue(false);
-      spyOn(vehicleDetailsService, 'getRequestHeaders').and.returnValue(new HttpHeaders());
       spyOn(vehicleDetailsService['http'], 'get').and.returnValue(
         of(
           new HttpResponse<MotHistory>({
@@ -345,7 +336,6 @@ describe('MotHistoryApiService', () => {
 
     it('should handle API error and return default error response', (done) => {
       spyOn(vehicleDetailsService, 'isResultCached').and.returnValue(false);
-      spyOn(vehicleDetailsService, 'getRequestHeaders').and.returnValue(new HttpHeaders());
       spyOn(vehicleDetailsService['http'], 'get').and.returnValue(throwError({ status: 500 }));
       spyOn(vehicleDetailsService, 'handleError').and.returnValue(
         of({

diff --git a/src/app/providers/mot-history-api/mot-history-api.service.ts b/src/app/providers/mot-history-api/mot-history-api.service.ts
@@ -1,4 +1,4 @@
-import { HttpClient, HttpHeaders, HttpResponse } from '@angular/common/http';
+import { HttpClient, HttpResponse } from '@angular/common/http';
 import { Injectable } from '@angular/core';
 import { PracticeModeMOTType } from '@pages/waiting-room-to-car/components/mot-components/practice-mode-mot-modal/practice-mode-mot-modal.component';
 import { AppConfigProvider } from '@providers/app-config/app-config';
@@ -75,10 +75,7 @@ export class MotHistoryApiService {
     if (this.isResultCached(vehicleRegistration)) {
       return this.getCachedMotHistory();
     }
-
-    const headers = this.getRequestHeaders();
-
-    return this.http.get(this.urlProvider.getMotUrl(vehicleRegistration), { observe: 'response', headers }).pipe(
+    return this.http.get(this.urlProvider.getMotUrl(vehicleRegistration), { observe: 'response' }).pipe(
       tap((response: HttpResponse<MotHistory>) => this.cacheMotHistory(response)),
       map((value): MotHistoryWithStatus => this.mapResponseToMotData(value)),
       timeout(this.appConfig.getAppConfig().requestTimeout),
@@ -105,15 +102,6 @@ export class MotHistoryApiService {
     return of({ status: 'Already Saved', data: this.motHistoryResponse });
   }
 
-  /**
-   * Generates the HTTP headers required for the API request.
-   *
-   * @returns {HttpHeaders} The HTTP headers with the API key set.
-   */
-  getRequestHeaders(): HttpHeaders {
-    return new HttpHeaders().set('x-api-key', this.urlProvider.getTaxMotApiKey());
-  }
-
   /**
    * Caches the vehicle details.
    *

diff --git a/src/app/providers/url/__mocks__/url.mock.ts b/src/app/providers/url/__mocks__/url.mock.ts
@@ -36,8 +36,6 @@ export class UrlProviderMock {
     .createSpy('getCandidateStandardDataUrl')
     .and.returnValue('https://www.example.com/standard');
 
-  getTaxMotApiKey = jasmine.createSpy().and.returnValue('x-api-key');
-
   getRefDataTestCentreUrl = jasmine.createSpy('getRefDataTestCentreUrl').and.returnValue('https://ref-data/testcentre');
 
   getDelegatedExaminerSearchBookingUrl = jasmine

diff --git a/src/app/providers/url/__tests__/url.spec.ts b/src/app/providers/url/__tests__/url.spec.ts
@@ -42,12 +42,6 @@ describe('UrlProvider', () => {
       expect(urlProvider.getLogsServiceApiKey()).toBe('key');
     });
   });
-  describe('getTaxMotApiKey', () => {
-    it('should get taxMotApiKey', () => {
-      spyOn(urlProvider.appConfigProvider, 'getAppConfig').and.returnValue({ taxMotApiKey: 'key' } as AppConfig);
-      expect(urlProvider.getTaxMotApiKey()).toBe('key');
-    });
-  });
   describe('getMotUrl', () => {
     it('should get Mot Url', () => {
       spyOn(urlProvider.appConfigProvider, 'getAppConfig').and.returnValue({

diff --git a/src/app/providers/url/url.ts b/src/app/providers/url/url.ts
@@ -30,10 +30,6 @@ export class UrlProvider {
     return this.appConfigProvider.getAppConfig()?.tests.multipleTestResultsUrl;
   }
 
-  getTaxMotApiKey(): string {
-    return this.appConfigProvider.getAppConfig()?.taxMotApiKey;
-  }
-
   getMotUrl(vehicleRegistration: string): string {
     const urlTemplate = this.appConfigProvider.getAppConfig()?.mot.motHistoryUrl;
     return urlTemplate.replace('{vrn}', vehicleRegistration);

diff --git a/src/environments/environment.dev.ts b/src/environments/environment.dev.ts
@@ -12,7 +12,6 @@ export const environment: EnvironmentFile = {
   enableDevTools: false,
   logoutClearsTestPersistence: true,
   logsPostApiKey: '',
-  taxMotApiKey: '7d804a0461126d0ebee4128af69bb8dc',
   logsApiUrl: 'https://dev.mes.dev-dvsacloud.uk/v1/logs',
   logsAutoSendInterval: 60000,
   authentication: {

diff --git a/src/environments/environment.local.ts b/src/environments/environment.local.ts
@@ -263,12 +263,6 @@ export const environment: LocalEnvironmentFile = {
     photographUrl: 'https://dev.mes.dev-dvsacloud.uk/v1/driver/photograph/{drivingLicenceNumber}',
     standardUrl: 'https://dev.mes.dev-dvsacloud.uk/v1/driver/standard',
   },
-  vehicle: {
-    taxMotUrl: 'https://api.mot.test.smc.dvsacloud.uk/1.0/checkMot',
-  },
-  mot: {
-    motHistoryUrl: 'https://dev.mes.dev-dvsacloud.uk/v1/mot-history/{vrn}',
-  },
   refData: {
     testCentreUrl: '/assets/mock/ref-data/local-test-centres.json',
   },

diff --git a/src/environments/environment.testing.ts b/src/environments/environment.testing.ts
@@ -13,7 +13,6 @@ export const environment: TestersEnvironmentFile = {
   enableDevTools: false,
   logoutClearsTestPersistence: true,
   logsPostApiKey: '',
-  taxMotApiKey: '',
   logsApiUrl: 'https://dev.mes.dev-dvsacloud.uk/v1/logs',
   logsAutoSendInterval: 6000,
   authentication: {

diff --git a/src/store/app-config/app-config.reducer.ts b/src/store/app-config/app-config.reducer.ts
@@ -13,7 +13,6 @@ export const initialState: AppConfig = {
   daysToCacheLogs: null,
   logoutClearsTestPersistence: null,
   logsPostApiKey: null,
-  taxMotApiKey: null,
   logsApiUrl: null,
   logsAutoSendInterval: null,
   authentication: {
@@ -61,9 +60,6 @@ export const initialState: AppConfig = {
   mot: {
     motHistoryUrl: null,
   },
-  vehicle: {
-    taxMotUrl: null,
-  },
   refData: {
     testCentreUrl: null,
   },