From 755a58b96c5ee4bd89f7226c493928ce322dc8be Mon Sep 17 00:00:00 2001 From: Damien Elmes Date: Sat, 19 Sep 2020 12:27:00 +1000 Subject: [PATCH] fix incorrect SQL in previous change --- rslib/src/sched/congrats.rs | 25 +++++++++++++++++++++++++ rslib/src/storage/card/congrats.sql | 6 +++--- 2 files changed, 28 insertions(+), 3 deletions(-) diff --git a/rslib/src/sched/congrats.rs b/rslib/src/sched/congrats.rs index e1aa62327..841e66c65 100644 --- a/rslib/src/sched/congrats.rs +++ b/rslib/src/sched/congrats.rs @@ -4,6 +4,7 @@ use crate::backend_proto as pb; use crate::prelude::*; +#[derive(Debug)] pub(crate) struct CongratsInfo { pub learn_count: u32, pub next_learn_due: u32, @@ -36,3 +37,27 @@ impl Collection { }) } } + +#[cfg(test)] +mod test { + use crate::collection::open_test_collection; + + #[test] + fn empty() { + let mut col = open_test_collection(); + let info = col.congrats_info().unwrap(); + assert_eq!( + info, + crate::backend_proto::CongratsInfoOut { + learn_remaining: 0, + review_remaining: false, + new_remaining: false, + have_sched_buried: false, + have_user_buried: false, + is_filtered_deck: false, + secs_until_next_learn: 0, + bridge_commands_supported: true, + } + ) + } +} diff --git a/rslib/src/storage/card/congrats.sql b/rslib/src/storage/card/congrats.sql index 5a75a2fef..b62d8cc81 100644 --- a/rslib/src/storage/card/congrats.sql +++ b/rslib/src/storage/card/congrats.sql @@ -9,9 +9,9 @@ select coalesce( coalesce(sum(queue = :sched_buried_queue), 0) as sched_buried, coalesce(sum(queue = :user_buried_queue), 0) as user_buried, coalesce(sum(queue = :learn_queue), 0) as learn_count, - coalesce( - max( - 0, + max( + 0, + coalesce( min( case when queue = :learn_queue then due