feat: log error

fix: runtime and compile errors

api/errors.go

@@ -5,6 +5,7 @@ import (
 	"strings"
 
 	"github.com/go-chi/render"
+	"github.com/rs/zerolog/log"
 )
 
 type AppErrorCode string
@@ -43,11 +44,8 @@ func (e *AppError) Render(w http.ResponseWriter, r *http.Request) error {
 	return nil
 }
 
-func (e *AppError) Error() string {
-	return e.Message
-}
-
-func ErrCustom(err error, statusCode int, code AppErrorCode, message string) *AppError {
+func NewAppError(err error, statusCode int, code AppErrorCode, message string) *AppError {
+	log.Error().Err(err).Msg(message)
 	return &AppError{
 		Err:        err,
 		StatusCode: statusCode,
@@ -56,127 +54,71 @@ func ErrCustom(err error, statusCode int, code AppErrorCode, message string) *Ap
 	}
 }
 
+func ErrDefault(err error, statusCode int, code AppErrorCode) *AppError {
+	return NewAppError(err, statusCode, code, err.Error())
+}
+
 func ErrBadRequest(err error) *AppError {
-	return &AppError{
-		Err:        err,
-		StatusCode: http.StatusBadRequest,
-		Code:       ErrCodeBadRequest,
-		Message:    err.Error(),
-	}
+	return ErrDefault(err, http.StatusBadRequest, ErrCodeBadRequest)
 }
 
 func ErrInvalidParam(err error) *AppError {
-	return &AppError{
-		Err:        err,
-		StatusCode: http.StatusBadRequest,
-		Code:       ErrCodeInvalidParam,
-		Message:    err.Error(),
-	}
+	return ErrDefault(err, http.StatusBadRequest, ErrCodeInvalidParam)
 }
 
 func ErrInvalidPagination(err error) *AppError {
-	return &AppError{
-		Err:        err,
-		StatusCode: http.StatusBadRequest,
-		Code:       ErrCodeInvalidPagination,
-		Message:    err.Error(),
-	}
+	return ErrDefault(err, http.StatusBadRequest, ErrCodeInvalidPagination)
 }
 
 func ErrInvalidQuery(err error) *AppError {
-	return &AppError{
-		Err:        err,
-		StatusCode: http.StatusBadRequest,
-		Code:       ErrCodeInvalidQuery,
-		Message:    err.Error(),
-	}
+	return ErrDefault(err, http.StatusBadRequest, ErrCodeInvalidQuery)
 }
 
 func ErrInvalidBody(err error) *AppError {
-	return &AppError{
-		Err:        err,
-		StatusCode: http.StatusBadRequest,
-		Code:       ErrCodeInvalidBody,
-		Message:    err.Error(),
-	}
+	return ErrDefault(err, http.StatusBadRequest, ErrCodeInvalidBody)
 }
 
 func ErrMultipartFormError(err error) *AppError {
-	return &AppError{
-		Err:        err,
-		StatusCode: http.StatusBadRequest,
-		Code:       ErrCodeMultipartForm,
-		Message:    err.Error(),
-	}
+	return ErrDefault(err, http.StatusBadRequest, ErrCodeMultipartForm)
 }
 
 func ErrInvalidFBToken(err error) *AppError {
-	return &AppError{
-		Err:        err,
-		StatusCode: http.StatusUnauthorized,
-		Code:       ErrCodeInvalidFBToken,
-		Message:    err.Error(),
-	}
+	return ErrDefault(err, http.StatusUnauthorized, ErrCodeInvalidFBToken)
 }
 
 func ErrUserNotRegistered(err error) *AppError {
-	return &AppError{
-		Err:        err,
-		StatusCode: http.StatusUnauthorized,
-		Code:       ErrCodeUserNotRegistered,
-		Message:    err.Error(),
-	}
+	return ErrDefault(err, http.StatusUnauthorized, ErrCodeUserNotRegistered)
 }
 
 func ErrForbidden(err error) *AppError {
-	return &AppError{
-		Err:        err,
-		StatusCode: http.StatusForbidden,
-		Code:       ErrCodeForbidden,
-		Message:    err.Error(),
-	}
+	return ErrDefault(err, http.StatusForbidden, ErrCodeForbidden)
 }
 
 func ErrNotFound(err error) *AppError {
-	return &AppError{
-		Err:        err,
-		StatusCode: http.StatusNotFound,
-		Code:       ErrCodeNotFound,
-		Message:    err.Error(),
-	}
+	return ErrDefault(err, http.StatusNotFound, ErrCodeNotFound)
 }
 
 func ErrConflict(err error) *AppError {
-	return &AppError{
-		Err:        err,
-		StatusCode: http.StatusConflict,
-		Code:       ErrCodeConflict,
-		Message:    err.Error(),
-	}
+	return ErrDefault(err, http.StatusConflict, ErrCodeConflict)
 }
 
 func ErrUnknown(err error) *AppError {
-	return &AppError{
-		Err:        err,
-		StatusCode: http.StatusInternalServerError,
-		Code:       ErrCodeUnknown,
-		Message:    err.Error(),
-	}
+	return ErrDefault(err, http.StatusInternalServerError, ErrCodeUnknown)
 }
 
 func FromPostgresError(err error) *AppError {
 	errStr := err.Error()
 	if strings.Contains(errStr, "no rows in result set") {
-		return ErrCustom(err, http.StatusNotFound, ErrCodeNotFound, "해당하는 자원이 없습니다")
+		return NewAppError(err, http.StatusNotFound, ErrCodeNotFound, "해당하는 자원이 없습니다")
 	} else if strings.Contains(errStr, "violates foreign key constraint") {
-		return ErrCustom(err, http.StatusNotFound, ErrCodeNotFound, "해당하는 자원이 없습니다")
+		return NewAppError(err, http.StatusNotFound, ErrCodeNotFound, "해당하는 자원이 없습니다")
 	} else if strings.Contains(errStr, "violates not-null constraint") {
-		return ErrCustom(err, http.StatusBadRequest, ErrCodeBadRequest, "필수 값이 누락되었습니다")
+		return NewAppError(err, http.StatusBadRequest, ErrCodeBadRequest, "필수 값이 누락되었습니다")
 	} else if strings.Contains(errStr, "violates check constraint") {
-		return ErrCustom(err, http.StatusBadRequest, ErrCodeBadRequest, "잘못된 값입니다")
+		return NewAppError(err, http.StatusBadRequest, ErrCodeBadRequest, "잘못된 값입니다")
 	} else if strings.Contains(errStr, "violates unique constraint") {
-		return ErrCustom(err, http.StatusConflict, ErrCodeConflict, "중복된 값입니다")
+		return NewAppError(err, http.StatusConflict, ErrCodeConflict, "중복된 값입니다")
 	} else {
-		return ErrCustom(err, http.StatusInternalServerError, ErrCodeUnknown, "알 수 없는 오류가 발생했습니다")
+		return NewAppError(err, http.StatusInternalServerError, ErrCodeUnknown, "알 수 없는 오류가 발생했습니다")
 	}
 }

api/web.go

@@ -76,15 +76,15 @@ func ParsePaginationQueries(r *http.Request, defaultPage int, defaultLimit int)
 	if pageQuery != "" {
 		var atoiError error
 		page, atoiError = strconv.Atoi(pageQuery)
-		if atoiError != nil {
+		if atoiError != nil || page <= 0 {
 			return 0, 0, ErrInvalidPagination(fmt.Errorf("expected integer value bigger than 0 for query: page"))
 		}
 	}
 
 	if sizeQuery != "" {
 		var atoiError error
 		size, atoiError = strconv.Atoi(sizeQuery)
-		if atoiError != nil {
+		if atoiError != nil || size <= 0 {
 			return 0, 0, ErrInvalidPagination(fmt.Errorf("expected integer value bigger than 0 for query: size"))
 		}
 	}

cmd/import_breeds/main.go

@@ -28,7 +28,6 @@ func main() {
 
 	ctx := context.Background()
 	client, err := breeds_importer_service.NewBreedsImporterService(ctx, configs.GoogleSheetsAPIKey)
-
 	if err != nil {
 		log.Fatalf("error initializing google sheets client: %v\n", err)
 	}
@@ -90,15 +89,15 @@ func parseFlags() Flags {
 	return Flags{petTypeToImport: petTypeToImport}
 }
 
-func importBreed(ctx context.Context, conn *database.DB, petType pet.PetType, row breeds_importer_service.Row) (*pet.Breed, error) {
+func importBreed(ctx context.Context, conn *database.DB, petType pet.PetType, row breeds_importer_service.Row) (*pet.Breed, *pnd.AppError) {
 	log.Printf("Importing breed with pet_type: %s, name: %s to database", petType, row.Breed)
 
 	var breed *pet.Breed
 	err := database.WithTransaction(ctx, conn, func(tx *database.Tx) *pnd.AppError {
 		breedStore := postgres.NewBreedPostgresStore(tx)
 
 		existing, err := breedStore.FindBreedByPetTypeAndName(ctx, petType, row.Breed)
-		if err != nil && !errors.Is(err, sql.ErrNoRows) {
+		if err != nil && !errors.Is(err.Err, sql.ErrNoRows) {
 			return err
 		}
 

cmd/server/main.go

@@ -4,6 +4,8 @@ import (
 	"log"
 	"net/http"
 
+	"github.com/rs/zerolog"
+
 	"github.com/pet-sitter/pets-next-door-api/internal/configs"
 	firebaseinfra "github.com/pet-sitter/pets-next-door-api/internal/infra/firebase"
 
@@ -29,6 +31,8 @@ import (
 // @in header
 // @name Authorization
 func main() {
+	zerolog.TimeFieldFormat = zerolog.TimeFormatUnix
+
 	var app *firebaseinfra.FirebaseApp
 	if configs.GetFirebaseCredentialsJSON() != (configs.FirebaseCredentialsJSONType{}) {
 		app = firebaseinfra.NewFirebaseAppFromCredentialsJSON(configs.GetFirebaseCredentialsJSON())

go.mod

@@ -7,6 +7,7 @@ require (
 	github.com/go-chi/chi/v5 v5.0.10
 	github.com/go-chi/render v1.0.3
 	github.com/joho/godotenv v1.5.1
+	github.com/rs/zerolog v1.32.0
 	github.com/swaggo/http-swagger/v2 v2.0.1
 	github.com/swaggo/swag v1.16.1
 	google.golang.org/api v0.126.0
@@ -28,6 +29,8 @@ require (
 	github.com/leodido/go-urn v1.2.4 // indirect
 	github.com/lib/pq v1.10.9 // indirect
 	github.com/mailru/easyjson v0.7.7 // indirect
+	github.com/mattn/go-colorable v0.1.13 // indirect
+	github.com/mattn/go-isatty v0.0.19 // indirect
 	github.com/rogpeppe/go-internal v1.11.0 // indirect
 	github.com/swaggo/files/v2 v2.0.0 // indirect
 	go.uber.org/atomic v1.7.0 // indirect
@@ -59,7 +62,7 @@ require (
 	golang.org/x/net v0.12.0 // indirect
 	golang.org/x/oauth2 v0.8.0
 	golang.org/x/sync v0.3.0 // indirect
-	golang.org/x/sys v0.10.0 // indirect
+	golang.org/x/sys v0.12.0 // indirect
 	golang.org/x/text v0.11.0 // indirect
 	golang.org/x/time v0.3.0 // indirect
 	golang.org/x/xerrors v0.0.0-20220907171357-04be3eba64a2 // indirect

go.sum

@@ -37,6 +37,7 @@ github.com/cncf/udpa/go v0.0.0-20210930031921-04548b0d99d4/go.mod h1:6pvJx4me5XP
 github.com/cncf/xds/go v0.0.0-20210805033703-aa0b78936158/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs=
 github.com/cncf/xds/go v0.0.0-20210922020428-25de7278fc84/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs=
 github.com/cncf/xds/go v0.0.0-20211011173535-cb28da3451f1/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs=
+github.com/coreos/go-systemd/v22 v22.5.0/go.mod h1:Y58oyj3AT4RCenI/lSvhwexgC+NSVTIJ3seZv2GcEnc=
 github.com/creack/pty v1.1.9/go.mod h1:oKZEueFk5CKHvIhNR5MUki03XCEU+Q6VDXinZuGJ33E=
 github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
@@ -83,6 +84,7 @@ github.com/go-playground/universal-translator v0.18.1 h1:Bcnm0ZwsGyWbCzImXv+pAJn
 github.com/go-playground/universal-translator v0.18.1/go.mod h1:xekY+UJKNuX9WP91TpwSH2VMlDf28Uj24BCp08ZFTUY=
 github.com/go-playground/validator v9.31.0+incompatible h1:UA72EPEogEnq76ehGdEDp4Mit+3FDh548oRqwVgNsHA=
 github.com/go-playground/validator v9.31.0+incompatible/go.mod h1:yrEkQXlcI+PugkyDjY2bRrL/UBU4f3rvrgkN3V8JEig=
+github.com/godbus/dbus/v5 v5.0.4/go.mod h1:xhWf0FNVPg57R7Z0UbKHbJfkEywrmjJnf7w5xrFpKfA=
 github.com/gogo/protobuf v1.3.2 h1:Ov1cvc58UF3b5XjBnZv7+opcTcQFZebYjWzi34vdm4Q=
 github.com/gogo/protobuf v1.3.2/go.mod h1:P1XiOD3dCwIKUDQYPy72D8LYyHL2YPYrpS2s69NZV8Q=
 github.com/golang-migrate/migrate/v4 v4.16.2 h1:8coYbMKUyInrFk1lfGfRovTLAW7PhWp8qQDT2iKfuoA=
@@ -159,6 +161,11 @@ github.com/mailru/easyjson v0.0.0-20190626092158-b2ccc519800e/go.mod h1:C1wdFJiN
 github.com/mailru/easyjson v0.7.6/go.mod h1:xzfreul335JAWq5oZzymOObrkdz5UnU4kGfJJLY9Nlc=
 github.com/mailru/easyjson v0.7.7 h1:UGYAvKxe3sBsEDzO8ZeWOSlIQfWFlxbzLZe7hwFURr0=
 github.com/mailru/easyjson v0.7.7/go.mod h1:xzfreul335JAWq5oZzymOObrkdz5UnU4kGfJJLY9Nlc=
+github.com/mattn/go-colorable v0.1.13 h1:fFA4WZxdEF4tXPZVKMLwD8oUnCTTo08duU7wxecdEvA=
+github.com/mattn/go-colorable v0.1.13/go.mod h1:7S9/ev0klgBDR4GtXTXX8a3vIGJpMovkB8vQcUbaXHg=
+github.com/mattn/go-isatty v0.0.16/go.mod h1:kYGgaQfpe5nmfYZH+SKPsOc2e4SrIfOl2e/yFXSvRLM=
+github.com/mattn/go-isatty v0.0.19 h1:JITubQf0MOLdlGRuRq+jtsDlekdYPia9ZFsB8h/APPA=
+github.com/mattn/go-isatty v0.0.19/go.mod h1:W+V8PltTTMOvKvAeJH7IuucS94S2C6jfK/D7dTCTo3Y=
 github.com/moby/term v0.5.0 h1:xt8Q1nalod/v7BqbG21f8mQPqH+xAaC9C3N3wfWbVP0=
 github.com/moby/term v0.5.0/go.mod h1:8FzsFHVUBGZdbDsJw/ot+X+d5HLUbvklYLJ9uGfcI3Y=
 github.com/morikuni/aec v1.0.0 h1:nP9CBfwrvYnBRgY6qfDQkygYDmYwOilePFkwzv4dU8A=
@@ -176,6 +183,9 @@ github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:
 github.com/rogpeppe/fastuuid v1.2.0/go.mod h1:jVj6XXZzXRy/MSR5jhDC/2q6DgLz+nrA6LYCDYWNEvQ=
 github.com/rogpeppe/go-internal v1.11.0 h1:cWPaGQEPrBb5/AsnsZesgZZ9yb1OQ+GOISoDNXVBh4M=
 github.com/rogpeppe/go-internal v1.11.0/go.mod h1:ddIwULY96R17DhadqLgMfk9H9tvdUzkipdSkR5nkCZA=
+github.com/rs/xid v1.5.0/go.mod h1:trrq9SKmegXys3aeAKXMUTdJsYXVwGY3RLcfgqegfbg=
+github.com/rs/zerolog v1.32.0 h1:keLypqrlIjaFsbmJOBdB/qvyF8KEtCWHwobLp5l/mQ0=
+github.com/rs/zerolog v1.32.0/go.mod h1:/7mN4D5sKwJLZQ2b/znpjC3/GQWY/xaDXUM0kKWRHss=
 github.com/sirupsen/logrus v1.9.2 h1:oxx1eChJGI6Uks2ZC4W1zpLlVgqB8ner4EuQwV4Ik1Y=
 github.com/sirupsen/logrus v1.9.2/go.mod h1:naHLuLoDiP4jHNo9R0sCBMtWGeIprob74mVsIT4qYEQ=
 github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
@@ -253,9 +263,11 @@ golang.org/x/sys v0.0.0-20210423082822-04245dca01da/go.mod h1:h1NjWce9XRLGQEsW7w
 golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.0.0-20220811171246-fbc7d0a398ab/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.1.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.10.0 h1:SqMFp9UcQJZa+pmYuAKjd9xq1f0j5rLcDIk0mj4qAsA=
-golang.org/x/sys v0.10.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.12.0 h1:CM0HF96J0hcLAwsHPJZjfdNzs0gftsLfgKt57wWHJ0o=
+golang.org/x/sys v0.12.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
 golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
 golang.org/x/term v0.1.0/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=

internal/infra/database/transaction.go

@@ -68,19 +68,19 @@ func (sct *Tx) Commit() *pnd.AppError {
 func WithTransaction(ctx context.Context, conn *DB, f func(tx *Tx) *pnd.AppError) *pnd.AppError {
 	tx, err := conn.BeginTx(ctx)
 	if err != nil {
-		return pnd.FromPostgresError(err)
+		return err
 	}
 
 	if err := f(tx); err != nil {
 		if err := tx.Rollback(); err != nil {
-			return pnd.FromPostgresError(err)
+			return err
 		}
 
 		return err
 	}
 
 	if err := tx.Commit(); err != nil {
-		return pnd.FromPostgresError(err)
+		return err
 	}
 
 	return nil