chore: normalize logs

issue #557
bcgov · Dec 8, 2023 · 06ea7d9 · 06ea7d9
1 parent 6d4fecd
commit 06ea7d9
Show file tree

Hide file tree

Showing 9 changed files with 148 additions and 27 deletions.
diff --git a/backend/src/main/java/ca/bc/gov/backendstartapi/service/SeedlotCollectionMethodService.java b/backend/src/main/java/ca/bc/gov/backendstartapi/service/SeedlotCollectionMethodService.java
@@ -58,7 +58,7 @@ public void saveSeedlotFormStep1(Seedlot seedlot, SeedlotFormCollectionDto formS
 
     if (!seedlotCollectionList.isEmpty()) {
       log.info(
-          "{} previous records on SeedlotCollectionMethod table for seedlot number {}",
+          "{} previous records on the SeedlotCollectionMethod table for seedlot number {}",
           seedlotCollectionList.size(),
           seedlot.getId());
 
@@ -80,7 +80,7 @@ public void saveSeedlotFormStep1(Seedlot seedlot, SeedlotFormCollectionDto formS
 
       // Remove possible leftovers
       log.info(
-          "{} leftover record(s) in the SeedlotCollectionMethod table to remove for seedlot number"
+          "{} leftover record(s) on the SeedlotCollectionMethod table to remove for seedlot number"
               + " {}",
           existingMethodList.size(),
           seedlot.getId());
@@ -102,7 +102,7 @@ public void saveSeedlotFormStep1(Seedlot seedlot, SeedlotFormCollectionDto formS
     }
 
     log.info(
-        "No previous records on SeedlotCollectionMethod table for seedlot number {}",
+        "No previous records on the SeedlotCollectionMethod table for seedlot number {}",
         seedlot.getId());
 
     addSeedlotCollectionMethod(seedlot, formStep1.coneCollectionMethodCodes());
@@ -117,14 +117,14 @@ public void saveSeedlotFormStep1(Seedlot seedlot, SeedlotFormCollectionDto formS
   private void addSeedlotCollectionMethod(Seedlot seedlot, List<Integer> methods) {
     if (methods.isEmpty()) {
       log.info(
-          "No new records to be inserted in the SeedlotCollectionMethod table for seedlot number"
+          "No new records to be inserted on the SeedlotCollectionMethod table for seedlot number"
               + " {}",
           seedlot.getId());
       return;
     }
 
     log.info(
-        "{} record(s) to be inserted in the SeedlotCollectionMethod table for seedlot number {}",
+        "{} record(s) to be inserted on the SeedlotCollectionMethod table for seedlot number {}",
         methods.size(),
         seedlot.getId());
 

diff --git a/backend/src/main/java/ca/bc/gov/backendstartapi/service/SeedlotGeneticWorthService.java b/backend/src/main/java/ca/bc/gov/backendstartapi/service/SeedlotGeneticWorthService.java
@@ -43,6 +43,11 @@ public void saveSeedlotFormStep5(
     List<ParentTreeGeneticQualityDto> sgwInsertList = new ArrayList<>();
 
     if (!sgwList.isEmpty()) {
+      log.info(
+          "{} previous records on the SeedlotGeneticWorth table for seedlot number {}",
+          sgwList.size(),
+          seedlot.getId());
+
       List<String> sgwExistingList =
           new ArrayList<>(sgwList.stream().map(SeedlotGeneticWorth::getGeneticWorthCode).toList());
 
@@ -59,9 +64,10 @@ public void saveSeedlotFormStep5(
 
       // Remove possible leftovers
       log.info(
-          "{} SeedlotgeneticWorth record(s) to remove for seedlot number {}",
+          "{} leftover record(s) on the SeedlotGeneticWorth table to remove for seedlot number {}",
           sgwExistingList.size(),
           seedlot.getId());
+
       List<SeedlotGeneticWorthId> sgwiList = new ArrayList<>();
       for (String genWorthCode : sgwExistingList) {
         sgwiList.add(new SeedlotGeneticWorthId(seedlot.getId(), genWorthCode));
@@ -77,7 +83,9 @@ public void saveSeedlotFormStep5(
       return;
     }
 
-    log.info("No previous SeedlotGeneticWorth records for seedlot number {}", seedlot.getId());
+    log.info(
+        "No previous records on the SeedlotGeneticWorth table for seedlot number {}",
+        seedlot.getId());
 
     for (SeedlotFormParentTreeSmpDto seedlotPtFormDto : seedlotFormParentTreeDtoList) {
       sgwInsertList.addAll(seedlotPtFormDto.parentTreeGeneticQualities());
@@ -87,6 +95,18 @@ public void saveSeedlotFormStep5(
 
   private void addSeedlotGeneticWorth(
       Seedlot seedlot, List<ParentTreeGeneticQualityDto> genWorthCodeToInsert) {
+    if (genWorthCodeToInsert.isEmpty()) {
+      log.info(
+          "No new records to be inserted on the SeedlotGeneticWorth table for seedlot number {}",
+          seedlot.getId());
+      return;
+    }
+
+    log.info(
+        "{} record(s) to be inserted on the SeedlotGeneticWorth table for seedlot number {}",
+        genWorthCodeToInsert.size(),
+        seedlot.getId());
+
     List<SeedlotGeneticWorth> seedlotGeneticWorths = new ArrayList<>();
     for (ParentTreeGeneticQualityDto ptgqDto : genWorthCodeToInsert) {
 

diff --git a/backend/src/main/java/ca/bc/gov/backendstartapi/service/SeedlotOrchardService.java b/backend/src/main/java/ca/bc/gov/backendstartapi/service/SeedlotOrchardService.java
@@ -50,7 +50,7 @@ public void saveSeedlotFormStep4(Seedlot seedlot, SeedlotFormOrchardDto formStep
 
     if (!seedlotOrchards.isEmpty()) {
       log.info(
-          "{} previous records on SeedlotOrchard table for seedlot number {}",
+          "{} previous records on the SeedlotOrchard table for seedlot number {}",
           seedlotOrchards.size(),
           seedlot.getId());
 
@@ -70,7 +70,7 @@ public void saveSeedlotFormStep4(Seedlot seedlot, SeedlotFormOrchardDto formStep
 
       // Remove possible leftovers
       log.info(
-          "{} leftover record(s) in the SeedlotOrchard table to remove for seedlot number {}",
+          "{} leftover record(s) on the SeedlotOrchard table to remove for seedlot number {}",
           existingSeedlotOrchardList.size(),
           seedlot.getId());
       List<SeedlotOrchardId> soiList = new ArrayList<>();
@@ -90,21 +90,22 @@ public void saveSeedlotFormStep4(Seedlot seedlot, SeedlotFormOrchardDto formStep
       return;
     }
 
-    log.info("No previous records on SeedlotOrchard table for seedlot number {}", seedlot.getId());
+    log.info(
+        "No previous records on the SeedlotOrchard table for seedlot number {}", seedlot.getId());
 
     saveSeedlotOrchards(seedlot, formStep4.orchardsId());
   }
 
   private void saveSeedlotOrchards(Seedlot seedlot, List<String> orchardIdList) {
     if (orchardIdList.isEmpty()) {
       log.info(
-          "No new records to be inserted in the SeedlotOrchard table for seedlot number {}",
+          "No new records to be inserted on the SeedlotOrchard table for seedlot number {}",
           seedlot.getId());
       return;
     }
 
     log.info(
-        "{} record(s) to be inserted in the SeedlotOrchard table for seedlot number {}",
+        "{} record(s) to be inserted on the SeedlotOrchard table for seedlot number {}",
         orchardIdList.size(),
         seedlot.getId());
 

diff --git a/backend/src/main/java/ca/bc/gov/backendstartapi/service/SeedlotOwnerQuantityService.java b/backend/src/main/java/ca/bc/gov/backendstartapi/service/SeedlotOwnerQuantityService.java
@@ -51,7 +51,7 @@ public List<SeedlotOwnerQuantity> saveSeedlotFormStep2(
 
     if (!soqList.isEmpty()) {
       log.info(
-          "{} previous records on SeedlotOwerQuantity table for seedlot number {}",
+          "{} previous records on the SeedlotOwerQuantity table for seedlot number {}",
           soqList.size(),
           seedlot.getId());
 
@@ -75,7 +75,7 @@ public List<SeedlotOwnerQuantity> saveSeedlotFormStep2(
 
       // Remove possible leftovers
       log.info(
-          "{} leftover record(s) in the SeedlotOwerQuantity table to remove for seedlot number {}",
+          "{} leftover record(s) on the SeedlotOwerQuantity table to remove for seedlot number {}",
           existingOwnerQtyIdList.size(),
           seedlot.getId());
 
@@ -98,13 +98,13 @@ private List<SeedlotOwnerQuantity> addSeedlotOwnerQuantityFromForm(
       Seedlot seedlot, List<SeedlotFormOwnershipDto> sfodList) {
     if (sfodList.isEmpty()) {
       log.info(
-          "No new records to be inserted in the SeedlotOwnerQuantity table for seedlot number {}",
+          "No new records to be inserted on the SeedlotOwnerQuantity table for seedlot number {}",
           seedlot.getId());
       return List.of();
     }
 
     log.info(
-        "{} record(s) to be inserted in the SeedlotOwnerQuantity table for seedlot number {}",
+        "{} record(s) to be inserted on the SeedlotOwnerQuantity table for seedlot number {}",
         sfodList.size(),
         seedlot.getId());
 

diff --git a/...c/main/java/ca/bc/gov/backendstartapi/service/SeedlotParentTreeGeneticQualityService.java b/...c/main/java/ca/bc/gov/backendstartapi/service/SeedlotParentTreeGeneticQualityService.java
@@ -51,6 +51,11 @@ public void saveSeedlotFormStep5(
             seedlot.getId());
 
     if (!sptgqList.isEmpty()) {
+      log.info(
+          "{} previous records on the SeedlotParentTreeGeneticQuality table for seedlot number {}",
+          sptgqList.size(),
+          seedlot.getId());
+
       List<SeedlotParentTreeGeneticQualityId> existingSeedlotPtGenQltyIdList =
           sptgqList.stream().map(x -> x.getId()).collect(Collectors.toList());
 
@@ -79,8 +84,8 @@ public void saveSeedlotFormStep5(
 
       // Remove possible leftovers
       log.info(
-          "{} record(s) in the SeedlotParentTreeGeneticQuality table to remove for seedlot number"
-              + " {}",
+          "{} leftover record(s) on SeedlotParentTreeGeneticQuality table to remove for seedlot"
+              + " number {}",
           existingSeedlotPtGenQltyIdList.size(),
           seedlot.getId());
       if (!existingSeedlotPtGenQltyIdList.isEmpty()) {
@@ -104,6 +109,20 @@ public void saveSeedlotFormStep5(
 
   private void addSeedlotParentTreeGenQlty(
       Seedlot seedlot, List<SeedlotFormParentTreeSmpDto> seedlotPtGenQltyToInsert) {
+    if (seedlotPtGenQltyToInsert.isEmpty()) {
+      log.info(
+          "No new records to be inserted on the SeedlotParentTreeGeneticQuality table for seedlot"
+              + " number {}",
+          seedlot.getId());
+      return;
+    }
+
+    log.info(
+        "{} record(s) to be inserted on the SeedlotParentTreeGeneticQuality table for seedlot"
+            + " number {}",
+        seedlotPtGenQltyToInsert.size(),
+        seedlot.getId());
+
     Map<SeedlotParentTreeId, SeedlotParentTree> sptMap =
         seedlotParentTreeService.getAllSeedlotParentTree(seedlot.getId()).stream()
             .collect(Collectors.toMap(SeedlotParentTree::getId, Function.identity()));

diff --git a/backend/src/main/java/ca/bc/gov/backendstartapi/service/SeedlotParentTreeService.java b/backend/src/main/java/ca/bc/gov/backendstartapi/service/SeedlotParentTreeService.java
@@ -47,6 +47,11 @@ public void saveSeedlotFormStep5(
         seedlotParentTreeRepository.findAllBySeedlot_id(seedlot.getId());
 
     if (!sptList.isEmpty()) {
+      log.info(
+          "{} previous records on the SeedlotParentTree table for seedlot number {}",
+          sptList.size(),
+          seedlot.getId());
+
       List<Integer> sptExistingList =
           new ArrayList<>(sptList.stream().map(e -> e.getParentTreeId()).toList());
 
@@ -63,9 +68,10 @@ public void saveSeedlotFormStep5(
 
       // Remove possible leftovers
       log.info(
-          "{} SeedlotParentTrees record(s) to remove for seedlot number {}",
+          "{} leftover record(s) on the SeedlotParentTree table to remove for seedlot number {}",
           sptExistingList.size(),
           seedlot.getId());
+
       List<SeedlotParentTreeId> sptiList = new ArrayList<>();
       for (Integer parentTreeId : sptExistingList) {
         sptiList.add(new SeedlotParentTreeId(seedlot.getId(), parentTreeId));
@@ -81,13 +87,27 @@ public void saveSeedlotFormStep5(
       return;
     }
 
-    log.info("No previous SeedlotParentTree records for seedlot number {}", seedlot.getId());
+    log.info(
+        "No previous records on the SeedlotParentTree table for seedlot number {}",
+        seedlot.getId());
 
     addSeedlotParentTree(seedlot, seedlotFormParentTreeDtoList);
   }
 
   private void addSeedlotParentTree(
       Seedlot seedlot, List<SeedlotFormParentTreeSmpDto> seedlotPtDtoList) {
+    if (seedlotPtDtoList.isEmpty()) {
+      log.info(
+          "No new records to be inserted on the SeedlotParentTree table for seedlot number {}",
+          seedlot.getId());
+      return;
+    }
+
+    log.info(
+        "{} record(s) to be inserted on the SeedlotParentTree table for seedlot number {}",
+        seedlotPtDtoList.size(),
+        seedlot.getId());
+
     List<SeedlotParentTree> seedlotPtListToInsert = new ArrayList<>();
 
     for (SeedlotFormParentTreeSmpDto seedlotPtDto : seedlotPtDtoList) {

diff --git a/backend/src/main/java/ca/bc/gov/backendstartapi/service/SeedlotParentTreeSmpMixService.java b/backend/src/main/java/ca/bc/gov/backendstartapi/service/SeedlotParentTreeSmpMixService.java
@@ -49,6 +49,11 @@ public void saveSeedlotFormStep5(
         seedlotParentTreeSmpMixRepository.findAllBySeedlotParentTree_Seedlot_id(seedlot.getId());
 
     if (!sptsmList.isEmpty()) {
+      log.info(
+          "{} previous records on the SeedlotParentTreeSmpMix table for seedlot number {}",
+          sptsmList.size(),
+          seedlot.getId());
+
       List<SeedlotParentTreeSmpMixId> sptsmExistingList =
           sptsmList.stream().map(x -> x.getId()).collect(Collectors.toList());
 
@@ -74,9 +79,11 @@ public void saveSeedlotFormStep5(
 
       // Remove possible leftovers
       log.info(
-          "{} record(s) in the SeedlotParentTreeSmpMix table to remove for seedlot number {}",
+          "{} leftover record(s) on the SeedlotParentTreeSmpMix table to remove for seedlot number"
+              + " {}",
           sptsmExistingList.size(),
           seedlot.getId());
+
       if (!sptsmExistingList.isEmpty()) {
         seedlotParentTreeSmpMixRepository.deleteAllByIdInBatch(sptsmExistingList);
         seedlotParentTreeSmpMixRepository.flush();
@@ -88,14 +95,29 @@ public void saveSeedlotFormStep5(
       return;
     }
 
-    log.info("No previous SeedlotParentTreeSmpMix records for seedlot number {}", seedlot.getId());
+    log.info(
+        "No previous records on the SeedlotParentTreeSmpMix table for seedlot number {}",
+        seedlot.getId());
 
     addSeedlotPtSmpMix(seedlot, seedlotFormParentTreeDtoList);
   }
 
   // Form Step 5 Seedlot Parent Tree SMP Fix related
   private void addSeedlotPtSmpMix(
       Seedlot seedlot, List<SeedlotFormParentTreeSmpDto> seedlotFormParentTreeDtoList) {
+    if (seedlotFormParentTreeDtoList.isEmpty()) {
+      log.info(
+          "No new records to be inserted on the SeedlotParentTreeSmpMix table for seedlot number"
+              + " {}",
+          seedlot.getId());
+      return;
+    }
+
+    log.info(
+        "{} record(s) to be inserted on the SeedlotParentTreeSmpMix table for seedlot number {}",
+        seedlotFormParentTreeDtoList.size(),
+        seedlot.getId());
+
     Map<Integer, SeedlotParentTree> sptMap =
         seedlotParentTreeService.getAllSeedlotParentTree(seedlot.getId()).stream()
             .collect(Collectors.toMap(SeedlotParentTree::getParentTreeId, Function.identity()));

diff --git a/backend/src/main/java/ca/bc/gov/backendstartapi/service/SmpMixGeneticQualityService.java b/backend/src/main/java/ca/bc/gov/backendstartapi/service/SmpMixGeneticQualityService.java
@@ -49,6 +49,11 @@ public void saveSeedlotFormStep5(
         smpMixGeneticQualityRepository.findAllBySmpMix_Seedlot_id(seedlot.getId());
 
     if (!smpMixGenQltyList.isEmpty()) {
+      log.info(
+          "{} previous records on the SmpMixGeneticQuality table for seedlot number {}",
+          smpMixGenQltyList.size(),
+          seedlot.getId());
+
       List<SmpMixGeneticQualityId> existingSmpMixGenQltyIdList =
           smpMixGenQltyList.stream().map(x -> x.getId()).collect(Collectors.toList());
 
@@ -73,8 +78,10 @@ public void saveSeedlotFormStep5(
 
       // Remove possible leftovers
       log.info(
-          "{} SmpMixGeneticQuality record(s) to remove for seedlot number {}",
-          existingSmpMixGenQltyIdList.size());
+          "{} leftover record(s) on the SmpMixGeneticQuality table to remove for seedlot number {}",
+          existingSmpMixGenQltyIdList.size(),
+          seedlot.getId());
+
       if (!existingSmpMixGenQltyIdList.isEmpty()) {
         smpMixGeneticQualityRepository.deleteAllByIdInBatch(existingSmpMixGenQltyIdList);
         smpMixGeneticQualityRepository.flush();
@@ -86,14 +93,28 @@ public void saveSeedlotFormStep5(
       return;
     }
 
-    log.info("No previous SmpMixGeneticQuality records for seedlot number {}", seedlot.getId());
+    log.info(
+        "No previous records on the SmpMixGeneticQuality table for seedlot number {}",
+        seedlot.getId());
 
     addSmpMixGenQlty(seedlot, seedlotFormParentTreeDtoList);
   }
 
   // Form Step 5 SMP Mix Genetic Quality related
   private void addSmpMixGenQlty(
       Seedlot seedlot, List<SeedlotFormParentTreeSmpDto> seedlotFormParentTreeDtoList) {
+    if (seedlotFormParentTreeDtoList.isEmpty()) {
+      log.info(
+          "No new records to be inserted on the SmpMixGeneticQuality table for seedlot number {}",
+          seedlot.getId());
+      return;
+    }
+
+    log.info(
+        "{} record(s) to be inserted on the SmpMixGeneticQuality table for seedlot number {}",
+        seedlotFormParentTreeDtoList.size(),
+        seedlot.getId());
+
     Map<Integer, SmpMix> smMap =
         smpMixService.getAllBySeedlotNumber(seedlot.getId()).stream()
             .collect(Collectors.toMap(SmpMix::getParentTreeId, Function.identity()));