From: Elena Kuleshov <evn@att.com>
Date: Fri, 15 May 2020 17:48:15 +0000 (-0400)
Subject: Restore action filter as a valid filter.
X-Git-Tag: 1.6.2~10^2
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=32dfdb8080bde4b10715d9ad50645afba0183e57;p=so.git

Restore action filter as a valid filter.

OrchestrationRequests action filter should map to requestAction.

Issue-ID: SO-2923
Signed-off-by: Kuleshov, Elena <evn@att.com>
Change-Id: I193d237bbc6e3beb23d7cb45c243aefceb5f170f
---

diff --git a/mso-api-handlers/mso-requests-db-repositories/src/main/java/org/onap/so/db/request/data/repository/InfraActiveRequestsRepositoryImpl.java b/mso-api-handlers/mso-requests-db-repositories/src/main/java/org/onap/so/db/request/data/repository/InfraActiveRequestsRepositoryImpl.java
index b669b7d837..8a84c7bc31 100644
--- a/mso-api-handlers/mso-requests-db-repositories/src/main/java/org/onap/so/db/request/data/repository/InfraActiveRequestsRepositoryImpl.java
+++ b/mso-api-handlers/mso-requests-db-repositories/src/main/java/org/onap/so/db/request/data/repository/InfraActiveRequestsRepositoryImpl.java
@@ -275,6 +275,10 @@ public class InfraActiveRequestsRepositoryImpl implements InfraActiveRequestsRep
                 mapKey = "requestorId";
             } else if ("requestExecutionDate".equalsIgnoreCase(mapKey)) {
                 mapKey = "startTime";
+            } else if ("action".equalsIgnoreCase(mapKey)) {
+                mapKey = "requestAction";
+            } else if ("requestAction".equalsIgnoreCase(mapKey)) {
+                mapKey = "requestAction";
             }
 
             final String operator = entry.getValue().get(0);
@@ -310,7 +314,9 @@ public class InfraActiveRequestsRepositoryImpl implements InfraActiveRequestsRep
 
         final Order order = cb.asc(tableRoot.get(START_TIME));
 
-        return executeInfraQuery(crit, predicates, order);
+        return
+
+        executeInfraQuery(crit, predicates, order);
     }
 
     // Added this method for Tenant Isolation project ( 1802-295491a) to query the mso_requests DB