Compute total cost based on selector

Vizzuality · Nov 6, 2024 · c7453da · c7453da
1 parent 63be15d
commit c7453da
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 3 deletions.
diff --git a/api/src/modules/projects/projects-map.repository.ts b/api/src/modules/projects/projects-map.repository.ts
@@ -1,5 +1,5 @@
 import { Injectable } from '@nestjs/common';
-import { Repository, SelectQueryBuilder } from 'typeorm';
+import { QueryBuilder, Repository, SelectQueryBuilder } from 'typeorm';
 import { Project } from '@shared/entities/projects.entity';
 import { InjectRepository } from '@nestjs/typeorm';
 import {
@@ -47,7 +47,6 @@ export class ProjectsMapRepository extends Repository<Project> {
               'SUM(p.abatement_potential)',
               'total_abatement_potential',
             )
-            .addSelect('SUM(p.total_cost)', 'total_cost')
             .groupBy('p.country_code');
 
           return this.applyFilters(subQuery, filters);
@@ -56,6 +55,7 @@ export class ProjectsMapRepository extends Repository<Project> {
         'filtered_projects.country_code = country.code',
       );
 
+    console.log('>>>>>>>>>>>>>', geoQueryBuilder.getSql());
     const { geojson } = await geoQueryBuilder.getRawOne<{
       geojson: ProjectMap;
     }>();
@@ -79,6 +79,12 @@ export class ProjectsMapRepository extends Repository<Project> {
       abatementPotentialRange,
       costRangeSelector,
     } = filters;
+    if (costRangeSelector?.length && costRangeSelector[0] === 'npv') {
+      queryBuilder.addSelect('SUM(p.total_cost_npv)', 'total_cost');
+    } else {
+      queryBuilder.addSelect('SUM(p.total_cost)', 'total_cost');
+    }
+
     if (countryCode?.length) {
       queryBuilder.andWhere('p.countryCode IN (:...countryCodes)', {
         countryCodes: countryCode,

diff --git a/api/test/integration/project-map/project-map.spec.ts b/api/test/integration/project-map/project-map.spec.ts
@@ -177,7 +177,7 @@ describe('Project Map', () => {
     const response = await testManager
       .request()
       .get(projectsContract.getProjectsMap.path)
-      .query({ filter: { costRange: '1000, 1000', costRangeSelector: 'nvm' } });
+      .query({ filter: { costRange: '1000, 1000', costRangeSelector: 'npv' } });
 
     expect(response.status).toBe(HttpStatus.OK);
     expect(response.body.features.length).toBe(1);