diff --git a/.env.example b/.env.example index c07586cfbe..453c0024ee 100644 --- a/.env.example +++ b/.env.example @@ -28,7 +28,6 @@ EA_ADDRESS_FACADE_URL=http://localhost:8009 CHARGING_MODULE_URL=http://localhost:8020 SERVICE_FOREGROUND_URL=http://localhost:8001 SERVICE_BACKGROUND_URL=http://localhost:8012 -REPORTING_URL=http://localhost:8011 IMPORT_URL=http://localhost:8007 TACTICAL_CRM_URL=http://localhost:8002 EXTERNAL_UI_URL=http://localhost:8000 diff --git a/app/lib/legacy-request.lib.js b/app/lib/legacy-request.lib.js index 4ad8ed3dce..1e030909f1 100644 --- a/app/lib/legacy-request.lib.js +++ b/app/lib/legacy-request.lib.js @@ -46,11 +46,6 @@ const services = { base: servicesConfig.permitRepository.url, api: 'API/1.0/' }, - // water-abstraction-reporting - reporting - reporting: { - base: servicesConfig.reporting.url, - api: 'reporting/1.0' - }, // water-abstraction-returns - returns returns: { base: servicesConfig.returns.url, diff --git a/app/services/health/info.service.js b/app/services/health/info.service.js index a262940ea0..c678213209 100644 --- a/app/services/health/info.service.js +++ b/app/services/health/info.service.js @@ -74,7 +74,6 @@ async function _getLegacyAppData () { { name: 'Returns', serviceName: 'returns' }, { name: 'Tactical CRM', serviceName: 'crm' }, { name: 'Tactical IDM', serviceName: 'idm' }, - { name: 'Reporting', serviceName: 'reporting' }, { name: 'Permit repository', serviceName: 'permits' } ] diff --git a/config/services.config.js b/config/services.config.js index 4485fab15f..7f321976c1 100644 --- a/config/services.config.js +++ b/config/services.config.js @@ -28,9 +28,6 @@ const config = { serviceBackground: { url: process.env.SERVICE_BACKGROUND_URL }, - reporting: { - url: process.env.REPORTING_URL - }, import: { url: process.env.IMPORT_URL }, diff --git a/test/services/health/info.service.test.js b/test/services/health/info.service.test.js index d5fc3c2211..7b224e5a6f 100644 --- a/test/services/health/info.service.test.js +++ b/test/services/health/info.service.test.js @@ -126,7 +126,7 @@ describe('Info service', () => { 'virusScannerData', 'redisConnectivityData', 'addressFacadeData', 'chargingModuleData', 'appData' ]) - expect(result.appData).to.have.length(11) + expect(result.appData).to.have.length(10) expect(result.appData[0].name).to.equal('Import') expect(result.appData[0].serviceName).to.equal('import') expect(result.appData[0].version).to.equal('9.0.99') @@ -189,7 +189,7 @@ describe('Info service', () => { expect(result).to.include([ 'virusScannerData', 'redisConnectivityData', 'addressFacadeData', 'chargingModuleData', 'appData' ]) - expect(result.appData).to.have.length(11) + expect(result.appData).to.have.length(10) expect(result.appData[0].version).to.equal('9.0.99') expect(result.appData[0].jobs).to.have.length(2) @@ -232,7 +232,7 @@ describe('Info service', () => { expect(result).to.include([ 'virusScannerData', 'redisConnectivityData', 'addressFacadeData', 'chargingModuleData', 'appData' ]) - expect(result.appData).to.have.length(11) + expect(result.appData).to.have.length(10) expect(result.appData[0].version).to.equal('9.0.99') expect(result.appData[0].jobs).to.have.length(2) @@ -259,7 +259,7 @@ describe('Info service', () => { expect(result).to.include([ 'virusScannerData', 'redisConnectivityData', 'addressFacadeData', 'chargingModuleData', 'appData' ]) - expect(result.appData).to.have.length(11) + expect(result.appData).to.have.length(10) expect(result.appData[0].version).to.equal('9.0.99') expect(result.appData[0].jobs).to.have.length(2) @@ -301,7 +301,7 @@ describe('Info service', () => { expect(result).to.include([ 'virusScannerData', 'redisConnectivityData', 'addressFacadeData', 'chargingModuleData', 'appData' ]) - expect(result.appData).to.have.length(11) + expect(result.appData).to.have.length(10) expect(result.appData[0].version).to.equal('9.0.99') expect(result.appData[0].jobs).to.have.length(0) @@ -321,7 +321,7 @@ describe('Info service', () => { expect(result).to.include([ 'virusScannerData', 'redisConnectivityData', 'addressFacadeData', 'chargingModuleData', 'appData' ]) - expect(result.appData).to.have.length(11) + expect(result.appData).to.have.length(10) expect(result.appData[0].version).to.equal('9.0.99') expect(result.appData[0].jobs).to.have.length(0) @@ -365,7 +365,7 @@ describe('Info service', () => { expect(result).to.include([ 'virusScannerData', 'redisConnectivityData', 'addressFacadeData', 'chargingModuleData', 'appData' ]) - expect(result.appData).to.have.length(11) + expect(result.appData).to.have.length(10) expect(result.appData[0].version).to.equal('9.0.99') expect(result.appData[0].jobs).to.have.length(2) @@ -392,7 +392,7 @@ describe('Info service', () => { expect(result).to.include([ 'virusScannerData', 'redisConnectivityData', 'addressFacadeData', 'chargingModuleData', 'appData' ]) - expect(result.appData).to.have.length(11) + expect(result.appData).to.have.length(10) expect(result.appData[0].version).to.equal('9.0.99') expect(result.appData[0].jobs).to.have.length(2)