Merge pull request #683 from REGnosys/story/586/sending-condition-name

Story 658 - sending Condition name in error message for all DataRule validationType
finos · Nov 6, 2023 · f75a074 · f75a074
2 parents 8510d1c + fd229b4
commit f75a074
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 15 deletions.
diff --git a/...lang/src/main/java/com/regnosys/rosetta/generator/java/condition/ConditionGenerator.xtend b/...lang/src/main/java/com/regnosys/rosetta/generator/java/condition/ConditionGenerator.xtend
@@ -100,8 +100,8 @@ class ConditionGenerator {
 						}
 						
 						String «defaultClassFailureMessageId» = «defaultClassResultId».getError();
-						if («defaultClassFailureMessageId» == null) {
-							«defaultClassFailureMessageId» = "Condition " + NAME + " failed.";
+						if («defaultClassFailureMessageId» == null || «defaultClassFailureMessageId».contains("Null") || «defaultClassFailureMessageId» == "") {
+							«defaultClassFailureMessageId» = "Condition has failed.";
 						}
 						return «ValidationResult».failure(NAME, «ValidationType».DATA_RULE, "«rosettaClass.name»", «defaultClassPathId», DEFINITION, «defaultClassFailureMessageId»);
 					}

diff --git a/rosetta-runtime/src/main/java/com/rosetta/model/lib/expression/ExpressionOperators.java b/rosetta-runtime/src/main/java/com/rosetta/model/lib/expression/ExpressionOperators.java
@@ -46,11 +46,7 @@ public static <T> ComparisonResult exists(Mapper<T> o) {
 		if (o.resultCount()>0) {
 			return ComparisonResult.success();
 		}
-		String failureMessage = null;
-		if (o.getErrorPaths()!= null && !o.getErrorPaths().isEmpty()){
-			failureMessage = o.getErrorPaths() + " does not exist";
-		}
-		return ComparisonResult.failure(failureMessage);
+		return ComparisonResult.failure(o.getErrorPaths() + " does not exist");
 	}
 
 	// singleExists

diff --git a/rosetta-runtime/src/main/java/com/rosetta/model/lib/validation/ValidationResult.java b/rosetta-runtime/src/main/java/com/rosetta/model/lib/validation/ValidationResult.java
@@ -83,7 +83,7 @@ public String getDefinition() {
 
 		@Override
 		public Optional<String> getFailureReason() {
-			if (failureReason.isPresent() && modelObjectName.endsWith("Report") && failureReason.get().contains(modelObjectName)) {
+			if (failureReason.isPresent() && modelObjectName.endsWith("Report") && ValidationType.DATA_RULE.equals(validationType)) {
 				return getUpdatedFailureReason();
 			}
 			return failureReason;
@@ -113,6 +113,7 @@ private Optional<String> getUpdatedFailureReason() {
 			failReason = failReason.replaceAll(modelObjectName, "");
 			failReason = failReason.replaceAll("->get", " ");
 			failReason = failReason.replaceAll("[^\\w-]+", " ");
+			failReason = failReason.replaceAll("^\\s+", "");
 
 			return Optional.of(conditionName + ":- " + failReason);
 		}
@@ -268,4 +269,4 @@ public RosettaPath getPath() {
 			return path;
 		}
 	}
-}
+}
diff --git a/...g/src/test/java/com/regnosys/rosetta/generator/java/condition/DataRuleGeneratorTest.xtend b/...g/src/test/java/com/regnosys/rosetta/generator/java/condition/DataRuleGeneratorTest.xtend
@@ -81,8 +81,8 @@ class DataRuleGeneratorTest {
 							}
 							
 							String failureMessage = result.getError();
-							if (failureMessage == null) {
-								failureMessage = "Condition " + NAME + " failed.";
+							if (failureMessage == null || failureMessage.contains("Null") || failureMessage == "") {
+								failureMessage = "Condition has failed.";
 							}
 							return ValidationResult.failure(NAME, ValidationType.DATA_RULE, "Foo", path, DEFINITION, failureMessage);
 						}
@@ -198,8 +198,8 @@ class DataRuleGeneratorTest {
 							}
 							
 							String failureMessage = result.getError();
-							if (failureMessage == null) {
-								failureMessage = "Condition " + NAME + " failed.";
+							if (failureMessage == null || failureMessage.contains("Null") || failureMessage == "") {
+								failureMessage = "Condition has failed.";
 							}
 							return ValidationResult.failure(NAME, ValidationType.DATA_RULE, "Foo", path, DEFINITION, failureMessage);
 						}

diff --git a/...ng/src/test/java/com/regnosys/rosetta/generator/java/function/FunctionGeneratorTest.xtend b/...ng/src/test/java/com/regnosys/rosetta/generator/java/function/FunctionGeneratorTest.xtend
@@ -4510,8 +4510,8 @@ class FunctionGeneratorTest {
 							}
 							
 							String failureMessage = result.getError();
-							if (failureMessage == null) {
-								failureMessage = "Condition " + NAME + " failed.";
+							if (failureMessage == null || failureMessage.contains("Null") || failureMessage == "") {
+								failureMessage = "Condition has failed.";
 							}
 							return ValidationResult.failure(NAME, ValidationType.DATA_RULE, "Foo", path, DEFINITION, failureMessage);
 						}