Dockerfile

@@ -2,9 +2,6 @@ FROM golang:1.25-alpine
 
 WORKDIR /app
 
-# Solution t IP block?
-ENV GOPROXY=https://goproxy.io,https://athens.azurefd.net,direct
-
 COPY go.mod go.sum ./
 RUN go mod download
 

internal/infrastructure/database/repository/recipe_repository.go

@@ -237,10 +237,7 @@ func (r *RecipeRepository) GetRecipe(id int, userId *int) (*domain.Recipe, error
 		&recipe.Created,
 		&recipe.Deleted,
 	); err != nil {
-		if err == sql.ErrNoRows {
+		return nil, fmt.Errorf("Failed to location recipe in database: %s", err.Error())
-			return nil, err
-		}
-		return nil, fmt.Errorf("Failed to location recipe (id: %d) in database: %s", id, err.Error())
 	}
 
 	// Parse duration
@@ -303,7 +300,7 @@ func (r *RecipeRepository) GetRecipes(ids []int, userId *int) ([]domain.Recipe,
 
 	for _, id := range ids {
 		recipe, err := r.GetRecipe(id, userId)
-		if err != nil && err != sql.ErrNoRows {
+		if err != nil {
 			return nil, err
 		}
 

internal/infrastructure/database/repository/user_repository.go

@@ -4,7 +4,6 @@ import (
 	"database/sql"
 	"fmt"
 
-	sq "github.com/Masterminds/squirrel"
 	domain "github.com/haydenhargreaves/Potion/internal/domain/user"
 	"github.com/jmoiron/sqlx"
 	_ "github.com/lib/pq"
@@ -32,37 +31,42 @@ func NewUserRepository(db *sqlx.DB) domain.UserRepository {
 // best results, pair this function with the GetGoogleUser which will return the user if it can find
 // it.
 func (r *UserRepository) CreateGoogleUser(googleUserInfo *domain.GoogleUserInfo, googleRefreshToken string) (domain.User, error) {
+	tx, err := r.db.Begin()
+	if err != nil {
+		return domain.User{}, err
+	}
+
 	if googleUserInfo == nil {
 		return domain.User{}, fmt.Errorf("Google user info provided was nil")
 	}
 
-	psql := sq.StatementBuilder.PlaceholderFormat(sq.Dollar)
+	var user domain.User
+	query := `INSERT INTO users 
+	(GoogleId, Name, Email, ImageUrl, GoogleRefreshToken) 
+	VALUES ($1, $2, $3, $4, $5) RETURNING *;`
 
-	query := psql.
+	if err := tx.QueryRow(
-		Insert("users").
+		query,
-		Columns(
-			"googleid",
-			"name",
-			"email",
-			"imageurl",
-			"googlerefreshtoken").
-		Values(
 		googleUserInfo.Id,
 		googleUserInfo.Name,
 		googleUserInfo.Email,
 		googleUserInfo.Picture,
 		googleRefreshToken,
-		).
+	).Scan(
-		Suffix("RETURNING *")
+		&user.Id,
-
+		&user.GoogleId,
-	_sql, args, err := query.ToSql()
+		&user.Name,
-	if err != nil {
+		&user.Email,
-		return domain.User{}, fmt.Errorf("Failed to construct sql query: %w", err)
+		&user.ImageUrl,
+		&user.GoogleRefreshToken,
+		&user.Created,
+	); err != nil {
+		tx.Rollback()
+		return domain.User{}, err
 	}
 
-	var user domain.User
+	if err := tx.Commit(); err != nil {
-	if err := r.db.Get(&user, _sql, args...); err != nil {
+		return domain.User{}, err
-		return domain.User{}, fmt.Errorf("Failed to create user: %w", err)
 	}
 
 	return user, nil
@@ -72,26 +76,23 @@ func (r *UserRepository) CreateGoogleUser(googleUserInfo *domain.GoogleUserInfo,
 // function is used when a user logs in with Google to prevent duplicate entries from being made. If
 // no user is found, this function will return a null pointer but not an error.
 func (r *UserRepository) GetGoogleUser(googleId string) (*domain.User, error) {
-	psql := sq.StatementBuilder.PlaceholderFormat(sq.Dollar)
-
-	query := psql.
-		Select("*").
-		From("users").
-		Where(sq.Eq{
-			"GoogleId": googleId,
-		})
-
-	_sql, args, err := query.ToSql()
-	if err != nil {
-		return nil, fmt.Errorf("Failed to construct sql query: %w", err)
-	}
-
 	var user domain.User
-	if err := r.db.Get(&user, _sql, args...); err != nil {
+	query := `SELECT * FROM users WHERE GoogleId = $1`
+
+	if err := r.db.QueryRow(query, googleId).Scan(
+		&user.Id,
+		&user.GoogleId,
+		&user.Name,
+		&user.Email,
+		&user.ImageUrl,
+		&user.GoogleRefreshToken,
+		&user.Created,
+	); err != nil {
+		// If no user was found, don't error, just return
 		if err == sql.ErrNoRows {
 			return nil, nil
 		}
-		return nil, fmt.Errorf("Failed to get Google user: %w", err)
+		return nil, err
 	}
 
 	return &user, nil
@@ -102,19 +103,18 @@ func (r *UserRepository) GetGoogleUser(googleId string) (*domain.User, error) {
 // Callers are responsible for protecting against double nil results. Any errors will be bubbled
 // to the caller.
 func (r *UserRepository) GetUser(id int) (*domain.User, error) {
-	psql := sq.StatementBuilder.PlaceholderFormat(sq.Dollar)
+	query := "SELECT * FROM users WHERE id = $1"
-	query := psql.
-		Select("*").
-		From("users").
-		Where(sq.Eq{"id": id})
-
-	_sql, args, err := query.ToSql()
-	if err != nil {
-		return nil, fmt.Errorf("Failed to construct sql query: %w", err)
-	}
 
 	var user domain.User
-	if err := r.db.Get(&user, _sql, args...); err != nil {
+	if err := r.db.QueryRow(query, id).Scan(
+		&user.Id,
+		&user.GoogleId,
+		&user.Name,
+		&user.Email,
+		&user.ImageUrl,
+		&user.GoogleRefreshToken,
+		&user.Created,
+	); err != nil {
 		// If no user was found, don't error, just return
 		if err == sql.ErrNoRows {
 			return nil, nil