fix(CostSurface): Fixes missing min/max update for default CostSurfac…

…e metadata for non shapefile based Projects
Vizzuality · Nov 24, 2023 · c9f1433 · c9f1433
1 parent aca8a31
commit c9f1433
Show file tree

Hide file tree

Showing 6 changed files with 216 additions and 50 deletions.
diff --git a/api/apps/api/src/modules/projects/projects-crud.service.ts b/api/apps/api/src/modules/projects/projects-crud.service.ts
@@ -203,13 +203,14 @@ export class ProjectsCrudService extends AppBaseService<
       this.logger.debug(
         'creating planning unit job and assigning project to area',
       );
+      const defaultCostSurfaceId = getDefaultCostSurfaceIdFromProject(model);
       await Promise.all([
         this.planningUnitsService.create({
           ...createModel,
           planningUnitAreakm2: createModel.planningUnitAreakm2,
           planningUnitGridShape: createModel.planningUnitGridShape,
           projectId: model.id,
-          costSurfaceId: getDefaultCostSurfaceIdFromProject(model),
+          costSurfaceId: defaultCostSurfaceId,
         }),
         this.planningAreasService.assignProject({
           projectId: model.id,

diff --git a/api/apps/geoprocessing/src/modules/cost-surface/project/project-cost-surface.module.ts b/api/apps/geoprocessing/src/modules/cost-surface/project/project-cost-surface.module.ts
@@ -48,5 +48,6 @@ import { ProjectCostSurfacePersistencePort } from '@marxan-geoprocessing/modules
       useClass: ShapefileConverter,
     },
   ],
+  exports: [ProjectCostSurfacePersistencePort],
 })
 export class ProjectCostSurfaceModule {}
diff --git a/api/apps/geoprocessing/src/modules/planning-units/planning-units.job.ts b/api/apps/geoprocessing/src/modules/planning-units/planning-units.job.ts
@@ -11,8 +11,9 @@ import { validate } from 'class-validator';
 import { chunk } from 'lodash';
 import { EntityManager } from 'typeorm';
 import { CHUNK_SIZE_FOR_BATCH_GEODB_OPERATIONS } from '@marxan-geoprocessing/utils/chunk-size-for-batch-geodb-operations';
+import { ProjectCostSurfacePersistencePort } from '@marxan-geoprocessing/modules/cost-surface/ports/persistence/project-cost-surface-persistence.port';
 
-type CustomPlanningAreaJob = Required<
+export type CustomPlanningAreaJob = Required<
   Omit<
     PlanningUnitsJob,
     'countryId' | 'adminRegionId' | 'adminAreaLevel1Id' | 'adminAreaLevel2Id'
@@ -56,6 +57,7 @@ export class PlanningUnitsJobProcessor {
   private logger = new Logger('planning-units-job-processor');
 
   constructor(
+    private readonly repo: ProjectCostSurfacePersistencePort,
     @InjectEntityManager()
     private readonly entityManager: EntityManager,
   ) {}
@@ -262,6 +264,8 @@ grid.geom
 
         return geometries;
       });
