Unifies PUVSPR.dat info source from (geo)FeatureAmounts table [MRXN23-469]

api/apps/api/src/modules/scenarios/input-files/puvspr.dat.processor/puvspr.dat.marxan-project.ts → api/apps/api/src/modules/scenarios/input-files/puvspr.dat.processor/puvspr.dat.feature-amounts.service.ts

@@ -4,18 +4,22 @@ import { FeatureAmountsPerPlanningUnitRepository } from '@marxan/feature-amounts
 import { Injectable } from '@nestjs/common';
 import { InjectRepository } from '@nestjs/typeorm';
 import { Repository } from 'typeorm';
-import { FeatureAmountPerPlanningUnitId, PuvsprDat } from './puvsrpr.dat';
+
+export type FeatureAmountPerPlanningUnitId = {
+  featureId: string;
+  amount: number;
+  puId: number;
+};
 
 @Injectable()
-export class PuvsprDatMarxanProject implements PuvsprDat {
+export class PuvsprDatFeatureAmountsService {
   constructor(
     private readonly featureAmountsPerPlanningUnitRepo: FeatureAmountsPerPlanningUnitRepository,
     @InjectRepository(ProjectsPuEntity, DbConnections.geoprocessingDB)
     private readonly projectsPusRepo: Repository<ProjectsPuEntity>,
   ) {}
   public async getAmountPerPlanningUnitAndFeature(
     projectId: string,
-    scenarioId: string,
     featureIds: string[],
   ): Promise<FeatureAmountPerPlanningUnitId[]> {
     const amountPerPlanningUnitOfFeature =

api/apps/api/src/modules/scenarios/input-files/puvspr.dat.processor/puvspr.dat.processor.module.ts

@@ -10,12 +10,10 @@ import { TypeOrmModule } from '@nestjs/typeorm';
 import { Scenario } from '../../scenario.api.entity';
 import { GeoFeatureDtoMapper } from '../../specification/geo-feature-dto.mapper';
 import { SplitFeatureConfigMapper } from '../../specification/split-feature-config.mapper';
-import { PuvrsprDatFactory } from './puvspr.dat.factory';
-import { PuvsprDatLegacyProject } from './puvspr.dat.legacy-project';
-import { PuvsprDatMarxanProject } from './puvspr.dat.marxan-project';
 import { PuvsprDatProcessor } from './puvspr.dat.processor';
 import { FeatureHashModule } from '@marxan-api/modules/features-hash/features-hash.module';
 import { ProjectsPuEntity } from '@marxan-jobs/planning-unit-geometry';
+import { PuvsprDatFeatureAmountsService } from '@marxan-api/modules/scenarios/input-files/puvspr.dat.processor/puvspr.dat.feature-amounts.service';
 
 @Module({
   imports: [
@@ -32,9 +30,7 @@ import { ProjectsPuEntity } from '@marxan-jobs/planning-unit-geometry';
   providers: [
     GeoFeatureDtoMapper,
     PuvsprDatProcessor,
-    PuvrsprDatFactory,
-    PuvsprDatMarxanProject,
-    PuvsprDatLegacyProject,
+    PuvsprDatFeatureAmountsService,
     SplitFeatureConfigMapper,
   ],
   exports: [PuvsprDatProcessor],

api/apps/api/src/modules/scenarios/input-files/puvspr.dat.processor/puvspr.dat.processor.ts

@@ -22,7 +22,7 @@ import { isLeft, left, right } from 'fp-ts/lib/Either';
 import { EntityManager } from 'typeorm';
 import { GeoFeatureDtoMapper } from '../../specification/geo-feature-dto.mapper';
 import { SplitFeatureConfigMapper } from '../../specification/split-feature-config.mapper';
-import { PuvrsprDatFactory } from './puvspr.dat.factory';
+import { PuvsprDatFeatureAmountsService } from '@marxan-api/modules/scenarios/input-files/puvspr.dat.processor/puvspr.dat.feature-amounts.service';
 
 export type PuvrsprDatRow = {
   speciesId: number;
@@ -41,11 +41,10 @@ export class PuvsprDatProcessor {
     private readonly featureAmountsPerPlanningUnitService: FeatureAmountsPerPlanningUnitService,
     private readonly splitConfigHasher: SingleConfigFeatureValueHasher,
     private readonly splitFeatureConfigMapper: SplitFeatureConfigMapper,
-    private readonly puvsprDatFactory: PuvrsprDatFactory,
+    private readonly puvsprFeatureAmounts: PuvsprDatFeatureAmountsService,
   ) {}
 
   async getPuvsprDatRows(
-    isLegacy: boolean,
     scenarioId: string,
     projectId: string,
   ): Promise<PuvrsprDatRow[]> {
@@ -64,10 +63,8 @@ export class PuvsprDatProcessor {
       );
 
     const featuresAmountPerPlanningUnit =
-      await this.getAmountPerPlanningUnitAndFeature(
-        isLegacy,
+      await this.puvsprFeatureAmounts.getAmountPerPlanningUnitAndFeature(
         projectId,
-        scenarioId,
         featuresIds,
       );
 
@@ -133,21 +130,6 @@ export class PuvsprDatProcessor {
     return copyFeatureIds.concat(splitFeatureIds);
   }
 
-  private async getAmountPerPlanningUnitAndFeature(
-    isLegacy: boolean,
-    projectId: string,
-    scenarioId: string,
-    fetaureIds: string[],
-  ) {
-    const puvspr = this.puvsprDatFactory.getPuvsrDat(isLegacy);
-
-    return puvspr.getAmountPerPlanningUnitAndFeature(
-      projectId,
-      scenarioId,
-      fetaureIds,
-    );
-  }
-
   private getCopyFeatureIds(
     featureConfigs: (SpecificationFeatureCopy | SpecificationFeatureSplit)[],
   ) {

api/apps/api/src/modules/scenarios/input-files/puvspr.dat.service.ts

@@ -1,9 +1,7 @@
 import { Project } from '@marxan-api/modules/projects/project.api.entity';
-import { ProjectSourcesEnum } from '@marxan/projects';
 import { assertDefined } from '@marxan/utils';
 import { Injectable } from '@nestjs/common';
 import { InjectRepository } from '@nestjs/typeorm';
-import { isRight } from 'fp-ts/lib/Either';
 import { Repository } from 'typeorm';
 import { Scenario } from '../scenario.api.entity';
 import {
@@ -29,25 +27,14 @@ export class PuvsprDatService {
 
     const projectId = scenario.projectId;
 
-    const isLegacyProject = await this.isLegacyProject(projectId);
-
     const puvsprRows = await this.puvsprDatProcessor.getPuvsprDatRows(
-      isLegacyProject,
       scenarioId,
       projectId,
     );
 
     return this.getFileContent(puvsprRows);
   }
 
-  private async isLegacyProject(projectId: string) {
-    const [project] = await this.projectsRepo.find({
-      where: { id: projectId },
-    });
-    assertDefined(project);
-    return project.sources === ProjectSourcesEnum.legacyImport;
-  }
-
   private getFileContent(rows: PuvrsprDatRow[]) {
     return (
       'species\tpu\tamount\n' +