Auction handling: - Capture itemEndDate from eBay Browse API and ending_date from ZenMarket (Yahoo JP); plumb through results.ends_at column. Permissive ZenMarket parser (multiple layouts, JST when offset missing). - Per-row "Ends" countdown column + "Ending soon" banner on results pages, live-ticked by flair.js with urgent/critical tinting under 1h/5m. - Backfill ends_at for known auctions when their URL reappears in a poll (dedup hit no longer drops the new end time). - Hide ended auctions from result listings by default via ResultsQuery.ExcludeEnded; rows stay in the DB. Visual flair: - Glassy backdrop-blur v-cards with gradient-mask borders and hover-lift. - htmx swap fade-in via transient .v-just-swapped class. - Count-up animation on dashboard stats. All animations gated behind prefers-reduced-motion. eBay condition + region filters (auctions-style scoping): - items.condition and items.region columns; threaded through item form, CreateItem/UpdateItem, scheduler eBay plan input, and previewKey so cache invalidates when these change. - ebay.SearchParams gains conditionIds and itemLocationCountry filters. Run Now reload + countdown engine: - Run Now now sets HX-Refresh: true (non-htmx fallback: 303 redirect) so the entire results view — best price, chart, badge, last polled — reflects the new poll, instead of swapping just one partial. Pre-launch hardening (P1 set): - auth.EqualizeLoginTiming on no-such-user branch. - (*App).serverError centralizes 500s; replaces err.Error() leaks across results/settings/items/users/dashboard handlers. - main.go server: ReadTimeout 30s / WriteTimeout 60s / IdleTimeout 120s alongside the existing ReadHeaderTimeout. - noListFS wrapper blocks static directory listings. - Credential fields in settings no longer render value=; blank submission preserves the saved value, with per-field "Saved in settings / Set in config.toml / Not set" status indicator. Misc: - -debug flag wires slog to LevelDebug; raw ZenMarket items logged for format diagnosis. - /healthz public endpoint for reverse-proxy probes. - deploy/veola.service systemd unit template (hardening flags, single ReadWritePaths=/var/lib/veola). - handlers_test.go covers /healthz, setup-gate redirect, auth gate, and /login render with httptest + in-memory sqlite. - best_price_currency on items; templates pick the right symbol per row. - .gitignore now excludes *.log / veola-debug.log. Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
160 lines
4.0 KiB
Go
160 lines
4.0 KiB
Go
package handlers
|
|
|
|
import (
|
|
"net/http"
|
|
"strconv"
|
|
"strings"
|
|
"time"
|
|
|
|
"veola/internal/db"
|
|
"veola/internal/models"
|
|
"veola/internal/scheduler"
|
|
"veola/templates"
|
|
)
|
|
|
|
const resultsPerPage = 20
|
|
|
|
func (a *App) GetItemResults(w http.ResponseWriter, r *http.Request) {
|
|
id := intParam(r, "id")
|
|
it, err := a.Store.GetItem(r.Context(), id)
|
|
if err != nil || it == nil {
|
|
http.NotFound(w, r)
|
|
return
|
|
}
|
|
page, _ := strconv.Atoi(r.URL.Query().Get("page"))
|
|
d, err := a.buildItemResultsData(r, it, page, r.URL.Query().Get("order"))
|
|
if err != nil {
|
|
a.serverError(w, r, err)
|
|
return
|
|
}
|
|
render(w, r, templates.ItemResults(d))
|
|
}
|
|
|
|
// buildItemResultsData assembles the per-item results view: paginated results,
|
|
// price history, badge, and chart JSON. Shared by GetItemResults and the
|
|
// "Run Now" handler so both render identical data.
|
|
func (a *App) buildItemResultsData(r *http.Request, it *models.Item, page int, order string) (templates.ItemResultsData, error) {
|
|
if order == "" {
|
|
order = "found_desc"
|
|
}
|
|
if page < 1 {
|
|
page = 1
|
|
}
|
|
|
|
total, err := a.Store.CountResults(r.Context(), it.ID, true)
|
|
if err != nil {
|
|
return templates.ItemResultsData{}, err
|
|
}
|
|
totalPages := (total + resultsPerPage - 1) / resultsPerPage
|
|
if totalPages < 1 {
|
|
totalPages = 1
|
|
}
|
|
if page > totalPages {
|
|
page = totalPages
|
|
}
|
|
|
|
results, err := a.Store.ListResults(r.Context(), db.ResultsQuery{
|
|
ItemID: it.ID,
|
|
Limit: resultsPerPage,
|
|
Offset: (page - 1) * resultsPerPage,
|
|
Order: order,
|
|
ExcludeEnded: true,
|
|
})
|
|
if err != nil {
|
|
return templates.ItemResultsData{}, err
|
|
}
|
|
|
|
history, err := a.Store.ListPriceHistory(r.Context(), it.ID)
|
|
if err != nil {
|
|
return templates.ItemResultsData{}, err
|
|
}
|
|
|
|
// 24h surface for the "ending soon" strip — beyond that, a static
|
|
// "ends in 4 days" in the per-row cell carries enough signal on its own.
|
|
endingSoon, _ := a.Store.NextEndingResult(r.Context(), it.ID, 24*time.Hour)
|
|
|
|
return templates.ItemResultsData{
|
|
Page: a.page(r, it.Name, "items"),
|
|
Item: *it,
|
|
Badge: scheduler.PickBadge(*it, history, time.Now()),
|
|
History: history,
|
|
Results: results,
|
|
Page_: page,
|
|
TotalPages: totalPages,
|
|
Order: order,
|
|
HistoryChartJSON: buildChartJSON(history),
|
|
EndingSoon: endingSoon,
|
|
}, nil
|
|
}
|
|
|
|
func buildChartJSON(history []models.PricePoint) string {
|
|
c := templates.ChartJSON{
|
|
Labels: make([]string, 0, len(history)),
|
|
Points: make([]float64, 0, len(history)),
|
|
}
|
|
for _, p := range history {
|
|
c.Labels = append(c.Labels, p.PolledAt.Format("2006-01-02"))
|
|
c.Points = append(c.Points, p.Price)
|
|
}
|
|
return templates.MustChartJSON(c)
|
|
}
|
|
|
|
func (a *App) GetGlobalResults(w http.ResponseWriter, r *http.Request) {
|
|
q := r.URL.Query()
|
|
itemID, _ := strconv.ParseInt(q.Get("item_id"), 10, 64)
|
|
from := strings.TrimSpace(q.Get("from"))
|
|
to := strings.TrimSpace(q.Get("to"))
|
|
|
|
items, err := a.Store.ListItems(r.Context())
|
|
if err != nil {
|
|
a.serverError(w, r, err)
|
|
return
|
|
}
|
|
names := make(map[int64]string, len(items))
|
|
for _, it := range items {
|
|
names[it.ID] = it.Name
|
|
}
|
|
|
|
results, err := a.Store.ListResults(r.Context(), db.ResultsQuery{
|
|
ItemID: itemID,
|
|
Limit: 200,
|
|
ExcludeEnded: true,
|
|
})
|
|
if err != nil {
|
|
a.serverError(w, r, err)
|
|
return
|
|
}
|
|
|
|
fromT, _ := time.Parse("2006-01-02", from)
|
|
toT, _ := time.Parse("2006-01-02", to)
|
|
if !toT.IsZero() {
|
|
toT = toT.Add(24 * time.Hour)
|
|
}
|
|
|
|
rows := make([]templates.ItemResultRow, 0, len(results))
|
|
for _, res := range results {
|
|
if !fromT.IsZero() && res.FoundAt.Before(fromT) {
|
|
continue
|
|
}
|
|
if !toT.IsZero() && !res.FoundAt.Before(toT) {
|
|
continue
|
|
}
|
|
rows = append(rows, templates.ItemResultRow{
|
|
Result: res,
|
|
ItemName: names[res.ItemID],
|
|
})
|
|
}
|
|
|
|
endingSoon, _ := a.Store.NextEndingResult(r.Context(), itemID, 24*time.Hour)
|
|
|
|
render(w, r, templates.GlobalResults(templates.GlobalResultsData{
|
|
Page: a.page(r, "Results", "results"),
|
|
Items: items,
|
|
Results: rows,
|
|
ItemID: itemID,
|
|
From: from,
|
|
To: to,
|
|
EndingSoon: endingSoon,
|
|
}))
|
|
}
|