fix: orchard null bec zone code and draft timestamp (#1477)

bcgov · Aug 2, 2024 · 9332655 · 9332655
1 parent f5ac5f8
commit 9332655
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 3 deletions.
diff --git a/backend/src/main/java/ca/bc/gov/backendstartapi/service/SaveSeedlotFormService.java b/backend/src/main/java/ca/bc/gov/backendstartapi/service/SaveSeedlotFormService.java
@@ -86,6 +86,10 @@ public RevisionCountDto saveFormClassA(
       entityToSave.setProgressStatus(parsedProgressStatus);
     }
 
+    relatedSeedlot.setAuditInformation(loggedUserService.createAuditCurrentUser());
+
+    seedlotRepository.save(relatedSeedlot);
+
     SaveSeedlotProgressEntityClassA saved = saveSeedlotProgressRepositoryClassA.save(entityToSave);
 
     SparLog.info("A-class seedlot progress for seedlot number {} saved!", seedlotNumber);

diff --git a/oracle-api/src/main/java/ca/bc/gov/oracleapi/service/OrchardService.java b/oracle-api/src/main/java/ca/bc/gov/oracleapi/service/OrchardService.java
@@ -62,10 +62,16 @@ public Optional<OrchardDto> findNotRetiredOrchardValidLotType(String id) {
       }
 
       List<String> bacZones = new ArrayList<>(1);
-      bacZones.add(orchardEntity.getBecZoneCode());
+      if (orchardEntity.getBecZoneCode() != null) {
+        bacZones.add(orchardEntity.getBecZoneCode());
+      }
+
       Map<String, String> becZoneDescMap =
           sparBecCatalogueService.getBecDescriptionsByCode(bacZones);
 
+      String becZoneDescription =
+          becZoneDescMap.isEmpty() ? null : becZoneDescMap.get(orchardEntity.getBecZoneCode());
+
       OrchardDto orchardDto =
           new OrchardDto(
               orchardEntity.getId(),
@@ -75,7 +81,7 @@ public Optional<OrchardDto> findNotRetiredOrchardValidLotType(String id) {
               orchardLotTypeCode.getDescription(),
               orchardEntity.getStageCode(),
               orchardEntity.getBecZoneCode(),
-              becZoneDescMap.get(orchardEntity.getBecZoneCode()),
+              becZoneDescription,
               orchardEntity.getBecSubzoneCode(),
               orchardEntity.getVariant(),
               orchardEntity.getBecVersionId());

diff --git a/oracle-api/src/main/java/ca/bc/gov/oracleapi/service/SparBecCatalogueService.java b/oracle-api/src/main/java/ca/bc/gov/oracleapi/service/SparBecCatalogueService.java
@@ -21,7 +21,8 @@ public class SparBecCatalogueService {
    * null.
    */
   public Map<String, String> getBecDescriptionsByCode(List<String> becZoneCodes) {
-    SparLog.info("Begin service request to find the description of a given BEC zone code");
+    SparLog.info(
+        "Begin service request to find the description of a given BEC zone code {}", becZoneCodes);
 
     if (becZoneCodes.isEmpty()) {
       SparLog.info("No BEC Zone code param, returning empty values for BEC zone descriptions");