+
+      await this.repo.updateCostSurfaceRange(job.data.costSurfaceId!);
       this.logger.debug(`Finished planning-units processing for ${job.id}`);
     } catch (err) {
       this.logger.error(err);

diff --git a/api/apps/geoprocessing/src/modules/planning-units/planning-units.module.ts b/api/apps/geoprocessing/src/modules/planning-units/planning-units.module.ts
@@ -6,9 +6,10 @@ import { ShapefileService, FileService } from '@marxan/shapefile-converter';
 import { PlanningUnitsService } from './planning-units.service';
 import { WorkerModule } from '../worker';
 import { PlanningUnitsJobProcessor } from './planning-units.job';
+import { ProjectCostSurfaceModule } from '@marxan-geoprocessing/modules/cost-surface/project/project-cost-surface.module';
 
 @Module({
-  imports: [TileModule, WorkerModule],
+  imports: [TileModule, WorkerModule, ProjectCostSurfaceModule],
   providers: [
     PlanningUnitsProcessor,
     ShapefileService,

diff --git a/api/apps/geoprocessing/test/e2e.config.ts b/api/apps/geoprocessing/test/e2e.config.ts
@@ -2,10 +2,13 @@ import * as faker from 'faker';
 import { PlanningUnitsJob } from '@marxan-jobs/planning-unit-geometry';
 import { PlanningUnitGridShape } from '@marxan/scenarios-planning-unit';
 
-interface OptionsWithCountryCode {
+export interface OptionsWithCountryCode {
   countryCode: string;
   adminAreaLevel1Id?: string;
   adminAreaLevel2Id?: string;
+  planningUnitAreakm2?: number;
+  projectId?: string;
+  costSurfaceId?: string;
 }
 
 export const E2E_CONFIG: {
@@ -32,16 +35,22 @@ export const E2E_CONFIG: {
           adminAreaLevel2Id:
             options.adminAreaLevel2Id ?? faker.random.alphaNumeric(12),
           planningUnitGridShape: PlanningUnitGridShape.Hexagon,
-          planningUnitAreakm2: 100,
-          projectId: 'a9d965a2-35ce-44b2-8112-50bcdfe98447',
+          planningUnitAreakm2: options.planningUnitAreakm2 ?? 100,
+          projectId:
+            options.projectId ?? 'a9d965a2-35ce-44b2-8112-50bcdfe98447',
+          costSurfaceId:
+            options.costSurfaceId ?? '700d7cf9-011b-4adf-bbe8-4c35a100abc0',
         }),
         adminRegion: (options: OptionsWithCountryCode): PlanningUnitsJob => ({
           countryId: options.countryCode,
           adminAreaLevel1Id: faker.random.alphaNumeric(7),
           adminAreaLevel2Id: faker.random.alphaNumeric(12),
           planningUnitGridShape: PlanningUnitGridShape.Square,
-          planningUnitAreakm2: 100,
-          projectId: 'a9d965a2-35ce-44b2-8112-50bcdfe98447',
+          planningUnitAreakm2: options.planningUnitAreakm2 ?? 100,
+          projectId:
+            options.projectId ?? 'a9d965a2-35ce-44b2-8112-50bcdfe98447',
+          costSurfaceId:
+            options.costSurfaceId ?? '700d7cf9-011b-4adf-bbe8-4c35a100abc0',
         }),
       },
       invalid: {
@@ -51,15 +60,21 @@ export const E2E_CONFIG: {
           adminAreaLevel2Id: faker.random.alphaNumeric(12),
           planningUnitGridShape: PlanningUnitGridShape.Hexagon,
           planningUnitAreakm2: -100,
-          projectId: 'a9d965a2-35ce-44b2-8112-50bcdfe98447',
+          projectId:
+            options.projectId ?? 'a9d965a2-35ce-44b2-8112-50bcdfe98447',
+          costSurfaceId:
+            options.costSurfaceId ?? '700d7cf9-011b-4adf-bbe8-4c35a100abc0',
         }),
         adminRegion: (options: OptionsWithCountryCode): PlanningUnitsJob => ({
           countryId: options.countryCode,
           adminAreaLevel1Id: faker.random.alphaNumeric(7),
           adminAreaLevel2Id: faker.random.alphaNumeric(12),
           planningUnitGridShape: PlanningUnitGridShape.Square,
-          planningUnitAreakm2: 100,
-          projectId: 'a9d965a2-35ce-44b2-8112-50bcdfe98447',
+          planningUnitAreakm2: options.planningUnitAreakm2 ?? 100,
+          projectId:
+            options.projectId ?? 'a9d965a2-35ce-44b2-8112-50bcdfe98447',
+          costSurfaceId:
+            options.costSurfaceId ?? '700d7cf9-011b-4adf-bbe8-4c35a100abc0',
         }),
       },
     },