feat: added formula validation to addons

Author: Alex-GF

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

@@ -13,6 +13,7 @@
 import io.github.isagroup.models.PricingManager;
 import io.github.isagroup.models.UsageLimit;
 import io.github.isagroup.models.featuretypes.Payment;
+import io.github.isagroup.utils.PricingValidators;
 
 public class AddOnParser {
 
@@ -55,20 +56,13 @@ public static AddOn parseMapToAddOn(String addOnName, Map<String, Object> addOnM
 
         // ---------- price ----------
 
-        if (addOnMap.containsKey("price")
-            && (addOnMap.containsKey("monthlyPrice") || addOnMap.containsKey("annualPrice"))) {
-            throw new PricingParsingException("The add on " + addOnName
-                + " has both a price and monthlyPrice/annualPrice. It should have only one of them");
-        }
+        PricingValidators.checkPriceType(addOnMap.get("price"), addOnName);
 
-        if (addOnMap.containsKey("price")) {
 
-            if (isValidPrice(addOnMap.get("price"))) {
-                addOn.setPrice(addOnMap.get("price"));
-            } else {
-                throw new PricingParsingException(
-                    "The price of the add on " + addOnName + " is neither a valid number nor string");
-            }
+        if (addOnMap.get("price") instanceof String && addOnMap.get("price").toString().contains("#")) {
+            addOn.setPrice(PricingManagerParser.evaluateFormula(addOnMap.get("price").toString(), pricingManager));
+        } else {
+            addOn.setPrice(addOnMap.get("price"));
         }
 
         // ---------- unit ----------

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

@@ -15,9 +15,7 @@
 import io.github.isagroup.models.UsageLimit;
 import io.github.isagroup.models.featuretypes.Payment;
 import io.github.isagroup.models.featuretypes.PaymentType;
-import org.springframework.expression.Expression;
-import org.springframework.expression.spel.standard.SpelExpressionParser;
-import org.springframework.expression.spel.support.StandardEvaluationContext;
+import io.github.isagroup.utils.PricingValidators;
 
 public class PlanParser {
 
@@ -54,11 +52,11 @@ public static Plan parseMapToPlan(String planName, Map<String, Object> map, Pric
 
         // ---------- price ----------
 
-        checkPriceType(map.get("price"), planName);
+        PricingValidators.checkPriceType(map.get("price"), planName);
 
 
         if (map.get("price") instanceof String && map.get("price").toString().contains("#")) {
-            plan.setPrice(calculateFormula(map.get("price").toString(), pricingManager));
+            plan.setPrice(PricingManagerParser.evaluateFormula(map.get("price").toString(), pricingManager));
         } else {
             plan.setPrice(map.get("price"));
         }
@@ -78,29 +76,6 @@ public static Plan parseMapToPlan(String planName, Map<String, Object> map, Pric
         return plan;
     }
 
-    private static void checkPriceType(Object price, String planName) {
-        if (price == null) {
-            throw new PricingParsingException("plan " + planName + ": \"price\" is mandatory");
-        }
-
-        if (!(price instanceof Long || price instanceof Integer ||
-            price instanceof Double || price instanceof String)) {
-            throw new PricingParsingException("\"price\" is expected to be a real number, a expression or a string");
-        }
-    }
-
-    private static Double calculateFormula(String price, PricingManager pricingManager) {
-        SpelExpressionParser parser = new SpelExpressionParser();
-        StandardEvaluationContext context = new StandardEvaluationContext();
-
-        if (pricingManager.getVariables() != null) {
-            context.setVariables(pricingManager.getVariables());
-        }
-
-        Expression priceExpression = parser.parseExpression(price);
-        return priceExpression.getValue(context, Double.class);
-    }
-
     private static void setFeaturesToPlan(String planName, Map<String, Object> map, PricingManager pricingManager, Plan plan) {
         Map<String, Object> planFeaturesMap = (Map<String, Object>) map.get("features");
         Map<String, Feature> globalFeaturesMap = pricingManager.getFeatures();

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

@@ -10,6 +10,10 @@
 import java.util.Map;
 import java.util.regex.Pattern;
 
+import org.springframework.expression.Expression;
+import org.springframework.expression.spel.standard.SpelExpressionParser;
+import org.springframework.expression.spel.support.StandardEvaluationContext;
+
 import io.github.isagroup.exceptions.PricingParsingException;
 import io.github.isagroup.exceptions.VersionException;
 import io.github.isagroup.models.AddOn;
@@ -41,6 +45,18 @@ public static PricingManager parseMapToPricingManager(Map<String, Object> yamlCo
         return pricingManager;
     }
 
+    protected static Double evaluateFormula(String price, PricingManager pricingManager) {
+        SpelExpressionParser parser = new SpelExpressionParser();
+        StandardEvaluationContext context = new StandardEvaluationContext();
+
+        if (pricingManager.getVariables() != null) {
+            context.setVariables(pricingManager.getVariables());
+        }
+
+        Expression priceExpression = parser.parseExpression(price);
+        return priceExpression.getValue(context, Double.class);
+    }
+
     private static void setBasicAttributes(Map<String, Object> yamlConfigMap, PricingManager pricingManager) {
 
         // -------------- version --------------

src/main/java/io/github/isagroup/utils/PricingValidators.java

@@ -6,6 +6,7 @@
 import io.github.isagroup.exceptions.FeatureNotFoundException;
 import io.github.isagroup.exceptions.InvalidDefaultValueException;
 import io.github.isagroup.exceptions.InvalidValueTypeException;
+import io.github.isagroup.exceptions.PricingParsingException;
 import io.github.isagroup.models.AddOn;
 import io.github.isagroup.models.Feature;
 import io.github.isagroup.models.Plan;
@@ -118,6 +119,17 @@ public static void validateAndFormatAddOn(PricingManager pricingManager, AddOn a
 
     }
 
+    public static void checkPriceType(Object price, String planName) {
+        if (price == null) {
+            throw new PricingParsingException("plan " + planName + ": \"price\" is mandatory");
+        }
+
+        if (!(price instanceof Long || price instanceof Integer ||
+            price instanceof Double || price instanceof String)) {
+            throw new PricingParsingException("\"price\" is expected to be a real number, a formula or a string");
+        }
+    }
+
     private static void validateName(String name, String item) {
 
         if (name == null) {