Merge pull request #243 from NASA-PDS/fix-outstanding-comments

Fix outstanding comments
NASA-PDS · Feb 1, 2023 · 440bfea · 440bfea
2 parents 39b37a5 + 341e31b
commit 440bfea
Show file tree

Hide file tree

Showing 8 changed files with 38 additions and 26 deletions.
diff --git a/service/src/main/java/gov/nasa/pds/api/registry/controller/URIParameters.java b/service/src/main/java/gov/nasa/pds/api/registry/controller/URIParameters.java
@@ -122,7 +122,7 @@ public URIParameters setLimit(Integer limit)
 	}
 	public URIParameters setProductIdentifier(ControlContext control) throws IOException, LidVidNotFoundException
 	{
-		this.productIdentifier = LidVidUtils.resolve(this.getIdentifier(), ProductVersionSelector.SPECIFIC,
+		this.productIdentifier = LidVidUtils.resolve(this.getIdentifier(), ProductVersionSelector.TYPED,
 				control, RequestBuildContextFactory.empty());
 		return this;
 	}

diff --git a/service/src/main/java/gov/nasa/pds/api/registry/model/ProductVersionSelector.java b/service/src/main/java/gov/nasa/pds/api/registry/model/ProductVersionSelector.java
@@ -1,11 +1,11 @@
 package gov.nasa.pds.api.registry.model;
 
 /**
- * Used by API calls, such as "/bundles/{lidvid}/collections", 
- * "/bundles/{lidvid}/collections/latest", 
- * "/bundles/{lidvid}/collections/all", etc., 
+ * Used by API calls, such as "/bundles/{lidvid}/collections",
+ * "/bundles/{lidvid}/collections/latest",
+ * "/bundles/{lidvid}/collections/all", etc.,
  * to select product versions.
- * 
+ *
  * @author karpenko
  */
 public enum ProductVersionSelector
@@ -17,13 +17,13 @@ public enum ProductVersionSelector
     /**
      * All versions of a product
      */
-    ALL, 
+    ALL,
     /**
      * Latest version of a product
      */
     LATEST,
     /**
      * A specified version of a product
      */
-    SPECIFIC
+    TYPED
 }
diff --git a/service/src/main/java/gov/nasa/pds/api/registry/model/RefLogicAny.java b/service/src/main/java/gov/nasa/pds/api/registry/model/RefLogicAny.java
@@ -31,7 +31,7 @@ private boolean isGrandchild (ReferencingLogicTransmuter idType)
 	private ReferencingLogicTransmuter resolveID (ControlContext context, UserContext input)
 			throws IOException, LidVidNotFoundException, UnknownGroupNameException
 	{
-		PdsProductIdentifier productIdentifier = LidVidUtils.resolve(input.getIdentifier(), ProductVersionSelector.SPECIFIC, context, RequestBuildContextFactory.empty());
+		PdsProductIdentifier productIdentifier = LidVidUtils.resolve(input.getIdentifier(), ProductVersionSelector.TYPED, context, RequestBuildContextFactory.empty());
 		return ReferencingLogicTransmuter.getByProductClass(
 				QuickSearch.getValue(context.getConnection(), input.getSelector() == ProductVersionSelector.LATEST,
 			             productIdentifier != null ? productIdentifier.toString() : "", "product_class"));

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/RequestAndResponseContext.java b/service/src/main/java/gov/nasa/pds/api/registry/model/RequestAndResponseContext.java
@@ -93,7 +93,7 @@ private RequestAndResponseContext(
     		GroupConstraint outPreset, GroupConstraint resPreset // criteria for defining last node (outPreset) and first node (resOutput) for any endpoint
     		) throws ApplicationTypeException,LidVidNotFoundException,IOException
     {
-		ProductVersionSelector versionSelectionScope = outPreset.equals(resPreset) ? parameters.getSelector() : ProductVersionSelector.SPECIFIC;
+		ProductVersionSelector versionSelectionScope = outPreset.equals(resPreset) ? parameters.getSelector() : ProductVersionSelector.TYPED;
 
 		Map<String, ProductBusinessLogic> formatters = new HashMap<String, ProductBusinessLogic>();
     	formatters.put("*/*", new PdsProductBusinessObject());

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
@@ -5,7 +5,6 @@
 import java.util.Collection;
 import java.util.Collections;
 import java.util.List;
-import java.util.stream.Collectors;
 
 import gov.nasa.pds.api.registry.model.ProductVersionSelector;
 import gov.nasa.pds.api.registry.model.ReferencingLogicTransmuter;
@@ -52,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());
 			}
 		}
 
@@ -109,12 +108,12 @@ public static List<String> getAllLidVidsByLids(
     }
 
     public static PdsProductIdentifier resolve (
-    		String _identifier,
+    		String productIdentifierString,
     		ProductVersionSelector scope,
     		ControlContext ctlContext,
     		RequestBuildContext reqContext) throws IOException, LidVidNotFoundException
     {
-		PdsProductIdentifier productIdentifier = PdsProductIdentifier.fromString(_identifier);
+		PdsProductIdentifier productIdentifier = PdsProductIdentifier.fromString(productIdentifierString);
     	PdsProductIdentifier result = null;
 
     	if (productIdentifier != null)
@@ -132,7 +131,7 @@ public static PdsProductIdentifier resolve (
 //				to force that kind of resolution.
 				result = productIdentifier instanceof PdsLidVid ? productIdentifier : LidVidUtils.getLatestLidVidByLid(ctlContext, reqContext, productIdentifier.getLid().toString());
     			break;
-    		case SPECIFIC:
+    		case TYPED:
 				result = productIdentifier instanceof PdsLidVid ? productIdentifier : LidVidUtils.getLatestLidVidByLid(ctlContext, reqContext, productIdentifier.getLid().toString());
     			break;
     		case ORIGINAL: throw new LidVidNotFoundException("ProductVersionSelector.ORIGINAL not supported");