refactor(python): modify formatParamsAsPythonDict() to work with path and query parameters

Author: php-coder

src/cli.js

@@ -197,7 +197,12 @@ const createEndpoints = async (destDir, { lang }, config) => {
             'q': function(param) {
                 return `r.URL.Query().Get("${param}")`
             },
-        }
+        },
+        'py': {
+            'p': '',
+            'b': 'body.',
+            'q': '',
+        },
     }
 
     const parser = new Parser()
@@ -275,9 +280,18 @@ const createEndpoints = async (destDir, { lang }, config) => {
             // [ "p.categoryId" ] => ', {"categoryId": body.categoryId}'
             // (used only with Python)
             "formatParamsAsPythonDict": (params) => {
-                return params.length > 0
-                ? ', {' + [...new Set(params)].map(param => param.substring(2)).map(param => `"${param}": body.${param}`).join(', ') + '}'
-                : ''
+                if (params.length === 0) {
+                    return params
+                }
+                return ', {' + Array.from(
+                        new Set(params),
+                        p => {
+                            const bindTarget = p.substring(0, 1)
+                            const paramName = p.substring(2)
+                            const prefix = placeholdersMap['py'][bindTarget]
+                            return `"${paramName}": ${prefix}${paramName}`
+                        }
+                    ).join(', ') + '}'
             },
 
             "placeholdersMap": placeholdersMap,

src/templates/routes.py.ejs

@@ -186,10 +186,7 @@ endpoints.forEach(function(endpoint) {
                 for (const [name, query] of Object.entries(queryWithName)) {
                     const sql = convertToPsycopgNamedArguments(formatQueryForPython(query, 20))
                     const params = extractParamsFromQuery(query);
-                    const formattedParams = params.length > 0
-                        // [ "p.categoryId" ] => [ '"categoryId": categoryId' ]
-                        ? ', {' + params.map(param => param.substring(2)).map(param => `"${param}": ${param}`).join(', ') + '}'
-                        : ''
+                    const formattedParams = formatParamsAsPythonDict(params)
                     queries.push({ [name]: { sql : sql, formattedParams: formattedParams }})
                 }
             })