From fa0d8930b8c175c4e4ae555e8b1f8cd7a7362095 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kha=C3=AFs=20COLIN?= <khais.colin@gmail.com>
Date: Sat, 25 Oct 2025 13:45:02 +0200
Subject: [PATCH] show protein and fiber sums

---
 foods.db        | Bin 12288 -> 12288 bytes
 src/get_sum.sql |   4 +++-
 src/main.rs     |  22 +++++++++++++---------
 3 files changed, 16 insertions(+), 10 deletions(-)

diff --git a/foods.db b/foods.db
index 81ff588f777d56554ae5df3a96484e5c93a53a99..51e282b0a438edcb266f26615fade99281c582e4 100644
GIT binary patch
delta 306
zcmZojXh@hK&FD5!##zvfL9a`Qmw|zSk(Zl+mz(qBW<!BS&dnb=1;nIzWf}Om|1k0%
z;NQfP&(FoTlP`|@4<9FQIj{L<8HH)wleg>Zt1u~>rC6j`B&Ik>&IEy34uT+R=B$(e
ze|8=Q@jymKj>+P3x|5A`Y&F!Fc^E|H85udG895l43>92`d{Q&>iW75F^W>Oe2C=eM
zOrEaO$tX2hQCE!9j*EvuG?<ZtW3s)j?&MtE0A@A@29V9l954+SHV1R?Fo;J&EY_U-
xMwVl;v!3$gbUBO3^YrF1R!%I`;qq}~<YADuWn|=>d_Z4K5~op<v-Eu#QvlymRR910

delta 229
zcmZojXh@hK%_uQZ##vB;L9eQimw|zSk(Zl+mz(qBW<!BS&dnb=1;nIz@)`KJe>3oJ
z=g;DOz|Y0ElP`|@Hy<Z&Ij`Af8HH)w6B|4^1K4>O!~+=_87GU&=`u1+Hqx<W;gx03
zm{_PXdAd#~qvT{oT`>+W9tP21Mh?cw4!R&kxw-+2Y7+~U^wpVp7)0e685yM+IT)D?
z6<mFMQZw_46LVAZ<d~V2%~C8<ED}>#Su27$co@VZCyU7GOnxKFG1*y9nUQmHhMf82
ed3y604JQ`rF#1g1r0+X<ySyF~6Z7N`x{?535;h$G

diff --git a/src/get_sum.sql b/src/get_sum.sql
index 7e72bb7..0e01acb 100644
--- a/src/get_sum.sql
+++ b/src/get_sum.sql
@@ -1,4 +1,6 @@
 SELECT
-    SUM(kc_per_serving * actual_servings) AS kc
+    SUM(kc_per_serving * actual_servings) AS kc,
+    SUM(protein_per_portion * actual_servings) AS protein,
+    SUM(fiber_per_portion * actual_servings) AS bs
 FROM
     food
diff --git a/src/main.rs b/src/main.rs
index 3ab24fc..5cb85fe 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -18,8 +18,8 @@ use tracing_subscriber::{layer::SubscriberExt as _, util::SubscriberInitExt as _
 #[derive(Debug)]
 struct Sum {
     kc: i32,
-    bs: i32,
-    protein: i32,
+    bs: f32,
+    protein: f32,
 }
 
 impl std::fmt::Display for Sum {
@@ -251,12 +251,13 @@ fn get_foods(conn: &ConnState) -> rusqlite::Result<Vec<Food>> {
 fn get_sum(conn: &Arc<Mutex<Connection>>) -> rusqlite::Result<Sum> {
     let conn = conn.lock();
     let mut stmt = PreparedStatements::get_sum(&conn);
-    let kc = stmt.query_one((), |row| row.get(0))?;
-    let sum = Sum {
-        kc,
-        bs: 99,
-        protein: 99,
-    };
+    let sum = stmt.query_one((), |row| {
+        Ok(Sum {
+            kc: row.get(0)?,
+            bs: row.get(1)?,
+            protein: row.get(2)?,
+        })
+    })?;
     debug!(?sum);
     Ok(sum)
 }
@@ -269,7 +270,10 @@ fn get_date() -> String {
 
 async fn root(State(conn): State<ConnState>) -> Result<Html<String>, StatusCode> {
     let foods = get_foods(&conn).map_err(|_| StatusCode::INTERNAL_SERVER_ERROR)?;
-    let sum = get_sum(&conn).map_err(|_| StatusCode::INTERNAL_SERVER_ERROR)?;
+    let sum = get_sum(&conn).map_err(|e| {
+        error!(?e);
+        StatusCode::INTERNAL_SERVER_ERROR
+    })?;
     let date = get_date();
     let index = IndexTemplate { foods, sum, date };
     Ok(Html(