Merge pull request #6801 from uktrade/bugfix/TET-733-investments

Allow for parameters for metadata API calls
uktrade · May 23, 2024 · 8a35821 · 8a35821
2 parents 93f070b + e766a11
commit 8a35821
Show file tree

Hide file tree

Showing 4 changed files with 30 additions and 20 deletions.
diff --git a/src/client/components/Form/elements/FieldInput/index.jsx b/src/client/components/Form/elements/FieldInput/index.jsx
@@ -121,7 +121,7 @@ FieldInput.propTypes = {
   /**
    * Sets initial value of the input
    */
-  initialValue: PropTypes.string,
+  initialValue: PropTypes.oneOfType([PropTypes.string, PropTypes.number]),
   /**
    * Toggles wether the element is a filter or not
    */

diff --git a/src/client/modules/Investments/Opportunities/tasks.js b/src/client/modules/Investments/Opportunities/tasks.js
@@ -1,41 +1,39 @@
+import urls from '../../../../lib/urls'
 import { idNamesToValueLabels } from '../../../utils'
 import { apiProxyAxios } from '../../../components/Task/utils'
 import { transformValueForAPI } from '../../../utils/date'
+import { getMetadataOptions } from '../../../metadata'
 
 import { transformInvestmentOpportunityDetails } from './transformers'
 
 export const getOpportunityDetails = ({ opportunityId }) =>
   apiProxyAxios
-    .get(`/v4/large-capital-opportunity/${opportunityId}`)
+    .get(
+      urls.investments.opportunities.largeCapitalOpportunityDetails(
+        opportunityId
+      )
+    )
     .then(({ data }) => transformInvestmentOpportunityDetails(data))
 
 export const getDetailsMetadata = () =>
   Promise.all([
-    apiProxyAxios.get(
-      '/v4/metadata/large-capital-opportunity/opportunity-value-type'
-    ),
+    getMetadataOptions(urls.metadata.largeCapitalOpportunityMetadata()),
   ]).then(([{ data: valueTypes }]) => ({
     valueTypes: idNamesToValueLabels(valueTypes),
   }))
 
 export const getRequirementsMetadata = () =>
   Promise.all([
-    apiProxyAxios.get(
-      'v4/metadata/capital-investment/large-capital-investment-type'
+    getMetadataOptions(
+      urls.metadata.capitalInvestmentLargeCapitalInvestmentType()
     ),
-    apiProxyAxios.get('/v4/metadata/capital-investment/return-rate'),
-    apiProxyAxios.get('/v4/metadata/capital-investment/time-horizon'),
-  ]).then(
-    ([
-      { data: investmentTypes },
-      { data: returnRates },
-      { data: timeScales },
-    ]) => ({
-      investmentTypes: idNamesToValueLabels(investmentTypes),
-      returnRates: idNamesToValueLabels(returnRates),
-      timeScales: idNamesToValueLabels(timeScales),
-    })
-  )
+    getMetadataOptions(urls.metadata.capitalInvestmentReturnRate()),
+    getMetadataOptions(urls.metadata.capitalInvestmentTimeHorizon()),
+  ]).then(([investmentTypes, returnRates, timeScales]) => ({
+    investmentTypes: investmentTypes,
+    returnRates: returnRates,
+    timeScales: timeScales,
+  }))
 
 export function saveOpportunityDetails({ values, opportunityId }) {
   return apiProxyAxios

diff --git a/src/lib/urls.js b/src/lib/urls.js
@@ -531,6 +531,10 @@ module.exports = {
         '/investments',
         '/opportunities/:opportunityId/interactions'
       ),
+      largeCapitalOpportunityDetails: url(
+        '/api-proxy/v4/large-capital-opportunity',
+        '/:opportunityId'
+      ),
       status: url('/investments', '/opportunities/:opportunityId/status'),
       create: url('/investments', '/opportunities/create'),
     },
@@ -659,6 +663,10 @@ module.exports = {
       '/api-proxy/v4/metadata/capital-investment',
       '/asset-class-interest'
     ),
+    largeCapitalOpportunityMetadata: url(
+      '/api-proxy/v4/metadata/large-capital-opportunity',
+      '/opportunity-value-type'
+    ),
     oneListTier: url('/api-proxy/v4/metadata', '/one-list-tier'),
     tradeAgreement: url('/api-proxy/v4/metadata', '/trade-agreement'),
   },

diff --git a/test/a11y/cypress/config/urlTestExclusions.js b/test/a11y/cypress/config/urlTestExclusions.js
@@ -209,6 +209,10 @@ export const urlTestExclusions = [
   { url: '/api-proxy/v4/metadata/capital-investment/equity-percentage' },
   { url: '/api-proxy/v4/metadata/capital-investment/desired-deal-role' },
   { url: '/api-proxy/v4/metadata/capital-investment/asset-class-interest' },
+  { url: '/api-proxy/v4/large-capital-opportunity/:opportunityId' },
+  {
+    url: '/api-proxy/v4/metadata/large-capital-opportunity/opportunity-value-type',
+  },
   { url: '/api-proxy/v4/metadata/one-list-tier' },
   { url: '/api-proxy/v4/metadata/trade-agreement' },
 ]