Move request-query-parameters to utils

2 files changed, 23 insertions, 20 deletions

diff --git a/guix-build-coordinator/client-communication.scm b/guix-build-coordinator/client-communication.scm
index 6ad98f2..550b054 100644
--- a/guix-build-coordinator/client-communication.scm
+++ b/guix-build-coordinator/client-communication.scm
@@ -81,26 +81,6 @@
       #:port port))
    #:on-error 'backtrace))
 
-(define (request-query-parameters request)
-  (define (parse-query-string query)
-    "Parse and decode the URI query string QUERY and return an alist."
-    (let lp ((lst (map uri-decode (string-split query (char-set #\& #\=)))))
-      (match lst
-        ((key value . rest)
-         (cons (cons key value) (lp rest)))
-        (("") '())
-        (() '()))))
-
-  (let ((query (uri-query (request-uri request))))
-    (if (and query
-             (not (string-null? query)))
-        (map (match-lambda
-               ((name . value)
-                (cons (string->symbol name)
-                      value)))
-             (parse-query-string query))
-        '())))
-
 (define (controller request
                     method-and-path-components
                     raw-body
diff --git a/guix-build-coordinator/utils.scm b/guix-build-coordinator/utils.scm
index 0a5af15..fea9c1c 100644
--- a/guix-build-coordinator/utils.scm
+++ b/guix-build-coordinator/utils.scm
@@ -33,6 +33,9 @@
   #:export (random-v4-uuid
 
             make-base64-output-port
+
+            request-query-parameters
+
             call-with-streaming-http-request
             make-chunked-input-port*
 
@@ -226,6 +229,26 @@ upcoming chunk."
 
   (make-custom-binary-input-port "chunked input port" read! #f #f close))
 
+(define (request-query-parameters request)
+  (define (parse-query-string query)
+    "Parse and decode the URI query string QUERY and return an alist."
+    (let lp ((lst (map uri-decode (string-split query (char-set #\& #\=)))))
+      (match lst
+        ((key value . rest)
+         (cons (cons key value) (lp rest)))
+        (("") '())
+        (() '()))))
+
+  (let ((query (uri-query (request-uri request))))
+    (if (and query
+             (not (string-null? query)))
+        (map (match-lambda
+               ((name . value)
+                (cons (string->symbol name)
+                      value)))
+             (parse-query-string query))
+        '())))
+
 (define* (call-with-streaming-http-request uri callback
                                            #:key (headers '()))
   (let* ((port (open-socket-for-uri uri))