Rename module to new repository root
This commit is contained in:
+15
-15
@@ -4,8 +4,8 @@ import (
|
||||
"context"
|
||||
"encoding/json"
|
||||
"errors"
|
||||
"ersteller-lib"
|
||||
"fmt"
|
||||
"git.gorlug.de/code/ersteller"
|
||||
"github.com/doug-martin/goqu/v9"
|
||||
_ "github.com/doug-martin/goqu/v9/dialect/postgres"
|
||||
"github.com/doug-martin/goqu/v9/exp"
|
||||
@@ -41,13 +41,13 @@ func (r *UserRepository) Create(user User) (int, error) {
|
||||
Returning("id").
|
||||
ToSQL()
|
||||
if err != nil {
|
||||
ersteller_lib.LogError("error creating create User sql: %v", err)
|
||||
ersteller.LogError("error creating create User sql: %v", err)
|
||||
return -1, err
|
||||
}
|
||||
|
||||
rows, err := r.connPool.Query(context.Background(), sql, args...)
|
||||
if err != nil {
|
||||
ersteller_lib.LogError("error creating User: %v", err)
|
||||
ersteller.LogError("error creating User: %v", err)
|
||||
return -1, err
|
||||
}
|
||||
defer rows.Close()
|
||||
@@ -55,11 +55,11 @@ func (r *UserRepository) Create(user User) (int, error) {
|
||||
if rows.Next() {
|
||||
err = rows.Scan(&id)
|
||||
if err != nil {
|
||||
ersteller_lib.LogError("error scanning User: %v", err)
|
||||
ersteller.LogError("error scanning User: %v", err)
|
||||
return -1, err
|
||||
}
|
||||
} else {
|
||||
ersteller_lib.Error("User already exists")
|
||||
ersteller.Error("User already exists")
|
||||
return -1, UserAlreadyExistsError{User: user}
|
||||
}
|
||||
|
||||
@@ -82,7 +82,7 @@ func (r *UserRepository) getSelectColumns() []any {
|
||||
}
|
||||
|
||||
func (r *UserRepository) Read(id int) (User, error) {
|
||||
ersteller_lib.Debug("Getting User by id ", id)
|
||||
ersteller.Debug("Getting User by id ", id)
|
||||
sql, args, _ := r.dialect.From("user").
|
||||
Prepared(true).
|
||||
Select(r.getSelectColumns()...).
|
||||
@@ -93,7 +93,7 @@ func (r *UserRepository) Read(id int) (User, error) {
|
||||
|
||||
rows, err := r.connPool.Query(context.Background(), sql, args...)
|
||||
if err != nil {
|
||||
ersteller_lib.Error("Failed to get User: ", err)
|
||||
ersteller.Error("Failed to get User: ", err)
|
||||
}
|
||||
defer rows.Close()
|
||||
if rows.Next() {
|
||||
@@ -167,13 +167,13 @@ func (r *UserRepository) Update(user User) error {
|
||||
}).
|
||||
ToSQL()
|
||||
if err != nil {
|
||||
ersteller_lib.LogError("error creating update User sql: %v", err)
|
||||
ersteller.LogError("error creating update User sql: %v", err)
|
||||
return err
|
||||
}
|
||||
|
||||
_, err = r.connPool.Exec(context.Background(), sql, args...)
|
||||
if err != nil {
|
||||
ersteller_lib.LogError("error updating User: %v", err)
|
||||
ersteller.LogError("error updating User: %v", err)
|
||||
return err
|
||||
}
|
||||
|
||||
@@ -188,13 +188,13 @@ func (r *UserRepository) Delete(id int) error {
|
||||
}).
|
||||
ToSQL()
|
||||
if err != nil {
|
||||
ersteller_lib.LogError("error creating delete User sql: %v", err)
|
||||
ersteller.LogError("error creating delete User sql: %v", err)
|
||||
return err
|
||||
}
|
||||
|
||||
_, err = r.connPool.Exec(context.Background(), sql, args...)
|
||||
if err != nil {
|
||||
ersteller_lib.LogError("error deleting User: %v", err)
|
||||
ersteller.LogError("error deleting User: %v", err)
|
||||
return err
|
||||
}
|
||||
|
||||
@@ -285,7 +285,7 @@ func (r *UserRepository) GetPage(params UserPaginationParams) ([]User, int, erro
|
||||
|
||||
rows, err := r.connPool.Query(context.Background(), sql, args...)
|
||||
if err != nil {
|
||||
ersteller_lib.LogError("failed to run sql query: %v", err)
|
||||
ersteller.LogError("failed to run sql query: %v", err)
|
||||
return nil, -1, err
|
||||
}
|
||||
defer rows.Close()
|
||||
@@ -342,7 +342,7 @@ func (r *UserRepository) DoesUserEmailExist(email string) (bool, error) {
|
||||
|
||||
rows, err := r.connPool.Query(context.Background(), sql, args...)
|
||||
if err != nil {
|
||||
ersteller_lib.LogError("failed to run sql query: %v", err)
|
||||
ersteller.LogError("failed to run sql query: %v", err)
|
||||
return false, err
|
||||
}
|
||||
defer rows.Close()
|
||||
@@ -366,7 +366,7 @@ func (r *UserRepository) GetUserId(email string) (int, error) {
|
||||
|
||||
rows, err := r.connPool.Query(context.Background(), sql, args...)
|
||||
if err != nil {
|
||||
ersteller_lib.LogError("failed to run sql query: %v", err)
|
||||
ersteller.LogError("failed to run sql query: %v", err)
|
||||
return -1, err
|
||||
}
|
||||
defer rows.Close()
|
||||
@@ -396,5 +396,5 @@ func (r *UserRepository) VerifyPassword(email string, password string) (bool, in
|
||||
if err != nil {
|
||||
return false, -1, err
|
||||
}
|
||||
return ersteller_lib.VerifyPassword(password, user.Password), userId, nil
|
||||
return ersteller.VerifyPassword(password, user.Password), userId, nil
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user