From 8b1468fc1fd1c1fbe61b43f950323b364c6007b4 Mon Sep 17 00:00:00 2001 From: Michael Thomson Date: Wed, 26 Jun 2024 22:57:53 -0400 Subject: [PATCH] fix logging --- repositories/postgresTodoRepository.go | 11 +++++------ services/todoService.go | 6 +++--- 2 files changed, 8 insertions(+), 9 deletions(-) diff --git a/repositories/postgresTodoRepository.go b/repositories/postgresTodoRepository.go index fe90473..dc8f016 100644 --- a/repositories/postgresTodoRepository.go +++ b/repositories/postgresTodoRepository.go @@ -18,7 +18,7 @@ func (ts *PostgresTodoRepository) List() ([]models.Todo, error) { rows, err := ts.db.Query(context.Background(), "SELECT id, name, done FROM todo") if err != nil { - log.Fatal(err) + log.Printf("Database error: %v", err) return todos, err } @@ -26,7 +26,6 @@ func (ts *PostgresTodoRepository) List() ([]models.Todo, error) { var r models.Todo err := rows.Scan(&r.Id, &r.Name, &r.Done) if err != nil { - log.Fatal(err) return todos, err } todos = append(todos, r) @@ -40,7 +39,7 @@ func (ts *PostgresTodoRepository) Get(id uuid.UUID) (models.Todo, error) { err := ts.db.QueryRow(context.Background(), "SELECT id, name, done FROM todo WHERE id=$1", id).Scan(&todo.Id, &todo.Name, &todo.Done) if err != nil { - log.Fatal(err) + log.Printf("Database error: %v", err) return todo, err } @@ -51,7 +50,7 @@ func (ts *PostgresTodoRepository) Update(id uuid.UUID, name string, done bool) e _, err := ts.db.Exec(context.Background(), "UPDATE todo SET name=$1, done=$2 WHERE id=$3", name, done, id) if err != nil { - log.Fatal(err) + log.Printf("Database error: %v", err) } return err @@ -61,7 +60,7 @@ func (ts *PostgresTodoRepository) Add(todo models.Todo) error { _, err := ts.db.Exec(context.Background(), "INSERT INTO todo(id, name, done) values($1, $2, $3)", todo.Id, todo.Name, todo.Done) if err != nil { - log.Fatal(err) + log.Printf("Database error: %v", err) return err } @@ -72,7 +71,7 @@ func (ts *PostgresTodoRepository) Delete(id uuid.UUID) error { _, err := ts.db.Exec(context.Background(), "DELETE FROM todo where id=$1", id) if err != nil { - log.Fatal(err) + log.Printf("Database error: %v", err) return err } diff --git a/services/todoService.go b/services/todoService.go index 139d94d..f9b36ab 100644 --- a/services/todoService.go +++ b/services/todoService.go @@ -54,14 +54,14 @@ func (ts *TodoService) UpdateTodo(id uuid.UUID, name string, done bool) (models. return ts.db.Get(id) } -func (ts *TodoService) GetTodos() (todos []models.Todo, err error) { +func (ts *TodoService) GetTodos() ([]models.Todo, error) { return ts.db.List() } -func (ts *TodoService) GetTodoById(id uuid.UUID) (todo models.Todo, err error) { +func (ts *TodoService) GetTodoById(id uuid.UUID) (models.Todo, error) { return ts.db.Get(id) } -func (ts *TodoService) DeleteTodoById(id uuid.UUID) (err error) { +func (ts *TodoService) DeleteTodoById(id uuid.UUID) error { return ts.db.Delete(id) }