Implement ends with cps path query to support multiple attributes with 'and' condition

Issue-ID: CPS-309
Signed-off-by: puthuparambil.aditya <aditya.puthuparambil@bell.ca>
Change-Id: I80bf2650e2cd979b806fc29302fc5cb295f65241
Signed-off-by: puthuparambil.aditya <aditya.puthuparambil@bell.ca>

4 files changed, 65 insertions, 7 deletions

diff --git a/cps-ri/src/main/java/org/onap/cps/spi/impl/CpsDataPersistenceServiceImpl.java b/cps-ri/src/main/java/org/onap/cps/spi/impl/CpsDataPersistenceServiceImpl.java
index ca279f30c1..fa13c7d14d 100644
--- a/cps-ri/src/main/java/org/onap/cps/spi/impl/CpsDataPersistenceServiceImpl.java
+++ b/cps-ri/src/main/java/org/onap/cps/spi/impl/CpsDataPersistenceServiceImpl.java
@@ -2,6 +2,7 @@
  * ============LICENSE_START=======================================================
  *  Copyright (C) 2021 Nordix Foundation
  *  Modifications Copyright (C) 2021 Pantheon.tech
+ *  Modifications Copyright (C) 2020-2021 Bell Canada.
  *  ================================================================================
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
@@ -143,6 +144,11 @@ public class CpsDataPersistenceServiceImpl implements CpsDataPersistenceService
             fragmentEntities = fragmentRepository
                 .getByAnchorAndXpathAndLeafAttributes(anchorEntity.getId(), cpsPathQuery.getXpathPrefix(), cpsPathQuery
                     .getLeafName(), cpsPathQuery.getLeafValue());
