4fb1a4553e
Code-review fixes on the Authentik/budget/Resend work: - UpsertForwardUser: avoid 500 lockout on username UNIQUE collision and on the concurrent first-login race; normalize emails (lower+trim) so case variants don't create duplicate accounts. - Centralize email management in Authentik: when forward-auth mode is on, email is read-only in Veola for every user (not just forward rows); pure-local deployments keep editable email for Resend. - Fail closed on per-user isolation: ownedItem rejects uid==0/orphaned items; dashboard and global results error on a userless request. - Budget accuracy: count Apify usage only after a successful run, and count the billed Test Apify run. - Efficiency: resolve the deal-email recipient once per poll; build the settings page once in PostEmailPrefs.
106 lines
3.1 KiB
Go
106 lines
3.1 KiB
Go
package handlers
|
|
|
|
import (
|
|
"errors"
|
|
"net/http"
|
|
|
|
"veola/internal/db"
|
|
"veola/templates"
|
|
)
|
|
|
|
func (a *App) GetDashboard(w http.ResponseWriter, r *http.Request) {
|
|
d, err := a.dashboardData(r)
|
|
if err != nil {
|
|
a.serverError(w, r, err)
|
|
return
|
|
}
|
|
render(w, r, templates.Dashboard(d))
|
|
}
|
|
|
|
func (a *App) GetDashboardRefresh(w http.ResponseWriter, r *http.Request) {
|
|
d, err := a.dashboardData(r)
|
|
if err != nil {
|
|
a.serverError(w, r, err)
|
|
return
|
|
}
|
|
// Render ONLY the inner body. The hx-swap="outerHTML" on DashboardBody's
|
|
// root div replaces it with this fresh copy. Rendering templates.Dashboard
|
|
// here would return the whole Layout — sidebar included — nested inside
|
|
// the div, producing a duplicate nav bar on every refresh.
|
|
render(w, r, templates.DashboardBody(d))
|
|
}
|
|
|
|
func (a *App) dashboardData(r *http.Request) (templates.DashboardData, error) {
|
|
uid := a.userID(r)
|
|
// Fail closed: every store method below treats ownerID 0 as "all owners",
|
|
// so a userless request must error rather than render cross-tenant data.
|
|
if uid == 0 {
|
|
return templates.DashboardData{}, errors.New("dashboard: no authenticated user in context")
|
|
}
|
|
stats, err := a.Store.GetDashboardStatsForUser(r.Context(), uid)
|
|
if err != nil {
|
|
return templates.DashboardData{}, err
|
|
}
|
|
results, err := a.Store.ListResults(r.Context(), db.ResultsQuery{OwnerID: uid, Limit: 8, ExcludeEnded: true})
|
|
if err != nil {
|
|
return templates.DashboardData{}, err
|
|
}
|
|
itemNames := map[int64]string{}
|
|
all, _ := a.Store.ListItemsForUser(r.Context(), uid)
|
|
for _, it := range all {
|
|
itemNames[it.ID] = it.Name
|
|
}
|
|
rrs := make([]templates.ResultRow, 0, len(results))
|
|
for _, r := range results {
|
|
rrs = append(rrs, templates.ResultRow{
|
|
ItemID: r.ItemID,
|
|
ItemName: itemNames[r.ItemID],
|
|
Title: r.Title,
|
|
Price: r.Price,
|
|
Currency: r.Currency,
|
|
Source: r.Source,
|
|
URL: r.URL,
|
|
ImageURL: r.ImageURL,
|
|
FoundAt: r.FoundAt,
|
|
Alerted: r.Alerted,
|
|
})
|
|
}
|
|
alerts, err := alertsRecent(a, r, itemNames)
|
|
if err != nil {
|
|
return templates.DashboardData{}, err
|
|
}
|
|
apifyToday, apifyMonth, costPerCall, monthlyBudget := a.Scheduler.ApifyUsage(r.Context())
|
|
ebayUsed, ebayLimit := a.Scheduler.EbayUsage(r.Context())
|
|
return templates.DashboardData{
|
|
Page: a.page(r, "Dashboard", "dashboard"),
|
|
Stats: stats,
|
|
RecentResults: rrs,
|
|
RecentAlerts: alerts,
|
|
ApifyToday: apifyToday,
|
|
ApifyMonth: apifyMonth,
|
|
ApifyCostPerCall: costPerCall,
|
|
MonthlyBudget: monthlyBudget,
|
|
EbayToday: ebayUsed,
|
|
EbayLimit: ebayLimit,
|
|
}, nil
|
|
}
|
|
|
|
func alertsRecent(a *App, r *http.Request, itemNames map[int64]string) ([]templates.AlertRow, error) {
|
|
results, err := a.Store.ListResults(r.Context(), db.ResultsQuery{OwnerID: a.userID(r), OnlyAlerted: true, Limit: 5})
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
out := make([]templates.AlertRow, 0, len(results))
|
|
for _, res := range results {
|
|
out = append(out, templates.AlertRow{
|
|
ItemName: itemNames[res.ItemID],
|
|
Title: res.Title,
|
|
Price: res.Price,
|
|
Currency: res.Currency,
|
|
ImageURL: res.ImageURL,
|
|
FoundAt: res.FoundAt,
|
|
})
|
|
}
|
|
return out, nil
|
|
}
|