From cb368dff101d257ad33b5e1846f7f93c9cfa4dee Mon Sep 17 00:00:00 2001 From: Weather Date: Thu, 8 Oct 2026 00:26:49 -0400 Subject: [PATCH] fix: Negative Creations and Blank Reports --- internal/database/counter.go | 5 ++++- internal/database/reset.go | 4 ++-- templates/counter.tmpl | 6 +++--- 3 files changed, 9 insertions(+), 6 deletions(-) diff --git a/internal/database/counter.go b/internal/database/counter.go index 2b4f3f9..2376a32 100644 --- a/internal/database/counter.go +++ b/internal/database/counter.go @@ -5,6 +5,7 @@ import ( "time" "github.com/ComputerScienceHouse/counters/internal/models" + "github.com/ComputerScienceHouse/counters/internal/util" "github.com/jackc/pgx/v5" ) @@ -29,7 +30,9 @@ func CreateCounterWithReset(ctx context.Context, userId string, username string, return "", err } - resetID, err := CreateResetWithTransaction(ctx, tx, userId, username, rReq) + patchedResetTime := util.TranslateTime(rReq.ResetTime) + + resetID, err := CreateResetWithTransaction(ctx, tx, userId, username, patchedResetTime, rReq) if err != nil { return "", err } diff --git a/internal/database/reset.go b/internal/database/reset.go index 1ece040..209e21d 100644 --- a/internal/database/reset.go +++ b/internal/database/reset.go @@ -22,7 +22,7 @@ func CreateReset(ctx context.Context, userID string, username string, resetTime return resetID, err } -func CreateResetWithTransaction(ctx context.Context, tx pgx.Tx, userID string, username string, req *models.CreateResetInput) (string, error) { +func CreateResetWithTransaction(ctx context.Context, tx pgx.Tx, userID string, username string, resetTime int64, req *models.CreateResetInput) (string, error) { resetID, err := GenerateUUID() if err != nil { return "", err @@ -31,7 +31,7 @@ func CreateResetWithTransaction(ctx context.Context, tx pgx.Tx, userID string, u _, err = tx.Exec(ctx, ` INSERT INTO resets (reset_id, counter_id, user_id, username, description, occured_at) VALUES ($1, $2, $3, $4, $5, $6) - `, resetID, req.CounterID, userID, username, req.Description, req.ResetTime) + `, resetID, req.CounterID, userID, username, req.Description, time.Unix(resetTime, 0)) return resetID, err } diff --git a/templates/counter.tmpl b/templates/counter.tmpl index 9bd7469..49ff42c 100644 --- a/templates/counter.tmpl +++ b/templates/counter.tmpl @@ -92,14 +92,14 @@
- {{ $reset.Description }} + {{ $reset.ResetDescription }}
- reported by: {{ $reset.Reporter }} + reported by: {{ $reset.ResetUsername }}
- + Day(s) Ago