From fe8102e1dfbc6dd83cc4ad03e2869a967750ba4f Mon Sep 17 00:00:00 2001
From: Christopher Baines <mail@cbaines.net>
Date: Thu, 5 Sep 2019 16:40:39 +0200
Subject: Use numeric ids for git repositories

---
 guix-data-service/model/git-repository.scm | 15 +++++++++++----
 guix-data-service/web/controller.scm       |  5 +++--
 guix-data-service/web/view/html.scm        |  2 +-
 3 files changed, 15 insertions(+), 7 deletions(-)

diff --git a/guix-data-service/model/git-repository.scm b/guix-data-service/model/git-repository.scm
index 610dc49..8c7cb14 100644
--- a/guix-data-service/model/git-repository.scm
+++ b/guix-data-service/model/git-repository.scm
@@ -11,10 +11,17 @@
             guix-revisions-and-jobs-for-git-repository))
 
 (define (all-git-repositories conn)
-  (exec-query
-   conn
-   (string-append
-    "SELECT id, label, url, cgit_url_base FROM git_repositories ORDER BY id ASC")))
+  (map
+   (match-lambda
+     ((id label url cgit-base-url)
+      (list (string->number id)
+            label
+            url
+            cgit-base-url)))
+   (exec-query
+    conn
+    (string-append
+     "SELECT id, label, url, cgit_url_base FROM git_repositories ORDER BY id ASC"))))
 
 (define (select-git-repository conn id)
   (match (exec-query
diff --git a/guix-data-service/web/controller.scm b/guix-data-service/web/controller.scm
index 85c2b6a..038af58 100644
--- a/guix-data-service/web/controller.scm
+++ b/guix-data-service/web/controller.scm
@@ -829,7 +829,8 @@
          (view-git-repository
           id
           label url cgit-url-base
-          (all-branches-with-most-recent-commit conn id))))
+          (all-branches-with-most-recent-commit conn
+                                                (string->number id)))))
        (#f
         (render-html
          #:sxml (general-not-found
@@ -853,7 +854,7 @@
                     parsed-query-parameters
                     (most-recent-commits-for-branch
                      conn
-                     repository-id
+                     (string->number repository-id)
                      branch-name
                      #:limit (assq-ref parsed-query-parameters 'limit_results)
                      #:after-date (assq-ref parsed-query-parameters
diff --git a/guix-data-service/web/view/html.scm b/guix-data-service/web/view/html.scm
index 382a19e..e8c7a09 100644
--- a/guix-data-service/web/view/html.scm
+++ b/guix-data-service/web/view/html.scm
@@ -916,7 +916,7 @@
            `(tr
              (td
               (a (@ (href ,(string-append
-                            "/repository/" git-repository-id
+                            "/repository/" (number->string git-repository-id)
                             "/branch/" name)))
                  ,name))
              (td ,date)
-- 
cgit v1.2.3