diff --git a/src/main/java/org/breedinginsight/brapps/importer/model/imports/experimentObservation/ExperimentObservation.java b/src/main/java/org/breedinginsight/brapps/importer/model/imports/experimentObservation/ExperimentObservation.java index 20aade1ed..778ee85b1 100644 --- a/src/main/java/org/breedinginsight/brapps/importer/model/imports/experimentObservation/ExperimentObservation.java +++ b/src/main/java/org/breedinginsight/brapps/importer/model/imports/experimentObservation/ExperimentObservation.java @@ -68,7 +68,7 @@ public class ExperimentObservation implements BrAPIImport { private String expDescription; @ImportFieldType(type = ImportFieldTypeEnum.TEXT) - @ImportFieldMetadata(id = "expUnit", name = Columns.EXP_UNIT, description = "experiment unit (Examples: plots, plant, tanks, hives, etc.)") + @ImportFieldMetadata(id = "expUnit", name = Columns.EXP_UNIT, description = "Experiment unit (Examples: plots, plant, tanks, hives, etc.)") private String expUnit; @ImportFieldType(type = ImportFieldTypeEnum.TEXT) diff --git a/src/main/java/org/breedinginsight/brapps/importer/services/ImportStatusService.java b/src/main/java/org/breedinginsight/brapps/importer/services/ImportStatusService.java index e1f16343a..e1dcefc63 100644 --- a/src/main/java/org/breedinginsight/brapps/importer/services/ImportStatusService.java +++ b/src/main/java/org/breedinginsight/brapps/importer/services/ImportStatusService.java @@ -52,7 +52,9 @@ public void startUpload(ImportUpload upload, long numberObjects, String message) importDAO.update(upload); } - public void finishUpload(ImportUpload upload, String message) { + public void finishUpload(ImportUpload upload, long numberObjects, String message) { + // Update progress to reflect final finished and inProgress counts. + upload.updateProgress(Math.toIntExact(numberObjects), 0); upload.getProgress().setMessage(message); upload.getProgress().setStatuscode((short) HttpStatus.OK.getCode()); importDAO.update(upload); diff --git a/src/main/java/org/breedinginsight/brapps/importer/services/processors/GermplasmProcessor.java b/src/main/java/org/breedinginsight/brapps/importer/services/processors/GermplasmProcessor.java index 097f59fb1..e0c8b60b2 100644 --- a/src/main/java/org/breedinginsight/brapps/importer/services/processors/GermplasmProcessor.java +++ b/src/main/java/org/breedinginsight/brapps/importer/services/processors/GermplasmProcessor.java @@ -503,10 +503,6 @@ public void postBrapiData(Map mappedBrAPIImport, Program entry.getValue().getGermplasm().setBrAPIObject(createdGermplasmMap.get(germplasmName)); } } - - - - } private void updateDependencyValues(Map mappedBrAPIImport) { diff --git a/src/main/java/org/breedinginsight/brapps/importer/services/processors/ProcessorManager.java b/src/main/java/org/breedinginsight/brapps/importer/services/processors/ProcessorManager.java index a5ba4525b..1e4361673 100644 --- a/src/main/java/org/breedinginsight/brapps/importer/services/processors/ProcessorManager.java +++ b/src/main/java/org/breedinginsight/brapps/importer/services/processors/ProcessorManager.java @@ -115,7 +115,7 @@ private void postBrapiData(Program program, ImportUpload upload) throws Validato } log.debug("Completed upload to brapi service"); - statusService.finishUpload(upload, "Completed upload to brapi service"); + statusService.finishUpload(upload, totalObjects, "Completed upload to brapi service"); } } diff --git a/src/main/java/org/breedinginsight/services/job/JobService.java b/src/main/java/org/breedinginsight/services/job/JobService.java index efb0503cc..e4bb8c503 100644 --- a/src/main/java/org/breedinginsight/services/job/JobService.java +++ b/src/main/java/org/breedinginsight/services/job/JobService.java @@ -46,10 +46,7 @@ public List getProgramJobs(UUID programId) throws DoesNotExistException { throw new DoesNotExistException("Program id does not exist"); } - List jobs = new ArrayList<>(); - jobs.addAll(getProgramImports(programId)); - - return jobs; + return new ArrayList<>(getProgramImports(programId)); } @SneakyThrows diff --git a/src/main/java/org/breedinginsight/utilities/BrAPIDAOUtil.java b/src/main/java/org/breedinginsight/utilities/BrAPIDAOUtil.java index 9d15d225e..e0c470c9b 100644 --- a/src/main/java/org/breedinginsight/utilities/BrAPIDAOUtil.java +++ b/src/main/java/org/breedinginsight/utilities/BrAPIDAOUtil.java @@ -325,7 +325,8 @@ public List post(List brapiObjects, } if (upload != null) { - upload.updateProgress(listResult.size(), 0); + // Set finished count, reset inProgress count to 0. + upload.updateProgress(finished, 0); progressUpdateMethod.accept(upload); }