Merge pull request #43 from isa-group/fix/pricing-parser

Alex-GF · web-flow · commit 974264d99118 · 2025-03-25T16:15:43.000+01:00
fix: parsing exceptions
diff --git a/src/main/java/io/github/isagroup/services/parsing/AddOnParser.java b/src/main/java/io/github/isagroup/services/parsing/AddOnParser.java
@@ -169,6 +169,15 @@ private static void setAddOnFeatures(String addOnName, Map<String, Object> addOn
 
             Feature addOnFeature = Feature.cloneFeature(globalFeaturesMap.get(addOnFeatureName));
 
+            Object value = addOnFeatureMap.get("value");
+            boolean isValueNull = (value == null);
+            
+            if (isValueNull){
+                throw new InvalidDefaultValueException("The feature " + addOnFeature.getName()
+                    + " does not have a valid value. Current valueType: "
+                    + addOnFeature.getValueType().toString() + "; Current value in addOn " + addOn.getName() + " is null");
+            }
+
             switch (addOnFeature.getValueType()) {
                 case NUMERIC:
                     addOnFeature.setValue(addOnFeatureMap.get("value"));
@@ -230,17 +239,26 @@ private static void setAddOnUsageLimits(String addOnName, Map<String, Object> ad
 
             if (!globalUsageLimitsMap.containsKey(addOnUsageLimitName)) {
                 throw new FeatureNotFoundException(
-                        "The feature " + addOnUsageLimitName + " is not defined in the global features");
+                        "The usageLimit " + addOnUsageLimitName + " is not defined in the global features");
             }
 
             UsageLimit addOnUsageLimit = UsageLimit.cloneUsageLimit(globalUsageLimitsMap.get(addOnUsageLimitName));
 
+            Object value = addOnUsageLimitMap.get("value");
+            boolean isValueNull = (value == null);
+            
+            if (isValueNull){
+                throw new InvalidDefaultValueException("The usageLimit " + addOnUsageLimit.getName()
+                    + " does not have a valid value. Current valueType: "
+                    + addOnUsageLimit.getValueType().toString() + "; Current value in addOn " + addOn.getName() + " is null");
+            }
+
             switch (addOnUsageLimit.getValueType()) {
                 case NUMERIC:
                     addOnUsageLimit.setValue(addOnUsageLimitMap.get("value"));
                     if (!(addOnUsageLimit.getValue() instanceof Integer || addOnUsageLimit.getValue() instanceof Double
                             || addOnUsageLimit.getValue() instanceof Long)) {
-                        throw new InvalidDefaultValueException("The feature " + addOnUsageLimitName
+                        throw new InvalidDefaultValueException("The usageLimit " + addOnUsageLimitName
                                 + " does not have a valid value. Current valueType:"
                                 + addOnUsageLimit.getValueType().toString() + "; Current defaultValue: "
                                 + addOnUsageLimitMap.get("value").toString());
diff --git a/src/main/java/io/github/isagroup/services/parsing/FeatureParser.java b/src/main/java/io/github/isagroup/services/parsing/FeatureParser.java
@@ -1,5 +1,6 @@
 package io.github.isagroup.services.parsing;
 
+import java.util.Arrays;
 import java.util.List;
 import java.util.Map;
 import java.util.NoSuchElementException;
@@ -69,7 +70,7 @@ public static Feature parseMapToFeature(String featureName, Map<String, Object>
             }
         } catch (IllegalArgumentException e) {
             throw new IllegalArgumentException("The feature " + featureName
-                    + " does not have a supported feature type. Current value: " + (String) featureMap.get("type"));
+                    + " does not have a supported feature type (" + Arrays.toString(FeatureType.values()) + "). Current value: " + (String) featureMap.get("type"));
         }
     }
 
@@ -92,7 +93,7 @@ private static Integration parseMapToIntegration(String featureName, Map<String,
             integration.setIntegrationType(IntegrationType.valueOf((String) map.get("integrationType")));
         } catch (NullPointerException | IllegalArgumentException e) {
             throw new InvalidIntegrationTypeException(
-                    "The feature " + featureName + " does not have a supported integrationType. Current value: "
+                    "The feature " + featureName + " does not have a supported integrationType (" + Arrays.toString(IntegrationType.values()) + "). Current value: "
                             + (String) map.get("integrationType"));
         }
 
@@ -121,7 +122,7 @@ private static Automation parseMapToAutomation(String featureName, Map<String, O
             automation.setAutomationType(AutomationType.valueOf((String) map.get("automationType")));
         } catch (IllegalArgumentException e) {
             throw new InvalidAutomationTypeException(
-                    "The feature " + featureName + " does not have a supported automationType. Current value: "
+                    "The feature " + featureName + " does not have a supported automationType (" + Arrays.toString(AutomationType.values()) + "). Current value: "
                             + (String) map.get("automationType"));
         }
 
@@ -192,6 +193,15 @@ private static void loadBasicAttributes(Feature feature, String featureName, Map
                     + " does not have a supported valueType. Current valueType: " + (String) map.get("valueType"));
         }
         try {
+            Object defaultValue = map.get("defaultValue");
+            boolean isValueNull = (defaultValue == null);
+            
+            if (isValueNull){
+                throw new InvalidDefaultValueException("The feature " + feature.getName()
+                    + " does not have a valid defaultValue. Current valueType: "
+                    + feature.getValueType().toString() + "; Current defaultValue is null");
+            }
+
             switch (feature.getValueType()) {
                 case NUMERIC:
                     feature.setDefaultValue(map.get("defaultValue"));
diff --git a/src/main/java/io/github/isagroup/services/parsing/PlanParser.java b/src/main/java/io/github/isagroup/services/parsing/PlanParser.java
@@ -1,5 +1,6 @@
 package io.github.isagroup.services.parsing;
 
+import java.util.Arrays;
 import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
@@ -109,6 +110,15 @@ private static void setFeaturesToPlan(String planName, Map<String, Object> map,
                     "The feature " + planFeatureName + " is not defined in the global features");
             } else {
                 Feature feature = plan.getFeatures().get(planFeatureName);
+                
+                Object value = planFeatureMap.get("value");
+                boolean isValueNull = (value == null);
+                
+                if (isValueNull){
+                    throw new InvalidDefaultValueException("The feature " + feature.getName()
+                        + " does not have a valid value. Current valueType: "
+                        + feature.getValueType().toString() + "; Current value in plan " + plan.getName() + " is null");
+                }
 
                 switch (feature.getValueType()) {
                     case NUMERIC:
@@ -186,6 +196,15 @@ private static void setUsageLimitsToPlan(String planName, Map<String, Object> ma
             } else {
                 UsageLimit usageLimit = plan.getUsageLimits().get(planUsageLimitName);
 
+                Object value = planUsageLimitMap.get("value");
+                boolean isValueNull = (value == null);
+                
+                if (isValueNull){
+                    throw new InvalidDefaultValueException("The usageLimit " + usageLimit.getName()
+                        + " does not have a valid value. Current valueType: "
+                        + usageLimit.getValueType().toString() + "; Current value in plan " + plan.getName() + " is null");
+                }
+
                 switch (usageLimit.getValueType()) {
                     case NUMERIC:
                         usageLimit.setValue(planUsageLimitMap.get("value"));
@@ -222,16 +241,21 @@ public static void parsePaymentValue(Feature feature, String featureName, Map<St
         Object paymentValue = map.get("value");
         if (paymentValue instanceof String) {
             throw new PricingParsingException(
-                "\"" + featureName + "\"" + "should be a list of supported payment types");
+                "Invalid value for \"" + featureName + "\": expected a list of supported payment types (" 
+                + Arrays.toString(PaymentType.values()) + "), but found a string. "
+                + "To specify a list, use a dash (-) before each value. "
+                + "Problematic value: \"" + paymentValue + "\".");        
         }
 
         List<String> allowedPaymentTypes = (List<String>) paymentValue;
         for (String type : allowedPaymentTypes) {
             try {
                 PaymentType.valueOf(type);
             } catch (IllegalArgumentException e) {
-                throw new InvalidDefaultValueException("The feature " + featureName
-                    + " does not have a supported paymentType. PaymentType that generates the issue: " + type);
+                throw new InvalidDefaultValueException(
+                    "Invalid payment type for feature \"" + featureName + "\": \"" + type + "\" is not a supported payment type. "
+                    + "Supported types are: " + Arrays.toString(PaymentType.values()) + ". "
+                );
             }
         }
 
diff --git a/src/main/java/io/github/isagroup/services/parsing/UsageLimitParser.java b/src/main/java/io/github/isagroup/services/parsing/UsageLimitParser.java
@@ -1,5 +1,6 @@
 package io.github.isagroup.services.parsing;
 
+import java.util.Arrays;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
@@ -48,7 +49,7 @@ public static UsageLimit parseMapToUsageLimit(String limitName, Map<String, Obje
             }
         } catch (IllegalArgumentException e) {
             throw new IllegalArgumentException("The usage limit " + limitName
-                    + " does not have a supported type. Current type value: " + (String) limitMap.get("type"));
+                    + " does not have a supported type (" + Arrays.toString(UsageLimitType.values()) + "). Current type value: " + (String) limitMap.get("type"));
         }
     }
 
@@ -100,6 +101,15 @@ private static void loadBasicAttributes(UsageLimit limit, String limitName, Map<
                     + " does not have a supported valueType. Current valueType: " + (String) map.get("valueType"));
         }
         try {
+            Object defaultValue = map.get("defaultValue");
+            boolean isValueNull = (defaultValue == null);
+            
+            if (isValueNull){
+                throw new InvalidDefaultValueException("The usageLimit " + limit.getName()
+                    + " does not have a valid defaultValue. Current valueType: "
+                    + limit.getValueType().toString() + "; Current defaultValue is null");
+            }
+
             switch (limit.getValueType()) {
                 case NUMERIC:
                     limit.setDefaultValue(map.get("defaultValue"));
