added support of discrete values validation

mycloudnexus · Nov 21, 2024 · 93a010b · 93a010b
1 parent d500420
commit 93a010b
Show file tree

Hide file tree

Showing 5 changed files with 30 additions and 31 deletions.
diff --git a/...pp-hub/src/test/resources/mock/api-targets-mappers/api-target-mapper.order.eline.add.yaml b/...pp-hub/src/test/resources/mock/api-targets-mappers/api-target-mapper.order.eline.add.yaml
@@ -178,18 +178,18 @@ spec:
               - rejected
             valueMapping:
               CREATING: acknowledged,
-              ACTIVATING: inProgress,
-              ACCEPTED: inProgress,
-              MANUAL: inProgress,
-              DELETING: inProgress,
-              DISABLING: inProgress,
-              DENIED: rejected,
-              ERROR: failed,
-              ACTIVE: completed,
-              DISABLED: disabled,
-              CANCELLED: disabled,
-              PENDING: pending,
-              PENDING_ACCEPTANCE: pending,
+              ACTIVATING: inProgress
+              ACCEPTED: inProgress
+              MANUAL: inProgress
+              DELETING: inProgress
+              DISABLING: inProgress
+              DENIED: rejected
+              ERROR: failed
+              ACTIVE: completed
+              DISABLED: disabled
+              CANCELLED: disabled
+              PENDING: pending
+              PENDING_ACCEPTANCE: pending
               DELETED: completed
             source: "@{{responseBody.status}}"
             sourceLocation: BODY

diff --git a/...-app-hub/src/test/resources/mock/api-targets-mappers/api-target-mapper.order.uni.add.yaml b/...-app-hub/src/test/resources/mock/api-targets-mappers/api-target-mapper.order.uni.add.yaml
@@ -98,7 +98,7 @@ spec:
           - name: mapper.order.uni.add.bandwidth
             title: "Bandwidth of the UNI"
             source: "@{{productOrderItem[0].product.productConfiguration.bandwidth}}"
-            sourceType: discrete
+            sourceType: customized_enum
             sourceValues:
               - 1000
               - 10000
@@ -147,21 +147,21 @@ spec:
               - partial
               - rejected
             valueMapping:
-              progressing: inProgress,
-              created: acknowledged,
-              CREATING: acknowledged,
-              ACTIVATING: inProgress,
-              ACCEPTED: inProgress,
-              MANUAL: inProgress,
-              DELETING: inProgress,
-              DISABLING: inProgress,
-              DENIED: rejected,
-              ERROR: failed,
-              ACTIVE: completed,
-              DISABLED: disabled,
-              CANCELLED: disabled,
-              PENDING: pending,
-              PENDING_ACCEPTANCE: pending,
+              progressing: inProgress
+              created: acknowledged
+              CREATING: acknowledged
+              ACTIVATING: inProgress
+              ACCEPTED: inProgress
+              MANUAL: inProgress
+              DELETING: inProgress
+              DISABLING: inProgress
+              DENIED: rejected
+              ERROR: failed
+              ACTIVE: completed
+              DISABLED: disabled
+              CANCELLED: disabled
+              PENDING: pending
+              PENDING_ACCEPTANCE: pending
               DELETED: completed
             source: "@{{responseBody.status}}"
             sourceLocation: BODY

diff --git a/...sdk-core/src/main/java/com/consoleconnect/kraken/operator/core/enums/MappingTypeEnum.java b/...sdk-core/src/main/java/com/consoleconnect/kraken/operator/core/enums/MappingTypeEnum.java
@@ -7,6 +7,6 @@
 @AllArgsConstructor
 public enum MappingTypeEnum {
   ENUM("enum"),
-  DISCRETE("discrete");
+  CUSTOMIZED_ENUM("customized_enum");
   private final String name;
 }
diff --git a/...va/com/consoleconnect/kraken/operator/gateway/runner/LoadTargetAPIConfigActionRunner.java b/...va/com/consoleconnect/kraken/operator/gateway/runner/LoadTargetAPIConfigActionRunner.java
@@ -76,7 +76,6 @@ public Optional<ServerWebExchange> runIt(
       String serverUrl = getServerUrl(serverKey);
       outputs.put("url", serverUrl);
     }
-
     StateValueMappingDto stateValueMappingDto = new StateValueMappingDto();
     renderRequestService.parseRequest(facets, stateValueMappingDto);
 

diff --git a/...a/com/consoleconnect/kraken/operator/gateway/runner/MappingMatrixCheckerActionRunner.java b/...a/com/consoleconnect/kraken/operator/gateway/runner/MappingMatrixCheckerActionRunner.java
@@ -218,7 +218,7 @@ public void checkRequestConstraints(String targetKey, Map<String, Object> inputs
         continue;
       }
       if (MappingTypeEnum.ENUM.getName().equals(mapper.getSourceType())
-          || MappingTypeEnum.DISCRETE.getName().equals(mapper.getSourceType())) {
+          || MappingTypeEnum.CUSTOMIZED_ENUM.getName().equals(mapper.getSourceType())) {
         checkEnumValue(mapper.getSource(), mapper.getTarget(), inputs, mapper.getSourceValues());
       } else if (mapper.getTarget() != null && !mapper.getTarget().contains("@{{")) {
         checkConstantValue(mapper.getSource(), mapper.getTarget(), inputs);