FCRM-5389 map component hard coded urls replaced with configured ones

DEFRA · Nov 28, 2024 · 8c81ce1 · 8c81ce1
1 parent 4e41458
commit 8c81ce1
Show file tree

Hide file tree

Showing 9 changed files with 401 additions and 385 deletions.
diff --git a/client/js/defra-map/index.js b/client/js/defra-map/index.js
diff --git a/config/.env-example b/config/.env-example
@@ -26,7 +26,7 @@ placeApiUrl=http://dummyuri
 #AGOL
 agolClientId=TEST_AGOL_CLIENT_ID
 agolClientSecret=TEST_AGOL_CLIENT_SECRET
-agolServiceUrl=http://dummyAgolUrl
+agolServiceId=DUMMY_SERVICE_ID
 agolCustomerTeamEndPoint=/Flood_Map_for_Planning_Query_Service_NON_PRODUCTION/FeatureServer/0
 agolLocalAuthorityEndPoint=/Flood_Map_for_Planning_Query_Service_NON_PRODUCTION/FeatureServer/1
 agolIsEnglandEndPoint=/Flood_Map_for_Planning_Query_Service_NON_PRODUCTION/FeatureServer/2

diff --git a/config/index.js b/config/index.js
@@ -34,7 +34,9 @@ const config = {
   agol: {
     clientId: process.env.agolClientId,
     clientSecret: process.env.agolClientSecret,
-    serviceUrl: process.env.agolServiceUrl,
+    serviceId: process.env.agolServiceId,
+    serviceUrl: `https://services1.arcgis.com/${process.env.agolServiceId}/arcgis/rest/services`,
+    vectorTileUrl: `https://tiles.arcgis.com/tiles/${process.env.agolServiceId}/arcgis/rest/services`,
     customerTeamEndPoint: process.env.agolCustomerTeamEndPoint,
     localAuthorityEndPoint: process.env.agolLocalAuthorityEndPoint,
     isEnglandEndPoint: process.env.agolIsEnglandEndPoint,

diff --git a/config/schema.js b/config/schema.js
@@ -39,7 +39,9 @@ const schema = Joi.object({
   agol: {
     clientId: Joi.string().required(),
     clientSecret: Joi.string().required(),
+    serviceId: Joi.string().required(),
     serviceUrl: Joi.string().uri().required(),
+    vectorTileUrl: Joi.string().uri().required(),
     customerTeamEndPoint: Joi.string().required(),
     localAuthorityEndPoint: Joi.string().required(),
     isEnglandEndPoint: Joi.string().required(),

diff --git a/server/plugins/router.js b/server/plugins/router.js
@@ -1,5 +1,6 @@
 const routes = [].concat(
   require('../routes/defra-map'),
+  require('../routes/defra-map/map-config'),
   require('../routes/defra-map/styles'),
   require('../routes/home'),
   require('../routes/flood-zone-results'),

diff --git a/server/routes/defra-map/index.js b/server/routes/defra-map/index.js
@@ -1,4 +1,3 @@
-const { config } = require('../../../config')
 const { getEsriToken } = require('../../services/agol/getEsriToken')
 const { getOsToken } = require('../../services/os/getOsToken')
 
@@ -12,16 +11,6 @@ module.exports = [
         return h.view('map')
       }
     }
-  }, {
-    method: 'GET',
-    path: '/defra-map/config',
-    options: {
-      description: 'config values for the defra-map component',
-      handler: async (request, h) => {
-        const { defraMap } = config
-        return defraMap
-      }
-    }
   }, {
     method: 'GET',
     path: '/os-token',

diff --git a/server/routes/defra-map/map-config.js b/server/routes/defra-map/map-config.js
@@ -0,0 +1,18 @@
+const { config } = require('../../../config')
+const { defraMap: mapConfig } = config
+
+Object.assign(mapConfig, {
+  agolServiceUrl: config.agol.serviceUrl,
+  agolVectorTileUrl: config.agol.vectorTileUrl
+})
+
+module.exports = {
+  method: 'GET',
+  path: '/defra-map/config',
+  options: {
+    description: 'config values for the defra-map component',
+    handler: async (request, h) => {
+      return mapConfig
+    }
+  }
+}
diff --git a/test/config.js b/test/config.js
@@ -39,7 +39,9 @@ lab.experiment('Ensure config is correct', () => {
       agol: {
         clientId: 'TEST_AGOL_CLIENT_ID',
         clientSecret: 'TEST_AGOL_CLIENT_SECRET',
-        serviceUrl: 'http://dummyAgolUrl',
+        serviceId: 'DUMMY_SERVICE_ID',
+        serviceUrl: 'https://services1.arcgis.com/DUMMY_SERVICE_ID/arcgis/rest/services',
+        vectorTileUrl: 'https://tiles.arcgis.com/tiles/DUMMY_SERVICE_ID/arcgis/rest/services',
         customerTeamEndPoint: '/Flood_Map_for_Planning_Query_Service_NON_PRODUCTION/FeatureServer/0',
         localAuthorityEndPoint: '/Flood_Map_for_Planning_Query_Service_NON_PRODUCTION/FeatureServer/1',
         isEnglandEndPoint: '/Flood_Map_for_Planning_Query_Service_NON_PRODUCTION/FeatureServer/2',

diff --git a/test/services/agol.js b/test/services/agol.js
@@ -60,7 +60,7 @@ lab.experiment('agol.js', () => {
 
     // Test that the expected params get passed to queryFeatures
     const expectedParameters = {
-      url: 'http://dummyAgolUrl/endPoint1',
+      url: 'https://services1.arcgis.com/DUMMY_SERVICE_ID/arcgis/rest/services/endPoint1',
       geometry: undefined,
       geometryType: undefined,
       spatialRel: 'esriSpatialRelIntersects',
@@ -77,7 +77,7 @@ lab.experiment('agol.js', () => {
 
     // Test that the modified expected params get passed to queryFeatures
     Object.assign(expectedParameters, {
-      url: 'http://dummyAgolUrl/endPoint2',
+      url: 'https://services1.arcgis.com/DUMMY_SERVICE_ID/arcgis/rest/services/endPoint2',
       authentication: 'dummy_token_refreshed'
     })