Merge pull request #2 from mbaraa/chore/remove-errorx

mbaraa · web-flow · commit 56d3b0da7613 · 2024-05-06T10:32:32.000+03:00
Chore: Remove errorx
diff --git a/db/base_db.go b/db/base_db.go
@@ -19,7 +19,7 @@ func NewBaseDB[T AllowedModels](db *gorm.DB) UnsafeCRUDRepo[T] {
 // the new object is a pointer, so it updates the object's id after creation
 func (b *BaseDB[T]) Add(obj *T) error {
 	if obj == nil {
-		return ErrNilObject.NewWithNoMessage()
+		return ErrNilObject
 	}
 
 	err := b.db.
@@ -37,7 +37,7 @@ func (b *BaseDB[T]) Add(obj *T) error {
 // AddMany is same as Add but for numerous objects
 func (b *BaseDB[T]) AddMany(objs []*T) error {
 	if len(objs) == 0 {
-		return ErrNilObject.NewWithNoMessage()
+		return ErrNilObject
 	}
 
 	err := b.db.
@@ -81,7 +81,7 @@ func (b *BaseDB[T]) Get(id uint) (T, error) {
 // which uses a given search condition and retrieves every record with the given condition
 func (b *BaseDB[T]) GetByConds(conds ...any) ([]T, error) {
 	if !checkConds(conds...) {
-		return nil, ErrInvalidWhereConditions.NewWithNoMessage()
+		return nil, ErrInvalidWhereConditions
 	}
 
 	var foundRecords []T
@@ -92,7 +92,7 @@ func (b *BaseDB[T]) GetByConds(conds ...any) ([]T, error) {
 		Error
 
 	if err != nil || len(foundRecords) == 0 {
-		return nil, ErrRecordNotFound.NewWithNoMessage()
+		return nil, ErrRecordNotFound
 	}
 
 	return foundRecords, nil
@@ -124,11 +124,11 @@ func (b *BaseDB[T]) Count() int64 {
 // and gives it its id(in case searching condition weren't using id)
 func (b *BaseDB[T]) Update(obj *T, conds ...any) error {
 	if obj == nil {
-		return ErrNilObject.NewWithNoMessage()
+		return ErrNilObject
 	}
 	if len(conds) > 1 {
 		if !checkConds(conds...) {
-			return ErrInvalidWhereConditions.NewWithNoMessage()
+			return ErrInvalidWhereConditions
 		}
 	} else {
 		conds = []any{"id = ?", (*obj).GetId()}
diff --git a/db/errors.go b/db/errors.go
@@ -1,22 +1,17 @@
 package db
 
 import (
-	"dankmuzikk/errors"
-
-	goerrors "errors"
+	"errors"
 
 	"github.com/go-sql-driver/mysql"
 )
 
-var DbErrNamespace = errors.DankMuzikkErrNamespace.NewSubNamespace("database error")
-
 var (
-	ErrInvalidModel           = DbErrNamespace.NewType("model does not implement the `AllowedModel` interface")
-	ErrNilObject              = DbErrNamespace.NewType("object's pointer is nil")
-	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")
+	ErrNilObject              = errors.New("db: object's pointer is nil")
+	ErrEmptySlice             = errors.New("db: slice is nil or empty")
+	ErrInvalidWhereConditions = errors.New("db: invalid where conditions")
+	ErrRecordNotFound         = errors.New("db: no records were found")
+	ErrRecordExists           = errors.New("db: record exists in table")
 )
 
 func tryWrapMySqlError(err error) error {
diff --git a/errors/errors.go b/errors/errors.go
diff --git a/go.mod b/go.mod
@@ -4,10 +4,11 @@ go 1.22
 
 require (
 	github.com/a-h/templ v0.2.663
+	github.com/go-sql-driver/mysql v1.8.1
 	github.com/gocolly/colly v1.2.0
 	github.com/golang-jwt/jwt/v4 v4.5.0
 	github.com/google/uuid v1.6.0
-	github.com/joomcode/errorx v1.1.1
+	golang.org/x/crypto v0.22.0
 	golang.org/x/oauth2 v0.19.0
 	google.golang.org/api v0.175.0
 	gorm.io/driver/mysql v1.5.6
@@ -27,7 +28,6 @@ require (
 	github.com/felixge/httpsnoop v1.0.4 // indirect
 	github.com/go-logr/logr v1.4.1 // indirect
 	github.com/go-logr/stdr v1.2.2 // indirect
-	github.com/go-sql-driver/mysql v1.8.1 // indirect
 	github.com/gobwas/glob v0.2.3 // indirect
 	github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
 	github.com/golang/protobuf v1.5.4 // indirect
@@ -44,7 +44,6 @@ require (
 	go.opentelemetry.io/otel v1.25.0 // indirect
 	go.opentelemetry.io/otel/metric v1.25.0 // indirect
 	go.opentelemetry.io/otel/trace v1.25.0 // indirect
-	golang.org/x/crypto v0.22.0 // indirect
 	golang.org/x/net v0.24.0 // indirect
 	golang.org/x/sys v0.19.0 // indirect
 	golang.org/x/text v0.14.0 // indirect
diff --git a/go.sum b/go.sum
@@ -86,8 +86,6 @@ github.com/jinzhu/inflection v1.0.0 h1:K317FqzuhWc8YvSVlFMCCUb36O/S9MCKRDI7QkRKD
 github.com/jinzhu/inflection v1.0.0/go.mod h1:h+uFLlag+Qp1Va5pdKtLDYj+kHp5pxUVkryuEj+Srlc=
 github.com/jinzhu/now v1.1.5 h1:/o9tlHleP7gOFmsnYNz3RGnqzefHA47wQpKrrdTIwXQ=
 github.com/jinzhu/now v1.1.5/go.mod h1:d3SSVoowX0Lcu0IBviAWJpolVfI5UJVZZ7cO71lE/z8=
-github.com/joomcode/errorx v1.1.1 h1:/LFG/qSk1gUTuZjs+qlyOJEpcVjD9DXgBNFhdZkQrjY=
-github.com/joomcode/errorx v1.1.1/go.mod h1:eQzdtdlNyN7etw6YCS4W4+lu442waxZYw5yvz0ULrRo=
 github.com/kennygrant/sanitize v1.2.4 h1:gN25/otpP5vAsO2djbMhF/LQX6R7+O1TB4yv8NzpJ3o=
 github.com/kennygrant/sanitize v1.2.4/go.mod h1:LGsjYYtgxbetdg5owWB2mpgUL6e2nfw2eObZ0u0qvak=
 github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
@@ -98,7 +96,6 @@ github.com/saintfish/chardet v0.0.0-20230101081208-5e3ef4b5456d/go.mod h1:uugorj
 github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
 github.com/stretchr/objx v0.4.0/go.mod h1:YvHI0jy2hoMjB+UWwv71VJQ9isScKT/TqJzVSSt89Yw=
 github.com/stretchr/objx v0.5.0/go.mod h1:Yh+to48EsGEfYuaHDzXPcE3xhTkx73EhmCGUpEOglKo=
-github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs=
 github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI=
 github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
 github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU=
diff --git a/services/jwt/errors.go b/services/jwt/errors.go
@@ -1,14 +1,12 @@
 package jwt
 
 import (
-	"dankmuzikk/errors"
+	"errors"
 )
 
-var JwtErrNamespace = errors.DankMuzikkErrNamespace.NewSubNamespace("jwt error")
-
 var (
-	ErrEmptyToken     = JwtErrNamespace.NewType("empty token")
-	ErrInvalidToken   = JwtErrNamespace.NewType("invalid token")
-	ErrExpiredToken   = JwtErrNamespace.NewType("expired token")
-	ErrInvalidSubject = JwtErrNamespace.NewType("invalid token's subject")
+	ErrEmptyToken     = errors.New("jwt: empty token")
+	ErrInvalidToken   = errors.New("jwt: invalid token")
+	ErrExpiredToken   = errors.New("jwt: expired token")
+	ErrInvalidSubject = errors.New("jwt: invalid token's subject")
 )
diff --git a/services/jwt/jwt_impl.go b/services/jwt/jwt_impl.go
@@ -58,17 +58,17 @@ func (s *JWTImpl[T]) Validate(token string, subject Subject) error {
 // Decode decodes the given token using the set JWT secret
 func (s *JWTImpl[T]) Decode(token string, subject Subject) (Claims[T], error) {
 	if len(token) == 0 {
-		return Claims[T]{}, ErrEmptyToken.NewWithNoMessage()
+		return Claims[T]{}, ErrEmptyToken
 	}
 
 	claims := Claims[T]{}
 
 	_, err := jwt.ParseWithClaims(token, &claims, func(token *jwt.Token) (interface{}, error) {
 		if claims.Subject != subject {
-			return nil, ErrInvalidSubject.NewWithNoMessage()
+			return nil, ErrInvalidSubject
 		}
 		if claims.ExpiresAt.Time.Before(time.Now().UTC()) {
-			return nil, ErrExpiredToken.NewWithNoMessage()
+			return nil, ErrExpiredToken
 		}
 
 		return []byte(config.Env().JwtSecret), nil
diff --git a/services/login/google.go b/services/login/google.go
@@ -14,7 +14,6 @@ import (
 	"time"
 
 	"github.com/google/uuid"
-	"github.com/joomcode/errorx"
 )
 
 var (
@@ -66,7 +65,7 @@ func (g *GoogleLoginService) Login(state, code string) (string, error) {
 	}
 
 	account, err := g.accountRepo.GetByConds("email = ? AND is_o_auth = 1", googleUser.Email)
-	if errorx.IsOfType(err, db.ErrRecordNotFound) || len(account) == 0 {
+	if errors.Is(err, db.ErrRecordNotFound) || len(account) == 0 {
 		return g.Signup(googleUser)
 	}
 	if err != nil {

Original file line number	Diff line number	Diff line change
`@@ -58,17 +58,17 @@ func (s *JWTImpl[T]) Validate(token string, subject Subject) error {`
`58`	`58`	`// Decode decodes the given token using the set JWT secret`
`59`	`59`	`func (s *JWTImpl[T]) Decode(token string, subject Subject) (Claims[T], error) {`
`60`	`60`	`if len(token) == 0 {`
`61`		`- return Claims[T]{}, ErrEmptyToken.NewWithNoMessage()`
	`61`	`+ return Claims[T]{}, ErrEmptyToken`
`62`	`62`	`}`
`63`	`63`
`64`	`64`	`claims := Claims[T]{}`
`65`	`65`
`66`	`66`	`_, err := jwt.ParseWithClaims(token, &claims, func(token *jwt.Token) (interface{}, error) {`
`67`	`67`	`if claims.Subject != subject {`
`68`		`- return nil, ErrInvalidSubject.NewWithNoMessage()`
	`68`	`+ return nil, ErrInvalidSubject`
`69`	`69`	`}`
`70`	`70`	`if claims.ExpiresAt.Time.Before(time.Now().UTC()) {`
`71`		`- return nil, ErrExpiredToken.NewWithNoMessage()`
	`71`	`+ return nil, ErrExpiredToken`
`72`	`72`	`}`
`73`	`73`
`74`	`74`	`return []byte(config.Env().JwtSecret), nil`
Original file line number	Diff line number	Diff line change
`@@ -14,7 +14,6 @@ import (`
`14`	`14`	`"time"`
`15`	`15`
`16`	`16`	`"github.com/google/uuid"`
`17`		`- "github.com/joomcode/errorx"`
`18`	`17`	`)`
`19`	`18`
`20`	`19`	`var (`
`@@ -66,7 +65,7 @@ func (g *GoogleLoginService) Login(state, code string) (string, error) {`
`66`	`65`	`}`
`67`	`66`
`68`	`67`	`account, err := g.accountRepo.GetByConds("email = ? AND is_o_auth = 1", googleUser.Email)`
`69`		`- if errorx.IsOfType(err, db.ErrRecordNotFound) \|\| len(account) == 0 {`
	`68`	`+ if errors.Is(err, db.ErrRecordNotFound) \|\| len(account) == 0 {`
`70`	`69`	`return g.Signup(googleUser)`
`71`	`70`	`}`
`72`	`71`	`if err != nil {`