Merge pull request BroadleafCommerce#73 from BroadleafCommerce/qa-925-detailed-error-on-promotion

Show detailed validation error message on promotion failure

Author: phillipuniverse

admin/broadleaf-open-admin-platform/src/main/java/org/broadleafcommerce/openadmin/server/service/persistence/PersistenceManagerImpl.java

@@ -30,6 +30,7 @@
 import org.broadleafcommerce.common.exception.ServiceException;
 import org.broadleafcommerce.common.money.Money;
 import org.broadleafcommerce.common.presentation.client.OperationType;
+import org.broadleafcommerce.common.util.ValidationUtil;
 import org.broadleafcommerce.openadmin.dto.BasicFieldMetadata;
 import org.broadleafcommerce.openadmin.dto.ClassMetadata;
 import org.broadleafcommerce.openadmin.dto.CriteriaTransferObject;
@@ -438,7 +439,9 @@ public PersistenceResponse add(PersistencePackage persistencePackage) throws Ser
 
         if (response.isValidationFailure()) {
             PersistenceResponse validationResponse = executeValidationProcessors(persistencePackage, new PersistenceResponse().withEntity(response));
-            throw new ValidationException(validationResponse.getEntity(), "The entity has failed validation");
+            Entity entity = validationResponse.getEntity();
+            String message = ValidationUtil.buildErrorMessage(entity.getPropertyValidationErrors(), entity.getGlobalValidationErrors());
+            throw new ValidationException(entity, message);
         }
 
         return executePostAddHandlers(persistencePackage, new PersistenceResponse().withEntity(response));
@@ -577,7 +580,9 @@ public PersistenceResponse update(PersistencePackage persistencePackage) throws
 
         if (response.isValidationFailure()) {
             PersistenceResponse validationResponse = executeValidationProcessors(persistencePackage, new PersistenceResponse().withEntity(response));
-            throw new ValidationException(validationResponse.getEntity(), "The entity has failed validation");
+            Entity entity = validationResponse.getEntity();
+            String message = ValidationUtil.buildErrorMessage(entity.getPropertyValidationErrors(), entity.getGlobalValidationErrors());
+            throw new ValidationException(entity, message);
         }
 
         return executePostUpdateHandlers(persistencePackage, new PersistenceResponse().withEntity(response));

admin/broadleaf-open-admin-platform/src/main/java/org/broadleafcommerce/openadmin/server/service/persistence/module/BasicPersistenceModule.java

@@ -40,6 +40,7 @@
 import org.broadleafcommerce.common.presentation.client.SupportedFieldType;
 import org.broadleafcommerce.common.presentation.client.VisibilityEnum;
 import org.broadleafcommerce.common.util.FormatUtil;
+import org.broadleafcommerce.common.util.ValidationUtil;
 import org.broadleafcommerce.common.util.dao.TQJoin;
 import org.broadleafcommerce.common.util.dao.TQOrder;
 import org.broadleafcommerce.common.util.dao.TQRestriction;
@@ -110,7 +111,6 @@
 import java.util.Comparator;
 import java.util.Date;
 import java.util.HashMap;
-import java.util.Iterator;
 import java.util.List;
 import java.util.Locale;
 import java.util.Map;
@@ -411,20 +411,8 @@ public int compare(Property o1, Property o2) {
                 invalid.setPropertyValidationErrors(entity.getPropertyValidationErrors());
                 invalid.overridePropertyValues(entity);
 
-                StringBuilder sb = new StringBuilder();
-                for (Map.Entry<String, List<String>> entry : invalid.getPropertyValidationErrors().entrySet()) {
-                    Iterator<String> itr = entry.getValue().iterator();
-                    while (itr.hasNext()) {
-                        sb.append(entry.getKey());
-                        sb.append(" : ");
-                        sb.append(itr.next());
-                        if (itr.hasNext()) {
-                            sb.append(" / ");
-                        }
-                    }
-                }
-
-                throw new ValidationException(invalid, "The entity has failed validation - " + sb.toString());
+                String message = ValidationUtil.buildErrorMessage(invalid.getPropertyValidationErrors(), invalid.getGlobalValidationErrors());
+                throw new ValidationException(invalid, message);
             } else if (entityPersistenceException != null) {
                 throw ExceptionHelper.refineException(entityPersistenceException.getCause());
             } else {

common/src/main/java/org/broadleafcommerce/common/util/ValidationUtil.java

@@ -0,0 +1,64 @@
+/*
+ * #%L
+ * BroadleafCommerce Common Libraries
+ * %%
+ * Copyright (C) 2009 - 2015 Broadleaf Commerce
+ * %%
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ * 
+ *       http://www.apache.org/licenses/LICENSE-2.0
+ * 
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * #L%
+ */
+package org.broadleafcommerce.common.util;
+
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+
+/**
+ * @author Chad Harchar (charchar)
+ */
+public class ValidationUtil {
+
+    public static String buildErrorMessage(Map<String, List<String>> propertyErrors, List<String> globalErrors) {
+        StringBuilder sb = new StringBuilder();
+        for (Map.Entry<String, List<String>> entry : propertyErrors.entrySet()) {
+            Iterator<String> itr = entry.getValue().iterator();
+            while (itr.hasNext()) {
+                sb.append(entry.getKey());
+                sb.append(" : ");
+
+                String errorMessage = itr.next();
+                sb.append(processMessage(errorMessage));
+
+                if (itr.hasNext()) {
+                    sb.append(" / ");
+                }
+            }
+            sb.append("; ");
+        }
+
+        for (String globalError : globalErrors) {
+            sb.append(processMessage(globalError));
+            sb.append("; ");
+        }
+
+        return "The entity has failed validation - " + sb.toString();
+    }
+
+    public static String processMessage(String globalError) {
+        String friendlyName = BLCMessageUtils.getMessage(globalError);
+        if (friendlyName != null) {
+            return friendlyName;
+        }
+        return globalError;
+    }
+}