x/web-app-template
Archived
Template
2
0
Fork 0
Code Issues 13 Pull Requests 4 Actions Packages Activity

fix: refine logging
All checks were successful
Build Docker Image / Build-Docker-Image (push) Successful in 44s
Details
Build and Push Docker Image / Build-And-Push-Docker-Image (push) Successful in 48s
Details

Browse Source
This commit was merged in pull request #293.
This commit is contained in:
Tim Wundenberg
2024-12-04 21:49:44 +01:00
parent 5198487feb
commit 521119fc02
14 changed files with 93 additions and 70 deletions
Download Patch File Download Diff File Expand all files Collapse all files

45
db/auth.go
View File

@@ -1,7 +1,6 @@
package db
import (
"log/slog"
"me-fit/log"
"me-fit/types"
@@ -116,7 +115,7 @@ func (db AuthDbSqlite) InsertUser(user *User) error {
return ErrUserExists
}
log.Error("SQL error InsertUser", err)
log.Error("SQL error InsertUser: %v", err)
return types.ErrInternal
}
@@ -131,7 +130,7 @@ func (db AuthDbSqlite) UpdateUser(user *User) error {
user.EmailVerified, user.EmailVerifiedAt, user.Password, user.Id)
if err != nil {
log.Error("SQL error UpdateUser", err)
log.Error("SQL error UpdateUser: %v", err)
return types.ErrInternal
}
@@ -157,7 +156,7 @@ func (db AuthDbSqlite) GetUserByEmail(email string) (*User, error) {
if err == sql.ErrNoRows {
return nil, ErrNotFound
} else {
log.Error("SQL error GetUser", err)
log.Error("SQL error GetUser: %v", err)
return nil, types.ErrInternal
}
}
@@ -184,7 +183,7 @@ func (db AuthDbSqlite) GetUser(userId uuid.UUID) (*User, error) {
if err == sql.ErrNoRows {
return nil, ErrNotFound
} else {
log.Error("SQL error GetUser", err)
log.Error("SQL error GetUser %v", err)
return nil, types.ErrInternal
}
}
@@ -196,41 +195,41 @@ func (db AuthDbSqlite) DeleteUser(userId uuid.UUID) error {
tx, err := db.db.Begin()
if err != nil {
log.Error("Could not start transaction", err)
log.Error("Could not start transaction: %v", err)
return types.ErrInternal
}
_, err = tx.Exec("DELETE FROM workout WHERE user_id = ?", userId)
if err != nil {
_ = tx.Rollback()
log.Error("Could not delete workouts", err)
log.Error("Could not delete workouts: %v", err)
return types.ErrInternal
}
_, err = tx.Exec("DELETE FROM user_token WHERE user_uuid = ?", userId)
if err != nil {
_ = tx.Rollback()
log.Error("Could not delete user tokens", err)
log.Error("Could not delete user tokens: %v", err)
return types.ErrInternal
}
_, err = tx.Exec("DELETE FROM session WHERE user_uuid = ?", userId)
if err != nil {
_ = tx.Rollback()
log.Error("Could not delete sessions", err)
log.Error("Could not delete sessions: %v", err)
return types.ErrInternal
}
_, err = tx.Exec("DELETE FROM user WHERE user_uuid = ?", userId)
if err != nil {
_ = tx.Rollback()
log.Error("Could not delete user", err)
log.Error("Could not delete user: %v", err)
return types.ErrInternal
}
err = tx.Commit()
if err != nil {
log.Error("Could not commit transaction", err)
log.Error("Could not commit transaction: %v", err)
return types.ErrInternal
}
@@ -243,7 +242,7 @@ func (db AuthDbSqlite) InsertToken(token *Token) error {
VALUES (?, ?, ?, ?, ?)`, token.UserId, token.Type, token.Token, token.CreatedAt, token.ExpiresAt)
if err != nil {
log.Error("Could not insert token", err)
log.Error("Could not insert token: %v", err)
return types.ErrInternal
}
@@ -268,23 +267,23 @@ func (db AuthDbSqlite) GetToken(token string) (*Token, error) {
if err != nil {
if err == sql.ErrNoRows {
slog.Info("Token '" + token + "' not found")
log.Info("Token '%v' not found", token)
return nil, ErrNotFound
} else {
log.Error("Could not get token", err)
log.Error("Could not get token: %v", err)
return nil, types.ErrInternal
}
}
createdAt, err = time.Parse(time.RFC3339, createdAtStr)
if err != nil {
log.Error("Could not parse token.created_at", err)
log.Error("Could not parse token.created_at: %v", err)
return nil, types.ErrInternal
}
expiresAt, err = time.Parse(time.RFC3339, expiresAtStr)
if err != nil {
log.Error("Could not parse token.expires_at", err)
log.Error("Could not parse token.expires_at: %v", err)
return nil, types.ErrInternal
}
@@ -300,7 +299,7 @@ func (db AuthDbSqlite) GetTokensByUserIdAndType(userId uuid.UUID, tokenType stri
AND type = ?`, userId, tokenType)
if err != nil {
log.Error("Could not get token", err)
log.Error("Could not get token: %v", err)
return nil, types.ErrInternal
}
@@ -317,19 +316,19 @@ func (db AuthDbSqlite) GetTokensByUserIdAndType(userId uuid.UUID, tokenType stri
err := query.Scan(&token, &createdAtStr, &expiresAtStr)
if err != nil {
log.Error("Could not scan token", err)
log.Error("Could not scan token: %v", err)
return nil, types.ErrInternal
}
createdAt, err = time.Parse(time.RFC3339, createdAtStr)
if err != nil {
log.Error("Could not parse token.created_at", err)
log.Error("Could not parse token.created_at: %v", err)
return nil, types.ErrInternal
}
expiresAt, err = time.Parse(time.RFC3339, expiresAtStr)
if err != nil {
log.Error("Could not parse token.expires_at", err)
log.Error("Could not parse token.expires_at: %v", err)
return nil, types.ErrInternal
}
@@ -342,7 +341,7 @@ func (db AuthDbSqlite) GetTokensByUserIdAndType(userId uuid.UUID, tokenType stri
func (db AuthDbSqlite) DeleteToken(token string) error {
_, err := db.db.Exec("DELETE FROM user_token WHERE token = ?", token)
if err != nil {
log.Error("Could not delete token", err)
log.Error("Could not delete token: %v", err)
return types.ErrInternal
}
return nil
@@ -386,7 +385,7 @@ func (db AuthDbSqlite) DeleteOldSessions(userId uuid.UUID) error {
// Delete old inactive sessions
_, err := db.db.Exec("DELETE FROM session WHERE created_at < datetime('now','-8 hours') AND user_uuid = ?", userId)
if err != nil {
log.Error("Could not delete old sessions", err)
log.Error("Could not delete old sessions: %v", err)
return types.ErrInternal
}
return nil
@@ -397,7 +396,7 @@ func (db AuthDbSqlite) DeleteSession(sessionId string) error {
_, err := db.db.Exec("DELETE FROM session WHERE session_id = ?", sessionId)
if err != nil {
log.Error("Could not delete session", err)
log.Error("Could not delete session: %v", err)
return types.ErrInternal
}
}

8
db/workout.go
View File

@@ -59,7 +59,7 @@ func (db WorkoutDbSqlite) InsertWorkout(userId uuid.UUID, workout *WorkoutInsert
VALUES (?, ?, ?, ?, ?)
RETURNING rowid`, userId, workout.Date, workout.Type, workout.Sets, workout.Reps).Scan(&rowId)
if err != nil {
log.Error("Error inserting workout", err)
log.Error("Error inserting workout: %v", err)
return nil, types.ErrInternal
}
@@ -70,7 +70,7 @@ func (db WorkoutDbSqlite) GetWorkouts(userId uuid.UUID) ([]Workout, error) {
rows, err := db.db.Query("SELECT rowid, date, type, sets, reps FROM workout WHERE user_id = ? ORDER BY date desc", userId)
if err != nil {
log.Error("Could not get workouts", err)
log.Error("Could not get workouts: %v", err)
return nil, types.ErrInternal
}
@@ -83,13 +83,13 @@ func (db WorkoutDbSqlite) GetWorkouts(userId uuid.UUID) ([]Workout, error) {
err = rows.Scan(&workout.RowId, &date, &workout.Type, &workout.Sets, &workout.Reps)
if err != nil {
log.Error("Could not scan workout", err)
log.Error("Could not scan workout: %v", err)
return nil, types.ErrInternal
}
workout.Date, err = time.Parse("2006-01-02 15:04:05-07:00", date)
if err != nil {
log.Error("Could not parse date", err)
log.Error("Could not parse date: %v", err)
return nil, types.ErrInternal
}