+        } else if (CpsPathQueryType.XPATH_HAS_DESCENDANT_WITH_LEAF_VALUES.equals(cpsPathQuery.getCpsPathQueryType())) {
+            final String leafDataAsJson = GSON.toJson(cpsPathQuery.getLeavesData());
+            fragmentEntities = fragmentRepository
+                .getByAnchorAndDescendentNameAndLeafValues(anchorEntity.getId(),
+                    cpsPathQuery.getDescendantName(), leafDataAsJson);
         } else {
             fragmentEntities = fragmentRepository
                 .getByAnchorAndXpathEndsInDescendantName(anchorEntity.getId(), cpsPathQuery.getDescendantName());
diff --git a/cps-ri/src/main/java/org/onap/cps/spi/query/CpsPathQuery.java b/cps-ri/src/main/java/org/onap/cps/spi/query/CpsPathQuery.java
index ce78c06d4f..c5861bd4b6 100644
--- a/cps-ri/src/main/java/org/onap/cps/spi/query/CpsPathQuery.java
+++ b/cps-ri/src/main/java/org/onap/cps/spi/query/CpsPathQuery.java
@@ -1,7 +1,7 @@
 /*
  * ============LICENSE_START=======================================================
  *  Copyright (C) 2021 Nordix Foundation
- *  Modifications Copyright (C) 2021 Bell Canada. All rights reserved.
+ *  Modifications Copyright (C) 2021 Bell Canada.
  *  ================================================================================
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
@@ -20,6 +20,8 @@
 
 package org.onap.cps.spi.query;
 
+import java.util.HashMap;
+import java.util.Map;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 import lombok.AccessLevel;
@@ -36,6 +38,7 @@ public class CpsPathQuery {
     private String leafName;
     private Object leafValue;
     private String descendantName;
+    private Map<String, Object> leavesData;
 
     private static final String NON_CAPTURING_GROUP_1_TO_99_YANG_CONTAINERS = "((?:\\/[^\\/]+){1,99})";
 
@@ -51,6 +54,15 @@ public class CpsPathQuery {
 
     private static final Pattern LEAF_STRING_VALUE_PATTERN = Pattern.compile("['\"](.*)['\"]");
 
+    private static final String YANG_MULTIPLE_LEAF_VALUE_EQUALS_CONDITION =  "\\[(.*?)\\s{0,9}]";
+
+    private static final Pattern DESCENDANT_ANYWHERE_PATTERN_WITH_MULTIPLE_LEAF_PATTERN =
+        Pattern.compile(DESCENDANT_ANYWHERE_PATTERN + YANG_MULTIPLE_LEAF_VALUE_EQUALS_CONDITION);
+
+    private static final String INDIVIDUAL_LEAF_DETAIL_PATTERN = ("\\s{0,9}and\\s{0,9}");
+
+    private static final Pattern LEAF_VALUE_PATTERN = Pattern.compile("@(\\S+?)=(.*)");
+
     /**
      * Returns a cps path query.
      *
@@ -61,11 +73,11 @@ public class CpsPathQuery {
         Matcher matcher = QUERY_CPS_PATH_WITH_SINGLE_LEAF_PATTERN.matcher(cpsPath);
         final CpsPathQuery cpsPathQuery = new CpsPathQuery();
         if (matcher.matches()) {
-            cpsPathQuery.setCpsPathQueryType(CpsPathQueryType.XPATH_LEAF_VALUE);
-            cpsPathQuery.setXpathPrefix(matcher.group(1));
-            cpsPathQuery.setLeafName(matcher.group(2));
-            cpsPathQuery.setLeafValue(convertLeafValueToCorrectType(matcher.group(3), cpsPath));
-            return cpsPathQuery;
+            return buildCpsPathQueryWithSingleLeafPattern(cpsPath, matcher, cpsPathQuery);
+        }
+        matcher = DESCENDANT_ANYWHERE_PATTERN_WITH_MULTIPLE_LEAF_PATTERN.matcher(cpsPath);
+        if (matcher.matches()) {
+            return buildCpsQueryForDescendentWithLeafPattern(cpsPath, matcher, cpsPathQuery);
         }
         matcher = DESCENDANT_ANYWHERE_PATTERN.matcher(cpsPath);
         if (matcher.matches()) {
@@ -77,6 +89,34 @@ public class CpsPathQuery {
             String.format("Cannot interpret or parse cps path '%s'.", cpsPath));
     }
 
+    private static CpsPathQuery buildCpsPathQueryWithSingleLeafPattern(final String cpsPath, final Matcher matcher,
+        final CpsPathQuery cpsPathQuery) {
+        cpsPathQuery.setCpsPathQueryType(CpsPathQueryType.XPATH_LEAF_VALUE);
+        cpsPathQuery.setXpathPrefix(matcher.group(1));
+        cpsPathQuery.setLeafName(matcher.group(2));
+        cpsPathQuery.setLeafValue(convertLeafValueToCorrectType(matcher.group(3), cpsPath));
+        return cpsPathQuery;
+    }
+
+    private static CpsPathQuery buildCpsQueryForDescendentWithLeafPattern(final String cpsPath, final Matcher matcher,
+        final CpsPathQuery cpsPathQuery) {
+        cpsPathQuery.setCpsPathQueryType(CpsPathQueryType.XPATH_HAS_DESCENDANT_WITH_LEAF_VALUES);
+        cpsPathQuery.setDescendantName(matcher.group(1));
+        final Map<String, Object> leafData = new HashMap<>();
+        for (final String leafValuePair : matcher.group(2).split(INDIVIDUAL_LEAF_DETAIL_PATTERN)) {
+            final Matcher descendentMatcher = LEAF_VALUE_PATTERN.matcher(leafValuePair);
+            if (descendentMatcher.matches()) {
+                leafData.put(descendentMatcher.group(1),
+                    convertLeafValueToCorrectType(descendentMatcher.group(2), cpsPath));
+            } else {
+                throw new CpsPathException("Invalid cps path.",
+                    String.format("Cannot interpret or parse attributes in cps path '%s'.", cpsPath));
+            }
+        }
+        cpsPathQuery.setLeavesData(leafData);
+        return cpsPathQuery;
+    }
+
     private static Object convertLeafValueToCorrectType(final String leafValueString, final String cpsPath) {
         final Matcher stringValueWithQuotesMatcher = LEAF_STRING_VALUE_PATTERN.matcher(leafValueString);
         if (stringValueWithQuotesMatcher.matches()) {
diff --git a/cps-ri/src/main/java/org/onap/cps/spi/query/CpsPathQueryType.java b/cps-ri/src/main/java/org/onap/cps/spi/query/CpsPathQueryType.java
index abdbfb9fd4..3ae54ba22a 100644
--- a/cps-ri/src/main/java/org/onap/cps/spi/query/CpsPathQueryType.java
+++ b/cps-ri/src/main/java/org/onap/cps/spi/query/CpsPathQueryType.java
@@ -1,6 +1,7 @@
 /*
  * ============LICENSE_START=======================================================
  *  Copyright (C) 2021 Nordix Foundation
+ *  Modifications Copyright (C) 2020-2021 Bell Canada.
  *  ================================================================================
  *  Licensed under the Apache License, Version 2.0 (the "License");
  *  you may not use this file except in compliance with the License.
@@ -28,6 +29,10 @@ public enum CpsPathQueryType {
      */
     XPATH_HAS_DESCENDANT_ANYWHERE,
     /**
+     * Xpath descendant anywhere type e.g. //nodeName[@leafName=leafValue] .
+     */
+    XPATH_HAS_DESCENDANT_WITH_LEAF_VALUES,
+    /**
      * Xpath leaf value cps path query type e.g. /cps-path[@leafName=leafValue] .
      */
     XPATH_LEAF_VALUE
diff --git a/cps-ri/src/main/java/org/onap/cps/spi/repository/FragmentRepository.java b/cps-ri/src/main/java/org/onap/cps/spi/repository/FragmentRepository.java
index eb2e82b6c9..b896fe86d0 100755
--- a/cps-ri/src/main/java/org/onap/cps/spi/repository/FragmentRepository.java
+++ b/cps-ri/src/main/java/org/onap/cps/spi/repository/FragmentRepository.java
@@ -1,7 +1,7 @@
 /*-

  * ============LICENSE_START=======================================================

  *  Copyright (C) 2020-201 Nordix Foundation. All rights reserved.

- *  Modifications Copyright (C) 2020 Bell Canada. All rights reserved.

+ *  Modifications Copyright (C) 2020-2021 Bell Canada. All rights reserved.

  * ================================================================================

  * Licensed under the Apache License, Version 2.0 (the "License");

  * you may not use this file except in compliance with the License.

@@ -66,4 +66,11 @@ public interface FragmentRepository extends JpaRepository<FragmentEntity, Long>
     // Above query will match the anchor id and last descendant name

     List<FragmentEntity> getByAnchorAndXpathEndsInDescendantName(@Param("anchor") int anchorId,

                                                                  @Param("descendantName") String descendantName);

+

+    @Query(value = "SELECT * FROM FRAGMENT WHERE anchor_id = :anchor AND xpath LIKE CONCAT('%/',:descendantName) "

+        + "AND attributes @>  :leafDataAsJson\\:\\:jsonb", nativeQuery = true)

+    // Above query will match the anchor id, last descendant name and all parameters passed into leafDataASJson with the

+    // attribute values of the requested data node eg: {"leaf_name":"value", "another_leaf_name":"another value"}​​​​​​

+    List<FragmentEntity> getByAnchorAndDescendentNameAndLeafValues(@Param("anchor") int anchorId,

+        @Param("descendantName") String descendantName, @Param("leafDataAsJson") String leafDataAsJson);

 }