From 7b92c0824445748ffc08e6fedd235dbc99474f46 Mon Sep 17 00:00:00 2001
From: Marc Sune <marcdevel@gmail.com>
Date: Fri, 14 Jun 2024 19:55:26 +0200
Subject: [PATCH] Revert "test/client: simplify query handling"

This reverts commit 74e77c6f07d98c2bf4be6e3a7f35ca006703bf51.
---
 test/client.py | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/test/client.py b/test/client.py
index f179cbf..f8e8afa 100755
--- a/test/client.py
+++ b/test/client.py
@@ -3,6 +3,7 @@
 import json
 import requests
 import argparse
+from urllib.parse import urlencode
 
 DEFAULT_HOST = "127.0.0.1"
 DEFAULT_PORT = 8080
@@ -33,17 +34,18 @@ def delete_dashboard(host, port, dashboard_id) -> requests.Response:
 
 
 def get_dashboard(host, port, dashboard_id=None, shortName=None, dataCube=None) -> requests.Response:
-    params = None
-    url = f"http://{host}:{port}/{DEFAULT_PATH}"
     if dashboard_id:
-        url = f"{url}/{dashboard_id}"
+        url = f"http://{host}:{port}/{DEFAULT_PATH}/{dashboard_id}"
     else:
-        params = {}
+        query = {}
         if shortName:
-            params["shortName"] = shortName
+            query["shortName"] = shortName
         if dataCube:
-            params["dataCube"] = dataCube
-    response = requests.get(url, params=params)
+            query["dataCube"] = dataCube
+        query_str = urlencode(query)
+        query_str = "?" + query_str if query_str != "" else ""
+        url = f"http://{host}:{port}/{DEFAULT_PATH}{query_str}"
+    response = requests.get(url)
     print_response(response)
     return response