allow to pass through retries param to tune awaiting for piece import…

…er to finish
Vizzuality · Sep 13, 2022 · 9850687 · 9850687
1 parent 49b4825
commit 9850687
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 7 deletions.
diff --git a/...acy-project-import/legacy-piece-importers/features-specification.legacy-piece-importer.ts b/...acy-project-import/legacy-piece-importers/features-specification.legacy-piece-importer.ts
@@ -291,6 +291,7 @@ export class FeaturesSpecificationLegacyProjectPieceImporter
     specRows: PropSpecDatRow[],
     projectId: string,
     scenarioId: string,
+    retries?: number,
   ): Promise<void> {
     const featureIdByIntegerId = await this.getFeatureIdByIntegerIdMap(
       projectId,
@@ -330,6 +331,7 @@ export class FeaturesSpecificationLegacyProjectPieceImporter
 
     const specificationResult = await this.waitUntilSpecificationEnds(
       scenarioId,
+      retries
     );
     if (isLeft(specificationResult)) {
       this.logAndThrow(
@@ -395,6 +397,7 @@ export class FeaturesSpecificationLegacyProjectPieceImporter
 
   async run(
     input: LegacyProjectImportJobInput,
+    retries?: number,
   ): Promise<LegacyProjectImportJobOutput> {
     const { files, projectId, scenarioId } = input;
 
@@ -415,7 +418,7 @@ export class FeaturesSpecificationLegacyProjectPieceImporter
     }
 
     const specRows = this.getPropSpecRows(specRowsOrError, puvsprRowsOrError);
-    await this.runSpecification(specRows, projectId, scenarioId);
+    await this.runSpecification(specRows, projectId, scenarioId, retries);
     await this.updateScenarioFeaturesData(specRows, scenarioId);
 
     return input;

diff --git a/...ntegration/legacy-project-import/features-specification.legacy-piece-importer.e2e-spec.ts b/...ntegration/legacy-project-import/features-specification.legacy-piece-importer.e2e-spec.ts
@@ -229,7 +229,7 @@ describe(FeaturesSpecificationLegacyProjectPieceImporter, () => {
       .ThenASpecificationDidntFinishErrorShouldBeThrown();
   }, timeoutForTestsThatNeedToCheckSpecificationJobStatus);
 
-  it(`fails when specification async job timeouts`, async () => {
+  it(`fails when specification async job times out`, async () => {
     const specDatFileType = LegacyProjectImportFileType.SpecDat;
     const puvsprDatFileType = LegacyProjectImportFileType.PuvsprDat;
 
@@ -249,7 +249,7 @@ describe(FeaturesSpecificationLegacyProjectPieceImporter, () => {
 
     await fixtures
       .WhenPieceImporterIsInvoked(job)
-      .AndSpecificationProcessTimeouts()
+      .AndSpecificationProcessTimesOut()
       .ThenASpecificationDidntFinishErrorShouldBeThrown();
   }, timeoutForTestsThatNeedToCheckSpecificationJobStatus * 2);
 
@@ -685,7 +685,7 @@ const getFixtures = async () => {
         }),
       );
     },
-    WhenPieceImporterIsInvoked: (input: LegacyProjectImportJobInput) => {
+    WhenPieceImporterIsInvoked: (input: LegacyProjectImportJobInput, retries?: number) => {
       return {
         ThenADatFileNotFoundErrorShouldBeThrown: async (
           file: LegacyProjectImportFileType,
@@ -732,10 +732,10 @@ const getFixtures = async () => {
             },
           };
         },
-        AndSpecificationProcessTimeouts: () => {
+        AndSpecificationProcessTimesOut: () => {
           return {
             ThenASpecificationDidntFinishErrorShouldBeThrown: async () => {
-              await expect(sut.run(input)).rejects.toThrow(
+              await expect(sut.run(input, retries)).rejects.toThrow(
                 /specification didn't finish: specification timeout/gi,
               );
             },

diff --git a/api/libs/legacy-project-import/src/legacy-project-import-piece-processor.port.ts b/api/libs/legacy-project-import/src/legacy-project-import-piece-processor.port.ts
@@ -1,7 +1,7 @@
 import { LegacyProjectImportPiece } from './domain/legacy-project-import-piece';
 
 export abstract class LegacyProjectImportPieceProcessor<I, O> {
-  abstract run(input: I): Promise<O>;
+  abstract run(input: I, retries?: number): Promise<O>;
 
   abstract isSupported(piece: LegacyProjectImportPiece): boolean;
 }