From ed5b5227c71d97535c558d56bee4c1b4bd0b87e2 Mon Sep 17 00:00:00 2001 From: mlm483 Date: Tue, 9 May 2023 17:12:03 -0400 Subject: [PATCH 1/5] [BI-1689] - fixed constant capitalization --- .../imports/experimentObservation/ExperimentObservation.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 d429ee126..371185479 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 @@ -67,7 +67,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) From 8398625b56e8f7116e589d9542548c0f35153852 Mon Sep 17 00:00:00 2001 From: mlm483 Date: Tue, 9 May 2023 17:23:50 -0400 Subject: [PATCH 2/5] [BI-1689] - fixed incorrect counts --- .../importer/services/processors/GermplasmProcessor.java | 4 ---- .../brapps/importer/services/processors/ProcessorManager.java | 3 +++ src/main/java/org/breedinginsight/utilities/BrAPIDAOUtil.java | 4 +++- 3 files changed, 6 insertions(+), 5 deletions(-) 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..248c31f30 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 @@ -114,6 +114,9 @@ private void postBrapiData(Program program, ImportUpload upload) throws Validato processor.postBrapiData(mappedBrAPIImport, program, upload); } + // Update progress to reflect final finished and inProgress counts. + upload.updateProgress(Math.toIntExact(totalObjects), 0); + log.debug("Completed upload to brapi service"); statusService.finishUpload(upload, "Completed upload to brapi service"); } diff --git a/src/main/java/org/breedinginsight/utilities/BrAPIDAOUtil.java b/src/main/java/org/breedinginsight/utilities/BrAPIDAOUtil.java index 3abb9dcc8..df3251d94 100644 --- a/src/main/java/org/breedinginsight/utilities/BrAPIDAOUtil.java +++ b/src/main/java/org/breedinginsight/utilities/BrAPIDAOUtil.java @@ -328,7 +328,9 @@ public List post(List brapiObjects, } if (upload != null) { - upload.updateProgress(listResult.size(), 0); + // TODO: consider possible race condition? + // Increment finished count and reset inProgress count to 0. + upload.updateProgress(finished, 0); progressUpdateMethod.accept(upload); } From 80d7f3462f3918e9c591a7541bab957fc43cef10 Mon Sep 17 00:00:00 2001 From: mlm483 Date: Tue, 9 May 2023 17:24:26 -0400 Subject: [PATCH 3/5] [BI-1689] - refactor --- .../java/org/breedinginsight/services/job/JobService.java | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) 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 From e31b705b0b6e54ad54ac881a144383614ccc6fe3 Mon Sep 17 00:00:00 2001 From: mlm483 Date: Mon, 15 May 2023 11:31:07 -0400 Subject: [PATCH 4/5] [BI-1689] - removed TODO --- src/main/java/org/breedinginsight/utilities/BrAPIDAOUtil.java | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/main/java/org/breedinginsight/utilities/BrAPIDAOUtil.java b/src/main/java/org/breedinginsight/utilities/BrAPIDAOUtil.java index df3251d94..687d466de 100644 --- a/src/main/java/org/breedinginsight/utilities/BrAPIDAOUtil.java +++ b/src/main/java/org/breedinginsight/utilities/BrAPIDAOUtil.java @@ -328,8 +328,7 @@ public List post(List brapiObjects, } if (upload != null) { - // TODO: consider possible race condition? - // Increment finished count and reset inProgress count to 0. + // Set finished count, reset inProgress count to 0. upload.updateProgress(finished, 0); progressUpdateMethod.accept(upload); } From b09ddeaf7f24c594e1f4277217a69c3fe98d0f65 Mon Sep 17 00:00:00 2001 From: mlm483 Date: Tue, 16 May 2023 12:18:01 -0400 Subject: [PATCH 5/5] [BI-1689] - changes based on review --- .../brapps/importer/services/ImportStatusService.java | 4 +++- .../importer/services/processors/ProcessorManager.java | 5 +---- 2 files changed, 4 insertions(+), 5 deletions(-) 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/ProcessorManager.java b/src/main/java/org/breedinginsight/brapps/importer/services/processors/ProcessorManager.java index 248c31f30..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 @@ -114,11 +114,8 @@ private void postBrapiData(Program program, ImportUpload upload) throws Validato processor.postBrapiData(mappedBrAPIImport, program, upload); } - // Update progress to reflect final finished and inProgress counts. - upload.updateProgress(Math.toIntExact(totalObjects), 0); - log.debug("Completed upload to brapi service"); - statusService.finishUpload(upload, "Completed upload to brapi service"); + statusService.finishUpload(upload, totalObjects, "Completed upload to brapi service"); } }