From 5c643e09e504094cfd8a43ba36e3537f0df97ae2 Mon Sep 17 00:00:00 2001
From: Christopher Baines <mail@cbaines.net>
Date: Mon, 23 Dec 2019 21:30:36 +0000
Subject: Fix the unknown build counts on the builds pages

---
 guix-data-service/model/build.scm       |  8 +++++---
 guix-data-service/web/revision/html.scm | 10 ++++------
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/guix-data-service/model/build.scm b/guix-data-service/model/build.scm
index 7f1d2fa..3f7d0e9 100644
--- a/guix-data-service/model/build.scm
+++ b/guix-data-service/model/build.scm
@@ -43,8 +43,9 @@
   (define query
     (string-append
      "
-SELECT latest_build_status.status AS build_status, builds.build_server_id, COUNT(*)
+SELECT latest_build_status.status AS build_status, build_servers.id, COUNT(*)
 FROM derivation_output_details_sets
+CROSS JOIN build_servers
 "
      (if revision-commit
          "
@@ -61,7 +62,8 @@ INNER JOIN guix_revisions
      "
 LEFT JOIN builds
    ON builds.derivation_output_details_set_id =
-      derivation_output_details_sets.id
+        derivation_output_details_sets.id AND
+      builds.build_server_id = build_servers.id
 LEFT JOIN
 (
   SELECT DISTINCT ON (build_id) *
@@ -76,7 +78,7 @@ ON builds.id = latest_build_status.build_id
           "WHERE "
           (string-join criteria " AND ")))
      "
-GROUP BY latest_build_status.status, builds.build_server_id
+GROUP BY latest_build_status.status, build_servers.id
 ORDER BY status"))
 
   (map (match-lambda
diff --git a/guix-data-service/web/revision/html.scm b/guix-data-service/web/revision/html.scm
index 5d166c9..6007425 100644
--- a/guix-data-service/web/revision/html.scm
+++ b/guix-data-service/web/revision/html.scm
@@ -1180,12 +1180,10 @@ figure {
                 `(tr
                   (td ,(build-status-span status))
                   ,@(map (lambda (id)
-                           `(td ,(if (string-null? status)
-                                     (assq-ref counts-by-build-server-id
-                                               #f)
-                                     (or (assq-ref counts-by-build-server-id
-                                                   id)
-                                         0))))
+                           `(td
+                             ,(or (assq-ref counts-by-build-server-id
+                                            id)
+                                  0)))
                          (map cdr build-server-options)))))
              stats)))))
       (div
-- 
cgit v1.2.3