fix: more refactoring #181
This commit is contained in:
@@ -1,142 +1,100 @@
|
||||
package service
|
||||
|
||||
import (
|
||||
"log/slog"
|
||||
"me-fit/template"
|
||||
"me-fit/template/workout"
|
||||
"me-fit/db"
|
||||
"me-fit/types"
|
||||
"me-fit/utils"
|
||||
|
||||
"database/sql"
|
||||
"errors"
|
||||
"log/slog"
|
||||
"net/http"
|
||||
"strconv"
|
||||
"time"
|
||||
)
|
||||
|
||||
func HandleWorkoutPage(db *sql.DB, serverSettings *types.ServerSettings) http.HandlerFunc {
|
||||
return func(w http.ResponseWriter, r *http.Request) {
|
||||
user := utils.GetUser(r)
|
||||
if user == nil {
|
||||
utils.DoRedirect(w, r, "/auth/signin")
|
||||
return
|
||||
}
|
||||
type ServiceWorkout interface {
|
||||
AddWorkout(user *User, workoutDto *WorkoutDto) (*WorkoutDto, error)
|
||||
}
|
||||
|
||||
currentDate := time.Now().Format("2006-01-02")
|
||||
inner := workout.WorkoutComp(currentDate)
|
||||
userComp := UserInfoComp(user)
|
||||
err := template.Layout(inner, userComp, serverSettings.Environment).Render(r.Context(), w)
|
||||
if err != nil {
|
||||
utils.LogError("Failed to render workout page", err)
|
||||
http.Error(w, "Internal Server Error", http.StatusInternalServerError)
|
||||
}
|
||||
type ServiceWorkoutImpl struct {
|
||||
dbWorkout db.DbWorkout
|
||||
randomGenerator RandomGenerator
|
||||
clock Clock
|
||||
mailService MailService
|
||||
serverSettings *types.ServerSettings
|
||||
}
|
||||
|
||||
func NewServiceWorkoutImpl(dbAuth db.DbAuth, randomGenerator RandomGenerator, clock Clock, mailService MailService, serverSettings *types.ServerSettings) *ServiceAuthImpl {
|
||||
return &ServiceAuthImpl{
|
||||
dbAuth: dbAuth,
|
||||
randomGenerator: randomGenerator,
|
||||
clock: clock,
|
||||
mailService: mailService,
|
||||
serverSettings: serverSettings,
|
||||
}
|
||||
}
|
||||
|
||||
func HandleWorkoutNewComp(db *sql.DB) http.HandlerFunc {
|
||||
return func(w http.ResponseWriter, r *http.Request) {
|
||||
user := utils.GetUser(r)
|
||||
if user == nil {
|
||||
utils.DoRedirect(w, r, "/auth/signin")
|
||||
return
|
||||
}
|
||||
type WorkoutDto struct {
|
||||
RowId string
|
||||
Date string
|
||||
Type string
|
||||
Sets string
|
||||
Reps string
|
||||
}
|
||||
|
||||
var dateStr = r.FormValue("date")
|
||||
var typeStr = r.FormValue("type")
|
||||
var setsStr = r.FormValue("sets")
|
||||
var repsStr = r.FormValue("reps")
|
||||
|
||||
if dateStr == "" || typeStr == "" || setsStr == "" || repsStr == "" {
|
||||
utils.TriggerToast(w, r, "error", "Missing required fields")
|
||||
http.Error(w, "Missing required fields", http.StatusBadRequest)
|
||||
return
|
||||
}
|
||||
|
||||
date, err := time.Parse("2006-01-02", dateStr)
|
||||
if err != nil {
|
||||
utils.TriggerToast(w, r, "error", "Invalid date")
|
||||
http.Error(w, err.Error(), http.StatusBadRequest)
|
||||
return
|
||||
}
|
||||
sets, err := strconv.Atoi(setsStr)
|
||||
if err != nil {
|
||||
utils.TriggerToast(w, r, "error", "Invalid number")
|
||||
http.Error(w, err.Error(), http.StatusBadRequest)
|
||||
return
|
||||
}
|
||||
reps, err := strconv.Atoi(repsStr)
|
||||
if err != nil {
|
||||
utils.TriggerToast(w, r, "error", "Invalid number")
|
||||
http.Error(w, err.Error(), http.StatusBadRequest)
|
||||
return
|
||||
}
|
||||
|
||||
var rowId int
|
||||
err = db.QueryRow("INSERT INTO workout (user_id, date, type, sets, reps) VALUES (?, ?, ?, ?, ?) RETURNING rowid", user.Id, date, typeStr, sets, reps).Scan(&rowId)
|
||||
if err != nil {
|
||||
utils.LogError("Could not insert workout", err)
|
||||
utils.TriggerToast(w, r, "error", "Internal Server Error")
|
||||
http.Error(w, err.Error(), http.StatusInternalServerError)
|
||||
return
|
||||
}
|
||||
|
||||
wo := workout.Workout{
|
||||
Id: strconv.Itoa(rowId),
|
||||
Date: renderDate(date),
|
||||
Type: r.FormValue("type"),
|
||||
Sets: r.FormValue("sets"),
|
||||
Reps: r.FormValue("reps"),
|
||||
}
|
||||
|
||||
err = workout.WorkoutItemComp(wo, true).Render(r.Context(), w)
|
||||
if err != nil {
|
||||
utils.LogError("Could not render workoutitem", err)
|
||||
utils.TriggerToast(w, r, "error", "Internal Server Error")
|
||||
http.Error(w, err.Error(), http.StatusInternalServerError)
|
||||
}
|
||||
func NewWorkoutDtoFromDb(workout *db.Workout) *WorkoutDto {
|
||||
return &WorkoutDto{
|
||||
RowId: strconv.Itoa(workout.RowId),
|
||||
Date: renderDate(workout.Date),
|
||||
Type: workout.Type,
|
||||
Sets: strconv.Itoa(workout.Sets),
|
||||
Reps: strconv.Itoa(workout.Reps),
|
||||
}
|
||||
}
|
||||
func NewWorkoutDto(rowId string, date string, workoutType string, sets string, reps string) *WorkoutDto {
|
||||
return &WorkoutDto{
|
||||
RowId: rowId,
|
||||
Date: date,
|
||||
Type: workoutType,
|
||||
Sets: sets,
|
||||
Reps: reps,
|
||||
}
|
||||
}
|
||||
|
||||
func HandleWorkoutGetComp(db *sql.DB) http.HandlerFunc {
|
||||
return func(w http.ResponseWriter, r *http.Request) {
|
||||
user := utils.GetUser(r)
|
||||
if user == nil {
|
||||
utils.DoRedirect(w, r, "/auth/signin")
|
||||
return
|
||||
}
|
||||
var (
|
||||
ErrInputValues = errors.New("Invalid input values")
|
||||
)
|
||||
|
||||
rows, err := db.Query("SELECT rowid, date, type, sets, reps FROM workout WHERE user_id = ? ORDER BY date desc", user.Id)
|
||||
if err != nil {
|
||||
utils.LogError("Could not get workouts", err)
|
||||
utils.TriggerToast(w, r, "error", "Internal Server Error")
|
||||
http.Error(w, err.Error(), http.StatusInternalServerError)
|
||||
return
|
||||
}
|
||||
func (service ServiceWorkoutImpl) AddWorkout(user *User, workoutDto WorkoutDto) (*WorkoutDto, error) {
|
||||
|
||||
var workouts = make([]workout.Workout, 0)
|
||||
for rows.Next() {
|
||||
var workout workout.Workout
|
||||
|
||||
err = rows.Scan(&workout.Id, &workout.Date, &workout.Type, &workout.Sets, &workout.Reps)
|
||||
if err != nil {
|
||||
utils.LogError("Could not scan workout", err)
|
||||
utils.TriggerToast(w, r, "error", "Internal Server Error")
|
||||
http.Error(w, err.Error(), http.StatusInternalServerError)
|
||||
return
|
||||
}
|
||||
|
||||
workout.Date, err = renderDateStr(workout.Date)
|
||||
if err != nil {
|
||||
utils.LogError("Could not render date", err)
|
||||
utils.TriggerToast(w, r, "error", "Internal Server Error")
|
||||
http.Error(w, err.Error(), http.StatusInternalServerError)
|
||||
return
|
||||
}
|
||||
|
||||
workouts = append(workouts, workout)
|
||||
}
|
||||
|
||||
workout.WorkoutListComp(workouts).Render(r.Context(), w)
|
||||
if workoutDto.Date == "" || workoutDto.Type == "" || workoutDto.Sets == "" || workoutDto.Reps == "" {
|
||||
return nil, ErrInputValues
|
||||
}
|
||||
|
||||
date, err := time.Parse("2006-01-02", workoutDto.Date)
|
||||
if err != nil {
|
||||
return nil, ErrInputValues
|
||||
}
|
||||
|
||||
sets, err := strconv.Atoi(workoutDto.Sets)
|
||||
if err != nil {
|
||||
return nil, ErrInputValues
|
||||
}
|
||||
|
||||
reps, err := strconv.Atoi(workoutDto.Reps)
|
||||
if err != nil {
|
||||
return nil, ErrInputValues
|
||||
}
|
||||
|
||||
workoutInsert := db.NewWorkoutInsert(date, workoutDto.Type, sets, reps)
|
||||
|
||||
workout, err := service.dbWorkout.InsertWorkout(user.Id, workoutInsert)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
|
||||
return NewWorkoutDtoFromDb(workout), nil
|
||||
}
|
||||
|
||||
func HandleWorkoutDeleteComp(db *sql.DB) http.HandlerFunc {
|
||||
|
||||
Reference in New Issue
Block a user