Fixing a little bug in uploaded blob reporting

getodk · Dec 13, 2024 · 76c86cf · 76c86cf
1 parent aa85e3f
commit 76c86cf
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/lib/model/query/analytics.js b/lib/model/query/analytics.js
@@ -153,7 +153,7 @@ const countXmlOnlyFormDefs = () => ({ oneFirst }) => oneFirst(sql`
 const countBlobFiles = () => ({ one }) => one(sql`
   SELECT
     COUNT(*) AS total_blobs,
-    COUNT(CASE WHEN "s3_status" = 'uploaded' THEN 1 END) AS uploaded_blobs
+    SUM(CASE WHEN "s3_status" = 'uploaded' THEN 1 ELSE 0 END) AS uploaded_blobs
   FROM blobs`);
 
 const countResetFailedToPending = () => ({ oneFirst }) => oneFirst(sql`
@@ -891,7 +891,7 @@ const previewMetrics = () => (({ Analytics }) => runSequentially([
   metrics.system.num_xml_only_form_defs = xmlDefs;
   metrics.system.uses_external_blob_store = Analytics.blobStoreExternal(config.get('default.external.s3blobStore'));
   metrics.system.num_blob_files = blobFiles.total_blobs;
-  metrics.system.num_blob_files_on_s3 = blobFiles.total_blobs;
+  metrics.system.num_blob_files_on_s3 = blobFiles.uploaded_blobs;
   metrics.system.num_reset_failed_to_pending_count = resetFailedToPending;
 
   return metrics;