[add] heavy query caching, [add] wpm leaderboard

api/app-routes.go

@@ -8,7 +8,6 @@ import (
 	"os"
 	"path/filepath"
 	"strings"
-	"time"
 
 	argon2 "github.com/alexedwards/argon2id"
 	"github.com/gabriel-vasile/mimetype"
@@ -130,7 +129,7 @@ func (api *API) createAppResourcesRoute(routeName string, args ...map[string]any
 				"WordsPerMinute":       "N/A",
 			}
 
-			if document.Words != nil && *document.Words != 0 {
+			if document.Words != nil && *document.Words != 0 && document.TotalTimeSeconds != 0 {
 				statistics["WordsPerMinute"] = (*document.Words / document.Pages * document.ReadPages) / (document.TotalTimeSeconds / 60.0)
 			}
 
@@ -158,39 +157,17 @@ func (api *API) createAppResourcesRoute(routeName string, args ...map[string]any
 
 			templateVars["Data"] = activity
 		} else if routeName == "home" {
-			start_time := time.Now()
-			weekly_streak, err := api.DB.Queries.GetUserWindowStreaks(api.DB.Ctx, database.GetUserWindowStreaksParams{
-				UserID: userID,
-				Window: "WEEK",
-			})
-			if err != nil {
-				log.Warn("[createAppResourcesRoute] GetUserWindowStreaks DB Error:", err)
-			}
-			log.Debug("GetUserWindowStreaks - WEEK - ", time.Since(start_time))
-			start_time = time.Now()
 
-			daily_streak, err := api.DB.Queries.GetUserWindowStreaks(api.DB.Ctx, database.GetUserWindowStreaksParams{
-				UserID: userID,
-				Window: "DAY",
-			})
-			if err != nil {
-				log.Warn("[createAppResourcesRoute] GetUserWindowStreaks DB Error:", err)
-			}
-			log.Debug("GetUserWindowStreaks - DAY - ", time.Since(start_time))
-
-			start_time = time.Now()
+			streaks, _ := api.DB.Queries.GetUserStreaks(api.DB.Ctx, userID)
 			database_info, _ := api.DB.Queries.GetDatabaseInfo(api.DB.Ctx, userID)
-			log.Debug("GetDatabaseInfo - ", time.Since(start_time))
-
-			start_time = time.Now()
 			read_graph_data, _ := api.DB.Queries.GetDailyReadStats(api.DB.Ctx, userID)
-			log.Debug("GetDailyReadStats - ", time.Since(start_time))
+			wpn_leaderboard, _ := api.DB.Queries.GetWPMLeaderboard(api.DB.Ctx)
 
 			templateVars["Data"] = gin.H{
-				"DailyStreak":  daily_streak,
-				"WeeklyStreak": weekly_streak,
-				"DatabaseInfo": database_info,
-				"GraphData":    read_graph_data,
+				"Streaks":        streaks,
+				"GraphData":      read_graph_data,
+				"DatabaseInfo":   database_info,
+				"WPMLeaderboard": wpn_leaderboard,
 			}
 		} else if routeName == "settings" {
 			user, err := api.DB.Queries.GetUser(api.DB.Ctx, userID)

api/ko-routes.go

@@ -277,6 +277,11 @@ func (api *API) addActivities(c *gin.Context) {
 		return
 	}
 
+	// Update Temp Tables
+	if err := api.DB.CacheTempTables(); err != nil {
+		log.Warn("[addActivities] CacheTempTables Failure: ", err)
+	}
+
 	c.JSON(http.StatusOK, gin.H{
 		"added": len(rActivity.Activity),
 	})