From c7ba0a5a138f6629089bec041a81a3e4a8bb75d8 Mon Sep 17 00:00:00 2001
From: frikky <fredrik_9490@hotmail.com>
Date: Sun, 7 Mar 2021 16:58:08 +0100
Subject: [PATCH] #279: Changed codegen to be based on params

---
 backend/app_sdk/build.sh  |  2 +-
 backend/go-app/codegen.go | 22 +++++++++++++---------
 2 files changed, 14 insertions(+), 10 deletions(-)

diff --git a/backend/app_sdk/build.sh b/backend/app_sdk/build.sh
index 25fa59d6..ffed66c5 100644
--- a/backend/app_sdk/build.sh
+++ b/backend/app_sdk/build.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 NAME=shuffle-app_sdk
-VERSION=0.8.60
+VERSION=0.8.61
 
 docker rmi docker.pkg.github.com/frikky/shuffle/$NAME:$VERSION --force
 docker build . -t frikky/shuffle:app_sdk -t frikky/$NAME:$VERSION -t docker.pkg.github.com/frikky/shuffle/$NAME:$VERSION -t ghcr.io/frikky/$NAME:$VERSION
diff --git a/backend/go-app/codegen.go b/backend/go-app/codegen.go
index a9b4c1b6..71802bf4 100644
--- a/backend/go-app/codegen.go
+++ b/backend/go-app/codegen.go
@@ -260,9 +260,14 @@ func makePythoncode(swagger *openapi3.Swagger, name, url, method string, paramet
 				queryString += ", "
 			}
 
+			/*
+							queryData += fmt.Sprintf(`
+				        if %s:
+				            url += f"&%s={%s}"`, query, query, query)
+			*/
 			queryData += fmt.Sprintf(`
         if %s:
-            url += f"&%s={%s}"`, query, query, query)
+            params["%s"] = %s`, query, query, query)
 		}
 	} else {
 		//log.Printf("No optional queries?")
@@ -384,6 +389,7 @@ func makePythoncode(swagger *openapi3.Swagger, name, url, method string, paramet
 	// Extra param for authentication scheme(s)
 	// The last weird one is the body.. Tabs & spaces sucks.
 	data := fmt.Sprintf(`    async def %s(self%s%s%s%s%s%s%s):
+        params={}
         %s
         url=f"%s%s"
         %s
@@ -392,7 +398,7 @@ func makePythoncode(swagger *openapi3.Swagger, name, url, method string, paramet
         %s
         %s
         %s
-        ret = requests.%s(url, headers=headers%s%s%s%s)
+        ret = requests.%s(url, headers=headers, params=params%s%s%s%s)
         try:
           return ret.json()
         except json.decoder.JSONDecodeError:
@@ -423,13 +429,11 @@ func makePythoncode(swagger *openapi3.Swagger, name, url, method string, paramet
 	)
 
 	// Use lowercase when checking
-	/*
-		if strings.Contains(functionname, "filter") {
-			//log.Printf("FUNCTION: %s", data)
-			log.Println(data)
-			log.Printf("Queries: %s", queryString)
-		}
-	*/
+	if strings.Contains(functionname, "login") {
+		//log.Printf("FUNCTION: %s", data)
+		log.Println(data)
+		log.Printf("Queries: %s", queryString)
+	}
 
 	//log.Printf(data)
 	return functionname, data