diff options
| author |   Steve Smokowski <ss835w@att.com> | 2020-05-18 10:21:23 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@onap.org> | 2020-05-18 10:21:23 +0000 |
| commit | 66e51a92e185963b1c50ad82d44ee974d2db5197 (patch) | |
| tree | 029d433f88e78128da37e1cf461c59eed24fef99 | |
| parent | 2bf5d8a266e19c89f8944143accfcda7986436d4 (diff) | |
| parent | 32dfdb8080bde4b10715d9ad50645afba0183e57 (diff) | |
Merge "Restore action filter as a valid filter." into frankfurt
| -rw-r--r-- | mso-api-handlers/mso-requests-db-repositories/src/main/java/org/onap/so/db/request/data/repository/InfraActiveRequestsRepositoryImpl.java | 8 |
1 files changed, 7 insertions, 1 deletions
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 |