check for peps country code uniqueness

1 files changed, 26 insertions, 19 deletions

diff --git a/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/validation/moaconfig/StorkConfigValidator.java b/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/validation/moaconfig/StorkConfigValidator.java
index 5ec3af519..f7d61653d 100644
--- a/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/validation/moaconfig/StorkConfigValidator.java
+++ b/id/ConfigWebTool/src/main/java/at/gv/egovernment/moa/id/configuration/validation/moaconfig/StorkConfigValidator.java
@@ -32,29 +32,27 @@ public class StorkConfigValidator {
 				if(null == current)
 					continue;
 				
-				if(null == current.getHjid()) {
-					// check country code
-					String check = current.getCountryCode();
-					if (MiscUtil.isNotEmpty(check)) {
-						if (ValidationHelper.containsPotentialCSSCharacter(check, false)) {
-							log.warn("CPEPS config countrycode contains potentail XSS characters: " + check);
+				// check country code
+				String check = current.getCountryCode();
+				if (MiscUtil.isNotEmpty(check)) {
+					if (ValidationHelper.containsPotentialCSSCharacter(check, false)) {
+						log.warn("CPEPS config countrycode contains potentail XSS characters: " + check);
+						errors.add(LanguageHelper.getErrorString("validation.stork.cpeps.cc",
+								new Object[] {ValidationHelper.getPotentialCSSCharacter(false)}, request ));
+					}
+					if(!check.toLowerCase().matches("^[a-z][a-z]$")) {
+							log.warn("CPEPS config countrycode does not comply to ISO 3166-2 : " + check);
 							errors.add(LanguageHelper.getErrorString("validation.stork.cpeps.cc",
-									new Object[] {ValidationHelper.getPotentialCSSCharacter(false)}, request ));
-						}
-						if(!check.toLowerCase().matches("^[a-z][a-z]$")) {
-								log.warn("CPEPS config countrycode does not comply to ISO 3166-2 : " + check);
-								errors.add(LanguageHelper.getErrorString("validation.stork.cpeps.cc",
-										new Object[] {check}, request ));
-						}
-					} else {
-						log.warn("CPEPS config countrycode is empty : " + check);
-						errors.add(LanguageHelper.getErrorString("validation.stork.cpeps.empty",
-								new Object[] {check}, request ));
+									new Object[] {check}, request ));
 					}
+				} else {
+					log.warn("CPEPS config countrycode is empty : " + check);
+					errors.add(LanguageHelper.getErrorString("validation.stork.cpeps.empty",
+							new Object[] {check}, request ));
 				}
-	
+
 				// check url
-				String check = current.getURL();
+				check = current.getURL();
 				if (MiscUtil.isNotEmpty(check)) {
 					if (!ValidationHelper.validateURL(check)) {
 						log.info("CPEPS config URL is invalid : " + check);
@@ -66,6 +64,15 @@ public class StorkConfigValidator {
 							new Object[] {check}, request ));
 				}
 			}
+
+			// ensure uniqueness of country code
+			for (CPEPS one : form.getCpepslist())
+				for (CPEPS another : form.getCpepslist())
+					if (null != one && null != another)
+						if (!one.equals(another) && one.getCountryCode().equals(another.getCountryCode())) {
+							errors.add(LanguageHelper.getErrorString("validation.stork.cpeps.duplicate", request));
+							break;
+						}
 		}
 
 		// check qaa