extract context-specific exception handler to calling contexts

NASA-PDS · Feb 1, 2023 · 341e31b · 341e31b
1 parent dcc78bb
commit 341e31b
Show file tree

Hide file tree

Showing 4 changed files with 26 additions and 13 deletions.
diff --git a/service/src/main/java/gov/nasa/pds/api/registry/model/RefLogicBundle.java b/service/src/main/java/gov/nasa/pds/api/registry/model/RefLogicBundle.java
@@ -161,12 +161,17 @@ static private Pagination<String> getBundleCollectionLidVids(
 
         // Get the latest versions of LIDs
         List<PdsProductIdentifier> productIdentifiers = lidStrings.stream().map(PdsProductIdentifier::fromString).collect(Collectors.toList());
-        List<PdsLidVid> latestLidVids = LidVidUtils.getLatestLidVidsForProductIdentifiers(
-                ctlContext,
-                RequestBuildContextFactory.given(true, "lid", ReferencingLogicTransmuter.Collection.impl().constraints()),
-                productIdentifiers);
-        List<String> latestLidVidStrings = latestLidVids.stream().map(PdsLidVid::toString).collect(Collectors.toList());
-        lidvids.addAll(latestLidVidStrings);
+        try {
+            List<PdsLidVid> latestLidVids = LidVidUtils.getLatestLidVidsForProductIdentifiers(
+                    ctlContext,
+                    RequestBuildContextFactory.given(true, "lid", ReferencingLogicTransmuter.Collection.impl().constraints()),
+                    productIdentifiers);
+            List<String> latestLidVidStrings = latestLidVids.stream().map(PdsLidVid::toString).collect(Collectors.toList());
+            lidvids.addAll(latestLidVidStrings);
+        } catch (LidVidNotFoundException e) {
+            log.error("Database referential integrity error -  LID is referenced but does not exist in db: " + e.toString());
+        }
+
         return lidvids;
     }
 

diff --git a/service/src/main/java/gov/nasa/pds/api/registry/model/RefLogicCollection.java b/service/src/main/java/gov/nasa/pds/api/registry/model/RefLogicCollection.java
@@ -114,9 +114,13 @@ static Pagination<String> parents (ControlContext control, ProductVersionSelecto
 			bundleLidvids.addAll(LidVidUtils.getAllLidVidsByLids(control, RequestBuildContextFactory.empty(), sortedLidStrings));
 		}
         else {
-			List<PdsLidVid> latestLidvids = LidVidUtils.getLatestLidVidsForProductIdentifiers(control, RequestBuildContextFactory.empty(), sortedLids);
-			List<String> latestLidVidStrings = latestLidvids.stream().map(PdsLidVid::toString).collect(Collectors.toList());
-			bundleLidvids.addAll(latestLidVidStrings);
+			try {
+				List<PdsLidVid> latestLidvids = LidVidUtils.getLatestLidVidsForProductIdentifiers(control, RequestBuildContextFactory.empty(), sortedLids);
+				List<String> latestLidVidStrings = latestLidvids.stream().map(PdsLidVid::toString).collect(Collectors.toList());
+				bundleLidvids.addAll(latestLidVidStrings);
+			} catch (LidVidNotFoundException e) {
+				log.error("Database referential integrity error -  LID is referenced but does not exist in db: " + e.toString());
+			}
 		}
 
 

diff --git a/service/src/main/java/gov/nasa/pds/api/registry/model/RefLogicProduct.java b/service/src/main/java/gov/nasa/pds/api/registry/model/RefLogicProduct.java
@@ -81,9 +81,13 @@ static Pagination<String> parents (ControlContext control, ProductVersionSelecto
 			parents.addAll (LidVidUtils.getAllLidVidsByLids(control, RequestBuildContextFactory.empty(), sortedLidStrings));
 		}
         else{
-			List<PdsLidVid> latestLidVids = LidVidUtils.getLatestLidVidsForProductIdentifiers(control, RequestBuildContextFactory.empty(), sortedLids);
-			List<String> latestLidVidStrings = latestLidVids.stream().map(PdsLidVid::toString).collect(Collectors.toList());
-			parents.addAll(latestLidVidStrings);
+			try{
+				List<PdsLidVid> latestLidVids = LidVidUtils.getLatestLidVidsForProductIdentifiers(control, RequestBuildContextFactory.empty(), sortedLids);
+				List<String> latestLidVidStrings = latestLidVids.stream().map(PdsLidVid::toString).collect(Collectors.toList());
+				parents.addAll(latestLidVidStrings);
+			} catch (LidVidNotFoundException e) {
+				log.error("Database referential integrity error -  LID is referenced but does not exist in db: " + e.toString());
+			}
 		}
 
         return parents;

diff --git a/service/src/main/java/gov/nasa/pds/api/registry/model/identifiers/LidVidUtils.java b/service/src/main/java/gov/nasa/pds/api/registry/model/identifiers/LidVidUtils.java
@@ -51,7 +51,7 @@ public static List<PdsLidVid> getLatestLidVidsForProductIdentifiers(
 				PdsLidVid latestLidVid = LidVidUtils.getLatestLidVidByLid(ctlContext, reqContext, id.getLid().toString());
 				lidVids.add(latestLidVid);
 			} catch (LidVidNotFoundException e) {
-				log.error("Database is corrupted. Have reference to LID but cannot find it: " + id.getLid().toString());
+				throw new LidVidNotFoundException("Could not find any LIDVIDs for LID " + id.getLid().toString());
 			}
 		}