add and refine thunderball results page

2025-03-25 14:47:41 +00:00
parent f1ad9757ba
commit 0b93fd75dd
12 changed files with 375 additions and 28 deletions
--- a/handlers/results.go
+++ b/handlers/results.go
@@ -0,0 +1,124 @@
+package handlers
+
+import (
+	"database/sql"
+	"html/template"
+	"log"
+	"net/http"
+	"regexp"
+	"sort"
+	"strconv"
+	"synlotto-website/helpers"
+	"synlotto-website/models"
+)
+
+func ResultsThunderball(db *sql.DB) http.HandlerFunc {
+	return func(w http.ResponseWriter, r *http.Request) {
+		const pageSize = 20
+		page := 1
+		offset := 0
+
+		query := r.URL.Query().Get("q")
+		pageStr := r.URL.Query().Get("page")
+		yearFilter := r.URL.Query().Get("year")
+		machineFilter := r.URL.Query().Get("machine")
+		ballSetFilter := r.URL.Query().Get("ballset")
+
+		if p, err := strconv.Atoi(pageStr); err == nil && p > 0 {
+			page = p
+			offset = (page - 1) * pageSize
+		}
+
+		isValidDate := regexp.MustCompile(`^\d{4}-\d{2}-\d{2}$`).MatchString
+		isValidNumber := regexp.MustCompile(`^\d+$`).MatchString
+		doSearch := isValidDate(query) || isValidNumber(query)
+
+		whereClause := "WHERE 1=1"
+		args := []interface{}{}
+
+		if doSearch {
+			whereClause += " AND (draw_date = ? OR id = ?)"
+			args = append(args, query, query)
+		}
+		if yearFilter != "" {
+			whereClause += " AND strftime('%Y', draw_date) = ?"
+			args = append(args, yearFilter)
+		}
+		if machineFilter != "" {
+			whereClause += " AND machine = ?"
+			args = append(args, machineFilter)
+		}
+		if ballSetFilter != "" {
+			whereClause += " AND ballset = ?"
+			args = append(args, ballSetFilter)
+		}
+
+		totalPages, totalResults := helpers.GetTotalPages(db, "results_thunderball", whereClause, args, pageSize)
+
+		querySQL := `
+			SELECT id, draw_date, machine, ballset, ball1, ball2, ball3, ball4, ball5, thunderball
+			FROM results_thunderball
+			` + whereClause + `
+			ORDER BY id DESC
+			LIMIT ? OFFSET ?`
+		argsWithLimit := append(args, pageSize, offset)
+
+		rows, err := db.Query(querySQL, argsWithLimit...)
+		if err != nil {
+			http.Error(w, "Database error", http.StatusInternalServerError)
+			log.Println("❌ DB error:", err)
+			return
+		}
+		defer rows.Close()
+
+		var results []models.ThunderballResult
+		for rows.Next() {
+			var res models.ThunderballResult
+			if err := rows.Scan(
+				&res.Id, &res.DrawDate, &res.Machine, &res.BallSet,
+				&res.Ball1, &res.Ball2, &res.Ball3, &res.Ball4, &res.Ball5, &res.Thunderball,
+			); err != nil {
+				log.Println("❌ Row scan error:", err)
+				continue
+			}
+			res.SortedBalls = []int{res.Ball1, res.Ball2, res.Ball3, res.Ball4, res.Ball5}
+			sort.Ints(res.SortedBalls)
+			results = append(results, res)
+		}
+
+		years, _ := helpers.GetDistinctValues(db, "strftime('%Y', draw_date)")
+		machines, _ := helpers.GetDistinctValues(db, "machine")
+		ballsets, _ := helpers.GetDistinctValues(db, "ballset")
+
+		var noResultsMsg string
+		if query != "" && !doSearch {
+			noResultsMsg = "Invalid search. Please enter a draw number or date (yyyy-mm-dd)."
+		} else if len(results) == 0 && query != "" {
+			noResultsMsg = "No results found for \"" + query + "\""
+		}
+
+		tmpl := template.Must(template.New("").Funcs(helpers.TemplateFuncs()).ParseFiles(
+			"templates/layout.html",
+			"templates/results/thunderball.html",
+		))
+
+		err = tmpl.ExecuteTemplate(w, "layout", map[string]interface{}{
+			"Results":       results,
+			"Page":          page,
+			"TotalPages":    totalPages,
+			"TotalResults":  totalResults,
+			"Query":         query,
+			"NoResultsMsg":  noResultsMsg,
+			"Years":         years,
+			"Machines":      machines,
+			"BallSets":      ballsets,
+			"YearFilter":    yearFilter,
+			"MachineFilter": machineFilter,
+			"BallSetFilter": ballSetFilter,
+		})
+		if err != nil {
+			log.Println("❌ Template error:", err)
+			http.Error(w, "Error rendering results", http.StatusInternalServerError)
+		}
+	}
+}