[MODEXPW-528] Address comments

folio-org · Dec 9, 2024 · 57e340c · 57e340c
1 parent ae43719
commit 57e340c
Show file tree

Hide file tree

Showing 6 changed files with 18 additions and 17 deletions.
diff --git a/descriptors/ModuleDescriptor-template.json b/descriptors/ModuleDescriptor-template.json
@@ -106,6 +106,10 @@
       "id": "orders-storage.po-lines",
       "version": "12.1"
     },
+    {
+      "id": "orders-storage.pieces",
+      "version": "5.0"
+    },
     {
       "id": "organizations.organizations",
       "version": "1.2"

diff --git a/...n/java/org/folio/dew/batch/acquisitions/edifact/exceptions/EntitiesNotFoundException.java b/...n/java/org/folio/dew/batch/acquisitions/edifact/exceptions/EntitiesNotFoundException.java
diff --git a/src/main/java/org/folio/dew/batch/acquisitions/edifact/jobs/MapToEdifactClaimsTasklet.java b/src/main/java/org/folio/dew/batch/acquisitions/edifact/jobs/MapToEdifactClaimsTasklet.java
@@ -7,11 +7,11 @@
 
 import org.apache.commons.collections4.CollectionUtils;
 import org.folio.dew.batch.acquisitions.edifact.PurchaseOrdersToEdifactMapper;
-import org.folio.dew.batch.acquisitions.edifact.exceptions.EntitiesNotFoundException;
 import org.folio.dew.batch.acquisitions.edifact.services.OrdersService;
 import org.folio.dew.domain.dto.Piece;
 import org.folio.dew.domain.dto.VendorEdiOrdersExportConfig;
 import org.folio.dew.domain.dto.acquisitions.edifact.EdifactExportHolder;
+import org.folio.dew.error.NotFoundException;
 import org.springframework.batch.core.configuration.annotation.StepScope;
 import org.springframework.batch.core.scope.context.ChunkContext;
 import org.springframework.stereotype.Component;
@@ -39,7 +39,7 @@ protected List<String> getExportConfigMissingFields(VendorEdiOrdersExportConfig
   protected EdifactExportHolder buildEdifactExportHolder(ChunkContext chunkContext, VendorEdiOrdersExportConfig ediExportConfig, Map<String, Object> jobParameters) {
     var pieces = ordersService.getPiecesByIdsAndReceivingStatus(ediExportConfig.getClaimPieceIds(), Piece.ReceivingStatusEnum.LATE);
     if (pieces.isEmpty()) {
-      throw new EntitiesNotFoundException(Piece.class);
+      throw new NotFoundException(Piece.class);
     }
 
     var poLineQuery = convertIdsToCqlQuery(pieces.stream().map(Piece::getPoLineId).toList());

diff --git a/src/main/java/org/folio/dew/batch/acquisitions/edifact/jobs/MapToEdifactTasklet.java b/src/main/java/org/folio/dew/batch/acquisitions/edifact/jobs/MapToEdifactTasklet.java
@@ -14,7 +14,6 @@
 import org.folio.dew.batch.acquisitions.edifact.PurchaseOrdersToEdifactMapper;
 import org.folio.dew.batch.acquisitions.edifact.exceptions.CompositeOrderMappingException;
 import org.folio.dew.batch.acquisitions.edifact.exceptions.EdifactException;
-import org.folio.dew.batch.acquisitions.edifact.exceptions.EntitiesNotFoundException;
 import org.folio.dew.batch.acquisitions.edifact.services.OrdersService;
 import org.folio.dew.domain.dto.CompositePoLine;
 import org.folio.dew.domain.dto.CompositePurchaseOrder;
@@ -23,6 +22,7 @@
 import org.folio.dew.domain.dto.PurchaseOrder;
 import org.folio.dew.domain.dto.VendorEdiOrdersExportConfig;
 import org.folio.dew.domain.dto.acquisitions.edifact.EdifactExportHolder;
+import org.folio.dew.error.NotFoundException;
 import org.springframework.batch.core.StepContribution;
 import org.springframework.batch.core.scope.context.ChunkContext;
 import org.springframework.batch.core.step.tasklet.Tasklet;
@@ -90,7 +90,7 @@ protected List<CompositePurchaseOrder> getCompositeOrders(String poLineQuery) {
 
     log.debug("getCompositeOrders:: {}", compOrders);
     if (compOrders.isEmpty()) {
-      throw new EntitiesNotFoundException(PurchaseOrder.class);
+      throw new NotFoundException(PurchaseOrder.class);
     }
     return compOrders;
   }

diff --git a/src/main/java/org/folio/dew/error/NotFoundException.java b/src/main/java/org/folio/dew/error/NotFoundException.java
@@ -1,7 +1,15 @@
 package org.folio.dew.error;
 
 public class NotFoundException extends RuntimeException {
+
+  private static final String EXCEPTION_MESSAGE = "Entities not found: %s";
+
+  public NotFoundException(Class<?> entityClass) {
+    super(EXCEPTION_MESSAGE.formatted(entityClass.getSimpleName()), null, false, false);
+  }
+
   public NotFoundException(String message) {
     super(message);
   }
+
 }
diff --git a/src/main/java/org/folio/dew/utils/QueryUtils.java b/src/main/java/org/folio/dew/utils/QueryUtils.java
@@ -23,6 +23,8 @@ public class QueryUtils {
   private static final String CQL_UNDEFINED_FIELD_EXPRESSION = CQL_NEGATE_PREFIX + "%s=\"\"";
   private static final Pattern CQL_SORT_BY_PATTERN = Pattern.compile("(.*)(\\ssortBy\\s.*)", Pattern.CASE_INSENSITIVE); //NOSONAR
 
+  private QueryUtils() {}
+
   public static String encodeQuery(String query) {
     return URLEncoder.encode(query, StandardCharsets.UTF_8);
   }
@@ -114,6 +116,4 @@ public static String getCqlExpressionForFieldNullValue(String fieldName) {
     return String.format(CQL_UNDEFINED_FIELD_EXPRESSION, fieldName);
   }
 
-  private QueryUtils() {}
-
 }