Added a check to MetalotServiceImpl to see if newly generated parent …

…corpName already exists. If the corpName already exists, the service will now keep generating corpNames and re-checking until it finds a unique one. This replaces logic that only re-tried once and then errored out.

src/main/java/com/labsynch/cmpdreg/service/MetalotServiceImpl.java

@@ -323,15 +323,13 @@ public MetalotReturn processAndSave(Metalot metaLot, MetalotReturn mr, ArrayList
 
 					parent.setMolFormula(chemService.getMolFormula(parent.getMolStructure()));
 					//add unique constraint to parent corp name as well (parent and lot)
-					try {
-						logger.debug("Saving new parent with corp name "+parent.getCorpName()+" and parent number "+parent.getParentNumber());
-						parent.persist();
-					} catch (Exception e){
-						logger.error("Caught an exception saving the parent: " + e);
-						//get a new corp name and try saving again
+					boolean corpNameAlreadyExists = checkCorpNameAlreadyExists(parent.getCorpName());
+					while (corpNameAlreadyExists) {
 						generateAndSetCorpName(parent);
-						parent.persist();
+						corpNameAlreadyExists = checkCorpNameAlreadyExists(parent.getCorpName());
 					}
+					logger.debug("Saving new parent with corp name "+parent.getCorpName()+" and parent number "+parent.getParentNumber());
+					parent.persist();
 				} 
 			}
 
@@ -816,6 +814,14 @@ private void generateAndSetCorpName(Parent parent) throws MalformedURLException,
 			parent.setParentNumber(corpName.getCorpNumber());
 		}
 	}
+
+	private boolean checkCorpNameAlreadyExists(String corpName) {
+		if (Parent.countFindParentsByCorpNameEquals(corpName) > 0L){
+			return true;
+		}else {
+			return false;
+		}
+	}
 
 
 }