Merge pull request #65 from BenMusch/benMuschol-perDeckStats

[decks] Add endpoint for stats and card counts by deck

Author: domino14

api/rpc/wordvault/api.pb.go

@@ -63,6 +63,19 @@ SELECT lexicon_name, count(*) as card_count FROM wordvault_cards
 WHERE user_id = $1
 GROUP BY lexicon_name;
 
+-- name: GetNumCardsInVaultByDeck :many
+SELECT
+    COALESCE(deck_id, 0) as deck_id,
+    COUNT(*) as card_count
+FROM
+    wordvault_cards
+WHERE
+    user_id = $1 AND lexicon_name = $2
+GROUP BY
+    deck_id
+ORDER BY
+    deck_id NULLS FIRST;
+
 -- name: UpdateCard :exec
 UPDATE wordvault_cards
 SET fsrs_card = $1, next_scheduled = $2, review_log = review_log || @review_log_item::jsonb
@@ -164,17 +177,25 @@ WITH scheduled_cards AS (
     FROM
         wordvault_cards
     WHERE user_id = $1 AND lexicon_name = $2
+),
+per_date AS (
+    SELECT
+        deck_id,
+        CASE
+            WHEN scheduled_date = '-infinity'::date THEN 'overdue'
+            WHEN scheduled_date = 'infinity'::date THEN 'infinity'
+            ELSE to_char(scheduled_date, 'YYYY-MM-DD')
+        END AS key,
+        COUNT(*) AS question_count
+    FROM scheduled_cards
+    GROUP BY deck_id, scheduled_date
 )
 SELECT
     deck_id,
-    scheduled_date,
-    COUNT(*) AS question_count
-FROM
-    scheduled_cards
-GROUP BY
-    deck_id, scheduled_date
-ORDER BY
-    scheduled_date;
+    jsonb_object_agg(key, question_count) AS breakdown
+FROM per_date
+GROUP BY deck_id
+ORDER BY deck_id;
 
 -- name: GetOverdueCount :one
 SELECT

api/rpc/wordvault/wordvaultconnect/api.connect.go

@@ -75,4 +75,28 @@ WHERE
 GROUP BY
     u.username
 ORDER BY
-    cards_studied_today DESC;
+    cards_studied_today DESC;
+
+-- name: GetDailyProgressByDeck :many
+SELECT
+    deck_id,
+    COALESCE(SUM(CASE WHEN jsonb_array_length(review_log) = 1 THEN 1 ELSE 0 END), 0)::int AS new_cards,
+    COALESCE(SUM(CASE WHEN jsonb_array_length(review_log) > 1 THEN 1 ELSE 0 END), 0)::int AS reviewed_cards,
+    COALESCE(COUNT(*) FILTER (WHERE jsonb_array_length(review_log) = 1 AND (review_log->0->>'Rating')::int = 1), 0)::int AS new_rating_1,
+    COALESCE(COUNT(*) FILTER (WHERE jsonb_array_length(review_log) = 1 AND (review_log->0->>'Rating')::int = 2), 0)::int AS new_rating_2,
+    COALESCE(COUNT(*) FILTER (WHERE jsonb_array_length(review_log) = 1 AND (review_log->0->>'Rating')::int = 3), 0)::int AS new_rating_3,
+    COALESCE(COUNT(*) FILTER (WHERE jsonb_array_length(review_log) = 1 AND (review_log->0->>'Rating')::int = 4), 0)::int AS new_rating_4,
+    COALESCE(COUNT(*) FILTER (WHERE jsonb_array_length(review_log) > 1 AND (review_log->-1->>'Rating')::int = 1), 0)::int AS reviewed_rating_1,
+    COALESCE(COUNT(*) FILTER (WHERE jsonb_array_length(review_log) > 1 AND (review_log->-1->>'Rating')::int = 2), 0)::int AS reviewed_rating_2,
+    COALESCE(COUNT(*) FILTER (WHERE jsonb_array_length(review_log) > 1 AND (review_log->-1->>'Rating')::int = 3), 0)::int AS reviewed_rating_3,
+    COALESCE(COUNT(*) FILTER (WHERE jsonb_array_length(review_log) > 1 AND (review_log->-1->>'Rating')::int = 4), 0)::int AS reviewed_rating_4
+FROM
+    wordvault_cards
+WHERE
+    user_id = @user_id
+    AND ((fsrs_card->>'LastReview')::timestamp AT TIME ZONE 'UTC' AT TIME ZONE sqlc.arg(timezone)::text)::date =
+        (sqlc.arg(now)::timestamptz AT TIME ZONE sqlc.arg(timezone)::text)::date
+GROUP BY
+    deck_id
+ORDER BY
+    deck_id NULLS FIRST;