From e2e5687b47ffe23694fd9401a01b498835fb7517 Mon Sep 17 00:00:00 2001
From: stephb9959 <stephane.bourque@gmail.com>
Date: Wed, 1 Mar 2023 10:11:06 -0800
Subject: [PATCH] https://telecominfraproject.atlassian.net/browse/WIFI-12068

Signed-off-by: stephb9959 <stephane.bourque@gmail.com>
---
 build                                      |  2 +-
 openapi/owprov.yaml                        | 24 ++++++++++++++--------
 src/RESTAPI/RESTAPI_venue_list_handler.cpp | 11 +++++++++-
 3 files changed, 27 insertions(+), 10 deletions(-)

diff --git a/build b/build
index dec2bf5..2edeafb 100644
--- a/build
+++ b/build
@@ -1 +1 @@
-19
\ No newline at end of file
+20
\ No newline at end of file
diff --git a/openapi/owprov.yaml b/openapi/owprov.yaml
index 55705ef..a3b032b 100644
--- a/openapi/owprov.yaml
+++ b/openapi/owprov.yaml
@@ -2066,19 +2066,12 @@ paths:
             default: false
           required: false
         - in: query
-          description: return the list of devices under RRM
+          description: return the list of devices for a subscriber
           name: subscriber
           schema:
             type: string
             format: uuid
           required: false
-        - in: query
-          description: return RRM settings for a specific device
-          name: rrmSettings
-          schema:
-            type: boolean
-            default: false
-          required: false
         - in: query
           description: return the resolved configuration for a specific device
           name:   resolveConfig
@@ -2144,6 +2137,13 @@ paths:
             type: string
             format: uuid
           required: false
+        - in: query
+          description: return RRM settings for a specific device
+          name: rrmSettings
+          schema:
+            type: boolean
+            default: false
+          required: false
       responses:
         200:
           description: Succesful retrieve configuratiopn or part of the configuration
@@ -2416,6 +2416,14 @@ paths:
             type: boolean
             default: false
           required: false
+        - in: query
+          description: list venues that use a specific RRM vendor
+          name: RRMvendor
+          schema:
+            type: string
+            example:
+              - this is the shortname of the RRM vendor
+          required: false
       responses:
         200:
           description: Return a list of venues.
diff --git a/src/RESTAPI/RESTAPI_venue_list_handler.cpp b/src/RESTAPI/RESTAPI_venue_list_handler.cpp
index 3baaffa..52d5884 100644
--- a/src/RESTAPI/RESTAPI_venue_list_handler.cpp
+++ b/src/RESTAPI/RESTAPI_venue_list_handler.cpp
@@ -7,5 +7,14 @@
 #include "StorageService.h"
 
 namespace OpenWifi {
-	void RESTAPI_venue_list_handler::DoGet() { return ListHandler<VenueDB>("venues", DB_, *this); }
+	void RESTAPI_venue_list_handler::DoGet() {
+        auto RRMvendor = GetParameter("RRMvendor","");
+        if(RRMvendor.empty()) {
+            return ListHandler<VenueDB>("venues", DB_, *this);
+        }
+        VenueDB::RecordVec Venues;
+        auto Where = fmt::format(" deviceRules LIKE '%{}%' ", RRMvendor);
+        DB_.GetRecords(QB_.Offset, QB_.Limit, Venues, Where, " ORDER BY name ");
+        return ReturnObject("venues",Venues);
+    }
 } // namespace OpenWifi
\ No newline at end of file