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

feat: new validations

Author: Alex-GF

src/main/java/io/github/isagroup/services/parsing/FeatureParser.java

@@ -89,12 +89,19 @@ private static Integration parseMapToIntegration(String featureName, Map<String,
 
         loadBasicAttributes(integration, featureName, map, pricingManager);
 
+        String integrationType = "";
+        try{
+            integrationType = (String) map.get("integrationType");
+        } catch (NullPointerException e) {
+            throw new InvalidIntegrationTypeException("The feature " + featureName + " is from type INTEGRATION but does not have an integrationType attribute");
+        }
+
         try {
-            integration.setIntegrationType(IntegrationType.valueOf((String) map.get("integrationType")));
+            integration.setIntegrationType(IntegrationType.valueOf(integrationType));
         } catch (NullPointerException | IllegalArgumentException e) {
             throw new InvalidIntegrationTypeException(
                     "The feature " + featureName + " does not have a supported integrationType (" + Arrays.toString(IntegrationType.values()) + "). Current value: "
-                            + (String) map.get("integrationType"));
+                            + integrationType);
         }
 
         if (integration.getIntegrationType().equals(IntegrationType.WEB_SAAS)) {
@@ -118,12 +125,19 @@ private static Automation parseMapToAutomation(String featureName, Map<String, O
 
         loadBasicAttributes(automation, featureName, map, pricingManager);
 
+        String automationType = "";
+        try{
+            automationType = (String) map.get("automationType");
+        } catch (NullPointerException e) {
+            throw new InvalidAutomationTypeException("The feature " + featureName + " is from type AUTOMATION but does not have an automationType attribute");
+        }
+
         try {
-            automation.setAutomationType(AutomationType.valueOf((String) map.get("automationType")));
+            automation.setAutomationType(AutomationType.valueOf(automationType));
         } catch (IllegalArgumentException e) {
             throw new InvalidAutomationTypeException(
                     "The feature " + featureName + " does not have a supported automationType (" + Arrays.toString(AutomationType.values()) + "). Current value: "
-                            + (String) map.get("automationType"));
+                            + automationType);
         }
 
         return automation;
@@ -190,7 +204,7 @@ private static void loadBasicAttributes(Feature feature, String featureName, Map
             feature.setValueType(ValueType.valueOf((String) map.get("valueType")));
         } catch (IllegalArgumentException e) {
             throw new PricingParsingException("The feature " + featureName
-                    + " does not have a supported valueType. Current valueType: " + (String) map.get("valueType"));
+                    + " does not have a supported valueType (" + Arrays.toString(ValueType.values()) + "). Current valueType: " + (String) map.get("valueType"));
         }
         try {
             Object defaultValue = map.get("defaultValue");
@@ -204,6 +218,10 @@ private static void loadBasicAttributes(Feature feature, String featureName, Map
 
             switch (feature.getValueType()) {
                 case NUMERIC:
+                    if (feature instanceof Payment) {
+                        throw new InvalidDefaultValueException("The feature " + featureName
+                                + " is from type PAYMENT but has a valueType of NUMERIC. It should be TEXT.");
+                    }
                     feature.setDefaultValue(map.get("defaultValue"));
                     if (!(feature.getDefaultValue() instanceof Integer || feature.getDefaultValue() instanceof Double
                             || feature.getDefaultValue() instanceof Long)) {
@@ -251,18 +269,21 @@ private static void loadBasicAttributes(Feature feature, String featureName, Map
     }
 
     private static void parsePaymentValue(Feature feature, String featureName, Map<String, Object> map) {
-
-        List<String> allowedPaymentTypes = (List<String>) map.get("defaultValue");
-        for (String type : allowedPaymentTypes) {
+        List<String> allowedPaymentTypes;
+        try{
+            allowedPaymentTypes = (List<String>) map.get("defaultValue");
+        } catch (ClassCastException e) {
+            throw new InvalidDefaultValueException("The feature " + featureName
+                    + " is from type PAYMENT but has a valueType of TEXT. It should be a list of supported paymentType ("+Arrays.toString(PaymentType.values())+"). To specify a list, use a dash (-) before each value. The defaultValue that generates the issue: " + map.get("defaultValue"));
+        }
+        for (String paymentType : allowedPaymentTypes) {
             try {
-                PaymentType.valueOf(type);
+                PaymentType.valueOf(paymentType);
             } catch (IllegalArgumentException e) {
                 throw new InvalidDefaultValueException("The feature " + featureName
-                        + " does not have a supported paymentType. PaymentType that generates the issue: " + type);
+                        + " does not have a valid defaultValue consisting on a list of supported paymentType ("+Arrays.toString(PaymentType.values())+"). PaymentType that generates the issue: " + paymentType);
             }
         }
-
         feature.setDefaultValue(allowedPaymentTypes);
-
     }
 }

src/main/java/io/github/isagroup/services/parsing/UsageLimitParser.java

@@ -98,7 +98,7 @@ private static void loadBasicAttributes(UsageLimit limit, String limitName, Map<
             limit.setValueType(ValueType.valueOf((String) map.get("valueType")));
         } catch (IllegalArgumentException e) {
             throw new InvalidValueTypeException("The feature " + limitName
-                    + " does not have a supported valueType. Current valueType: " + (String) map.get("valueType"));
+                    + " does not have a supported valueType (" + Arrays.toString(ValueType.values()) + "). Current valueType: " + (String) map.get("valueType"));
         }
         try {
             Object defaultValue = map.get("defaultValue");

src/test/resources/negative-parsing-tests.csv

@@ -36,7 +36,7 @@ Throw an error if feature 'docUrl' is not a string;parsing/negative/feature/docU
 Throw an error if feature 'type' is missing or null;parsing/negative/feature/type/null-type.yml;feature 'type' is mandatory
 # feature.valueType
 Throw an error if feature 'type' is missing or null;parsing/negative/feature/valueType/null-valueType.yml;Feature value type is null
-Throw an error if feature 'type' is not a supported feature type;parsing/negative/feature/valueType/unsupported-valueType.yml;The feature foo does not have a supported valueType. Current valueType: foo
+Throw an error if feature 'type' is not a supported feature type;parsing/negative/feature/valueType/unsupported-valueType.yml;The feature foo does not have a supported valueType ([NUMERIC, TEXT, BOOLEAN]). Current valueType: foo
 # features
 Throw an error if 'features' is not a map;parsing/negative/features/features-is-boolean.yml;'features' must be a Map but found Boolean instead
 Throw an error if 'features' is not a map;parsing/negative/features/features-is-float.yml;'features' must be a Map but found Double instead