3994 - Bulk download: getNDPYear: add earliest NDP year (#3995)

openforis · Oct 3, 2024 · da76a72 · da76a72
1 parent 24d8fc4
commit da76a72
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 7 deletions.
diff --git a/src/i18n/resources/en/bulkDownload.js b/src/i18n/resources/en/bulkDownload.js
@@ -2,6 +2,7 @@ module.exports = {
   dateOfExport: 'Date of export',
 
   NDPYear: {
-    year: 'Latest NDP year',
+    latestYear: 'Latest NDP year',
+    earliestYear: 'Earliest NDP year',
   },
 }
diff --git a/src/server/controller/cycleData/getBulkDownload/getNDPYear.ts b/src/server/controller/cycleData/getBulkDownload/getNDPYear.ts
@@ -29,12 +29,15 @@ const getValue = async (props: {
   const { base, assessment, cycle, countryIso, t } = props
   const years = await OriginalDataPointRepository.getReservedYears({ assessment, cycle, countryIso })
 
-  const yearKey = t('bulkDownload.NDPYear.year')
-  const year = years.length ? Math.max(...years.map(({ year }) => year)) : null
-  base[yearKey] = year ? String(year) : null
-
-  const originalDataPoint = year
-    ? await OriginalDataPointRepository.getOne({ assessment, cycle, countryIso, year: String(year) })
+  const latestYearKey = t('bulkDownload.NDPYear.latestYear')
+  const earliestYearKey = t('bulkDownload.NDPYear.earliestYear')
+  const latestYear = years.length ? Math.max(...years.map(({ year }) => year)) : null
+  const earliestYear = years.length ? Math.min(...years.map(({ year }) => year)) : null
+  base[earliestYearKey] = earliestYear ? String(earliestYear) : null
+  base[latestYearKey] = latestYear ? String(latestYear) : null
+
+  const originalDataPoint = latestYear
+    ? await OriginalDataPointRepository.getOne({ assessment, cycle, countryIso, year: String(latestYear) })
     : null
 
   METHODS.forEach((method) => {