chore(errors): handle errors better

Author: mbaraa

db/base_db.go

@@ -28,7 +28,7 @@ func (b *BaseDB[T]) Add(obj *T) error {
 		Error
 
 	if err != nil {
-		return err
+		return tryWrapMySqlError(err)
 	}
 
 	return nil
@@ -46,7 +46,7 @@ func (b *BaseDB[T]) AddMany(objs []*T) error {
 		Error
 
 	if err != nil {
-		return err
+		return tryWrapMySqlError(err)
 	}
 
 	return nil

db/errors.go

@@ -1,6 +1,12 @@
 package db
 
-import "dankmuzikk/errors"
+import (
+	"dankmuzikk/errors"
+
+	goerrors "errors"
+
+	"github.com/go-sql-driver/mysql"
+)
 
 var DbErrNamespace = errors.DankMuzikkErrNamespace.NewSubNamespace("database error")
 
@@ -10,4 +16,17 @@ var (
 	ErrEmptySlice             = DbErrNamespace.NewType("slice is nil or empty")
 	ErrInvalidWhereConditions = DbErrNamespace.NewType("invalid where conditions")
 	ErrRecordNotFound         = DbErrNamespace.NewType("no records were found")
+	ErrRecordExists           = goerrors.New("record exists in table")
 )
+
+func tryWrapMySqlError(err error) error {
+	if mysqlErr, ok := err.(*mysql.MySQLError); ok {
+		switch mysqlErr.Number {
+		case 1062:
+			return ErrRecordExists
+		default:
+			return err
+		}
+	}
+	return err
+}

handlers/apis/email_login.go

@@ -8,7 +8,10 @@ import (
 	"dankmuzikk/log"
 	"dankmuzikk/services/login"
 	"dankmuzikk/views/components/otp"
+	"dankmuzikk/views/components/status"
 	"encoding/json"
+	"errors"
+	"fmt"
 	"net/http"
 	"time"
 )
@@ -32,7 +35,10 @@ func (e *emailLoginApi) HandleEmailLogin(w http.ResponseWriter, r *http.Request)
 	verificationToken, err := e.service.Login(reqBody)
 	if err != nil {
 		log.Errorf("[EMAIL LOGIN API]: Failed to login user: %+v, error: %s\n", reqBody, err.Error())
-		w.WriteHeader(http.StatusBadRequest)
+		// w.WriteHeader(http.StatusInternalServerError)
+		status.
+			GenericError(fmt.Sprintf("No account associated with the email \"%s\" was found", reqBody.Email)).
+			Render(context.Background(), w)
 		return
 	}
 
@@ -56,9 +62,20 @@ func (e *emailLoginApi) HandleEmailSignup(w http.ResponseWriter, r *http.Request
 	}
 
 	verificationToken, err := e.service.Signup(reqBody)
+	if errors.Is(err, login.ErrAccountExists) {
+		log.Errorf("[EMAIL LOGIN API]: Failed to sign up a new user: %+v, error: %s\n", reqBody, err.Error())
+		// w.WriteHeader(http.StatusConflict)
+		status.
+			GenericError(fmt.Sprintf("An account associated with the email \"%s\" already exists", reqBody.Email)).
+			Render(context.Background(), w)
+		return
+	}
+	if errors.Is(err, login.ErrAccountNotFound) || errors.Is(err, login.ErrProfileNotFound) {
+
+	}
 	if err != nil {
 		log.Errorf("[EMAIL LOGIN API]: Failed to sign up a new user: %+v, error: %s\n", reqBody, err.Error())
-		w.WriteHeader(http.StatusBadRequest)
+		w.WriteHeader(http.StatusInternalServerError)
 		return
 	}
 

handlers/apis/google_login.go

@@ -1,10 +1,12 @@
 package apis
 
 import (
+	"context"
 	"dankmuzikk/config"
 	"dankmuzikk/handlers"
 	"dankmuzikk/log"
 	"dankmuzikk/services/login"
+	"dankmuzikk/views/components/status"
 	"net/http"
 	"time"
 )
@@ -38,7 +40,10 @@ func (g *googleLoginApi) HandleGoogleOAuthLoginCallback(w http.ResponseWriter, r
 
 	sessionToken, err := g.service.Login(state, code)
 	if err != nil {
-		w.WriteHeader(http.StatusUnauthorized)
+		// w.WriteHeader(http.StatusUnauthorized)
+		status.
+			GenericError("Account doesn't exist").
+			Render(context.Background(), w)
 		log.Errorln("[GOOGLE LOGIN API]: ", err)
 		return
 	}

services/login/email.go

@@ -9,7 +9,6 @@ import (
 	"errors"
 	"fmt"
 	"math/rand"
-	"strings"
 	"time"
 
 	"golang.org/x/crypto/bcrypt"
@@ -37,14 +36,14 @@ func NewEmailLoginService(
 }
 
 func (e *EmailLoginService) Login(user entities.LoginRequest) (string, error) {
-	account, err := e.accountRepo.GetByConds("email = ?", user.Email)
+	account, err := e.accountRepo.GetByConds("email = ? AND is_o_auth = 0", user.Email)
 	if err != nil {
-		return "", err
+		return "", errors.Join(ErrAccountNotFound, err)
 	}
 
 	profile, err := e.profileRepo.GetByConds("account_id = ?", account[0].Id)
 	if err != nil {
-		return "", err
+		return "", errors.Join(ErrProfileNotFound, err)
 	}
 	profile[0].Account = account[0]
 	profile[0].AccountId = account[0].Id
@@ -66,11 +65,14 @@ func (e *EmailLoginService) Signup(user entities.SignupRequest) (string, error)
 			Email: user.Email,
 		},
 		Name:     user.Name,
-		Username: user.Email[:strings.Index(user.Email, "@")],
+		Username: user.Email,
 	}
 
-	// creating a new account will create the account underneeth it.
+	// creating a new account will create the account underneath it.
 	err := e.profileRepo.Add(&profile)
+	if errors.Is(err, db.ErrRecordExists) {
+		return "", errors.Join(ErrAccountExists, err)
+	}
 	if err != nil {
 		return "", err
 	}

services/login/errors.go

@@ -0,0 +1,9 @@
+package login
+
+import "errors"
+
+var (
+	ErrAccountNotFound = errors.New("account was not found")
+	ErrProfileNotFound = errors.New("profile was not found")
+	ErrAccountExists   = errors.New("an account with the associated email already exists")
+)

services/login/google.go

@@ -11,7 +11,6 @@ import (
 	"errors"
 
 	"net/http"
-	"strings"
 	"time"
 
 	"github.com/google/uuid"
@@ -66,7 +65,7 @@ func (g *GoogleLoginService) Login(state, code string) (string, error) {
 		return "", err
 	}
 
-	account, err := g.accountRepo.GetByConds("email = ?", googleUser.Email)
+	account, err := g.accountRepo.GetByConds("email = ? AND is_o_auth = 1", googleUser.Email)
 	if errorx.IsOfType(err, db.ErrRecordNotFound) || len(account) == 0 {
 		return g.Signup(googleUser)
 	}
@@ -95,12 +94,13 @@ func (g *GoogleLoginService) Login(state, code string) (string, error) {
 func (g *GoogleLoginService) Signup(googleUser oauthUserInfo) (string, error) {
 	profile := models.Profile{
 		Account: models.Account{
-			Email: googleUser.Email,
+			Email:   googleUser.Email,
+			IsOAuth: true,
 		},
 		Name:     googleUser.FullName,
-		Username: googleUser.Email[:strings.Index(googleUser.Email, "@")],
+		Username: googleUser.Email,
 	}
-	// creating a new account will create the account underneeth it.
+	// creating a new account will create the account underneath it.
 	err := g.profileRepo.Add(&profile)
 	if err != nil {
 		return "", err

views/components/status/generic_error.templ

@@ -0,0 +1,5 @@
+package status
+
+templ GenericError(msg string) {
+	<h2 class={ "text-[#DE3333]", "text-xl", "font-semibold" }>{ msg }</h2>
+}