diff --git a/model/time.go b/model/time.go index baf3ce6..e0c399c 100644 --- a/model/time.go +++ b/model/time.go @@ -1,34 +1,42 @@ package model import ( - "time" - "errors" - sqldriver "database/sql/driver" + sqldriver "database/sql/driver" + "errors" + "time" ) type Time time.Time func MakeTimeNow() Time { - return Time(time.Now().UTC()) + return Time(time.Now().UTC()) } func (self Time) AsUTCString() string { - return time.Time(self).Format(time.RFC3339) + return time.Time(self).Format(time.RFC3339) } func (self Time) Value() (sqldriver.Value, error) { - return self.AsUTCString(), nil + return self.AsUTCString(), nil } func (self *Time) Scan(value any) error { - if valueStr, ok := value.(string); ok { - parsedTime, err := time.Parse(time.RFC3339, valueStr) - if err == nil { - *self = Time(parsedTime.UTC()) - } - return err - } else { - return errors.New("Expected a string") - } + if valueStr, ok := value.(string); ok { + parsedTime, err := time.Parse(time.RFC3339, valueStr) + if err == nil { + *self = Time(parsedTime.UTC()) + } + return err + } else { + return errors.New("Expected a string") + } +} + +func (from Time) Compare(to Time) int { + return time.Time(from).Compare(time.Time(to)) +} + +func (self *Time) Add(duration time.Duration) { + *self = Time(time.Time(*self).Add(duration)) } diff --git a/model/timer.go b/model/timer.go index 4c81962..a47369d 100644 --- a/model/timer.go +++ b/model/timer.go @@ -1,9 +1,12 @@ package model type Timer struct { - Id UUID - Name string - StartTime Time - EndTime Time + Id UUID + Name string + StartTime Time + EndTime Time } +func (self Timer) IsFinished() bool { + return MakeTimeNow().Compare(self.EndTime) >= 0 +} diff --git a/model/uuid.go b/model/uuid.go index 4a25e41..6cade35 100644 --- a/model/uuid.go +++ b/model/uuid.go @@ -1,28 +1,27 @@ -package model - -import ( - sqldriver "database/sql/driver" - "github.com/google/uuid" -) - -type UUID struct { - payload uuid.UUID -} - -func MakeUUID() UUID { - id, _ := uuid.NewV7() - return UUID { payload: id } -} - -func (self UUID) Value() (sqldriver.Value, error) { - return self.payload[:], nil -} - -func (self *UUID) Scan(value any) error { - return self.payload.Scan(value) -} - -func (self UUID) String() string { - return self.payload.String() -} - +package model + +import ( + sqldriver "database/sql/driver" + "github.com/google/uuid" +) + +type UUID struct { + payload uuid.UUID +} + +func MakeUUID() UUID { + id, _ := uuid.NewV7() + return UUID{payload: id} +} + +func (self UUID) Value() (sqldriver.Value, error) { + return self.payload[:], nil +} + +func (self *UUID) Scan(value any) error { + return self.payload.Scan(value) +} + +func (self UUID) String() string { + return self.payload.String() +} diff --git a/timer.go b/timer.go index 587d24e..e76f950 100644 --- a/timer.go +++ b/timer.go @@ -3,6 +3,7 @@ package main import ( "context" "database/sql" + "errors" "log" "net/http" "strconv" @@ -50,12 +51,12 @@ func initializeDatabase(db *sql.DB) error { return err } - err = insertTimer(tx, "My timer", 600) + err = insertTimer(tx, "My timer", 6) if err != nil { return err } - err = insertTimer(tx, "My timer2", 600) + err = insertTimer(tx, "My timer2", 6) if err != nil { return err } @@ -86,7 +87,7 @@ func initializeDatabase(db *sql.DB) error { return err } - _, err = tx.Exec(`INSERT INTO Timer VALUES ($1, $2, $3, $4)`, userId, "steven", userUuidStr, password) + _, err = tx.Exec(`INSERT INTO User VALUES ($1, $2, $3, $4)`, userId, "steven", userUuidStr, password) if err != nil { return err } @@ -139,7 +140,17 @@ func deleteTimer(db *sql.DB, idStr string) bool { } affected, err := res.RowsAffected() - return err == nil && affected > 0 + return err == nil && affected == 1 +} + +func updateTimerEndTime(db *sql.DB, id model.UUID, endTime model.Time) bool { + res, err := db.Exec("UPDATE Timer SET EndTime=$1 WHERE Id=$2", endTime, id) + if err != nil { + return false + } + + affected, err := res.RowsAffected() + return err == nil && affected == 1 } type Session struct { @@ -174,6 +185,65 @@ func (server *MyServer) handleTimer(w http.ResponseWriter, r *http.Request) { } } +func parseDuration(value string) (time.Duration, error) { + const nullDuration = time.Duration(0) + if len(value) == 0 { + return nullDuration, errors.New("Empty duration string") + } + + var unit time.Duration + switch value[len(value)-1] { + case 's': + unit = time.Second + case 'm': + unit = time.Minute + case 'h': + unit = time.Hour + case 'd': + unit = time.Duration(24) * time.Hour + case 'w': + unit = time.Duration(24*7) * time.Hour + default: + return nullDuration, errors.New("Invalid duration format") + } + + amount, err := strconv.ParseInt(value[0:len(value)-1], 10, 64) + if err != nil || amount < 0 { + return nullDuration, errors.New("Invalid duration value") + } + + return time.Duration(amount) * unit, nil +} + +func (server *MyServer) handleTimerAddTime(w http.ResponseWriter, r *http.Request) { + timer := queryTimer(server.db, r.PathValue("timerId")) + if timer == nil { + server.handleNotFound(w, r) + return + } + + if timer.IsFinished() { + w.WriteHeader(http.StatusBadRequest) + return + } + + duration, err := parseDuration(r.PathValue("timeToAdd")) + if err != nil { + w.WriteHeader(http.StatusBadRequest) + w.Write([]byte(err.Error())) + return + } + + timer.EndTime.Add(duration) + res := updateTimerEndTime(server.db, timer.Id, timer.EndTime) + if !res { + w.WriteHeader(http.StatusBadRequest) + return + } + + view.TimerView(*timer).Render(context.Background(), w) +} + func (server *MyServer) handleDeleteTimer(w http.ResponseWriter, r *http.Request) { success := deleteTimer(server.db, r.PathValue("timerId")) if !success { @@ -244,6 +314,7 @@ func main() { http.Handle("GET /static/", http.StripPrefix("/static/", fs)) http.HandleFunc("GET /timer/{timerId}", myServer.handleTimer) + http.HandleFunc("POST /timer/{timerId}/addTime/{timeToAdd}", myServer.handleTimerAddTime) http.HandleFunc("DELETE /timer/{timerId}", myServer.handleDeleteTimer) http.HandleFunc("PUT /timer", myServer.handlePutTimer) http.HandleFunc("GET /", myServer.handleMain) diff --git a/view/timer.templ b/view/timer.templ index 8d20933..a447d01 100644 --- a/view/timer.templ +++ b/view/timer.templ @@ -1,26 +1,43 @@ package view import ( - "stevenlr.com/timer/model" + "fmt" + "stevenlr.com/timer/model" ) templ TimerView(timer model.Timer) { -

This is timer { timer.Name }

-

Back to list

-

Start time: { timer.StartTime.AsUTCString() }

-

End time: { timer.EndTime.AsUTCString() }

-

- Total time: - -

-

- Remaining time: - -

+
+

This is timer { timer.Name }

+

Back to list

+

Start time: { timer.StartTime.AsUTCString() }

+

End time: { timer.EndTime.AsUTCString() }

+

+ Total time: + +

+

+ Remaining time: + +

+ if !timer.IsFinished() { +

Add time

+

+ + + + + + + + + +

+ } +
} diff --git a/view/timer_templ.go b/view/timer_templ.go index 55e5346..1cafffd 100644 --- a/view/timer_templ.go +++ b/view/timer_templ.go @@ -11,6 +11,7 @@ import "io" import "bytes" import ( + "fmt" "stevenlr.com/timer/model" ) @@ -27,14 +28,14 @@ func TimerView(timer model.Timer) templ.Component { templ_7745c5c3_Var1 = templ.NopComponent } ctx = templ.ClearChildren(ctx) - _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("

This is timer ") + _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("

This is timer ") if templ_7745c5c3_Err != nil { return templ_7745c5c3_Err } var templ_7745c5c3_Var2 string templ_7745c5c3_Var2, templ_7745c5c3_Err = templ.JoinStringErrs(timer.Name) if templ_7745c5c3_Err != nil { - return templ.Error{Err: templ_7745c5c3_Err, FileName: `view\timer.templ`, Line: 8, Col: 34} + return templ.Error{Err: templ_7745c5c3_Err, FileName: `view\timer.templ`, Line: 10, Col: 32} } _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var2)) if templ_7745c5c3_Err != nil { @@ -47,7 +48,7 @@ func TimerView(timer model.Timer) templ.Component { var templ_7745c5c3_Var3 string templ_7745c5c3_Var3, templ_7745c5c3_Err = templ.JoinStringErrs(timer.StartTime.AsUTCString()) if templ_7745c5c3_Err != nil { - return templ.Error{Err: templ_7745c5c3_Err, FileName: `view\timer.templ`, Line: 10, Col: 62} + return templ.Error{Err: templ_7745c5c3_Err, FileName: `view\timer.templ`, Line: 12, Col: 60} } _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var3)) if templ_7745c5c3_Err != nil { @@ -60,7 +61,7 @@ func TimerView(timer model.Timer) templ.Component { var templ_7745c5c3_Var4 string templ_7745c5c3_Var4, templ_7745c5c3_Err = templ.JoinStringErrs(timer.EndTime.AsUTCString()) if templ_7745c5c3_Err != nil { - return templ.Error{Err: templ_7745c5c3_Err, FileName: `view\timer.templ`, Line: 11, Col: 58} + return templ.Error{Err: templ_7745c5c3_Err, FileName: `view\timer.templ`, Line: 13, Col: 56} } _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var4)) if templ_7745c5c3_Err != nil { @@ -73,7 +74,7 @@ func TimerView(timer model.Timer) templ.Component { var templ_7745c5c3_Var5 string templ_7745c5c3_Var5, templ_7745c5c3_Err = templ.JoinStringErrs(timer.StartTime.AsUTCString()) if templ_7745c5c3_Err != nil { - return templ.Error{Err: templ_7745c5c3_Err, FileName: `view\timer.templ`, Line: 15, Col: 49} + return templ.Error{Err: templ_7745c5c3_Err, FileName: `view\timer.templ`, Line: 17, Col: 41} } _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var5)) if templ_7745c5c3_Err != nil { @@ -86,7 +87,7 @@ func TimerView(timer model.Timer) templ.Component { var templ_7745c5c3_Var6 string templ_7745c5c3_Var6, templ_7745c5c3_Err = templ.JoinStringErrs(timer.EndTime.AsUTCString()) if templ_7745c5c3_Err != nil { - return templ.Error{Err: templ_7745c5c3_Err, FileName: `view\timer.templ`, Line: 16, Col: 45} + return templ.Error{Err: templ_7745c5c3_Err, FileName: `view\timer.templ`, Line: 18, Col: 37} } _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var6)) if templ_7745c5c3_Err != nil { @@ -99,7 +100,7 @@ func TimerView(timer model.Timer) templ.Component { var templ_7745c5c3_Var7 string templ_7745c5c3_Var7, templ_7745c5c3_Err = templ.JoinStringErrs(timer.EndTime.AsUTCString()) if templ_7745c5c3_Err != nil { - return templ.Error{Err: templ_7745c5c3_Err, FileName: `view\timer.templ`, Line: 22, Col: 45} + return templ.Error{Err: templ_7745c5c3_Err, FileName: `view\timer.templ`, Line: 24, Col: 37} } _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString(templ.EscapeString(templ_7745c5c3_Var7)) if templ_7745c5c3_Err != nil { @@ -109,6 +110,133 @@ func TimerView(timer model.Timer) templ.Component { if templ_7745c5c3_Err != nil { return templ_7745c5c3_Err } + if !timer.IsFinished() { + _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("

Add time

") + if templ_7745c5c3_Err != nil { + return templ_7745c5c3_Err + } + } + _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteString("
") + if templ_7745c5c3_Err != nil { + return templ_7745c5c3_Err + } if !templ_7745c5c3_IsBuffer { _, templ_7745c5c3_Err = templ_7745c5c3_Buffer.WriteTo(templ_7745c5c3_W) }