Merge pull request #566 from traPtitech/fix/gorm-error-handling

♻️ only log db error
traPtitech · Aug 3, 2023 · 7c9b6bc · 7c9b6bc
2 parents e053305 + ad12f2b
commit 7c9b6bc
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 1 deletion.
diff --git a/infrastructure/sqlhandler.go b/infrastructure/sqlhandler.go
@@ -146,6 +146,13 @@ const (
 
 func (h *SQLHandler) Error() error {
 	err := h.conn.Error
+	if err == nil {
+		return nil
+	}
+
+	// TODO: use correct context
+	h.conn.Logger.Error(context.TODO(), err.Error())
+
 	if errors.Is(err, gorm.ErrRecordNotFound) {
 		return repository.ErrNotFound
 	}
@@ -156,7 +163,7 @@ func (h *SQLHandler) Error() error {
 		return repository.ErrInvalidArg
 	}
 
-	return err
+	return repository.ErrDBInternal
 }
 
 // Interface guards

diff --git a/interfaces/handler/router.go b/interfaces/handler/router.go
@@ -52,6 +52,8 @@ func newHTTPErrorHandler(e *echo.Echo) echo.HTTPErrorHandler {
 		case errors.Is(err, repository.ErrNotFound):
 			code = http.StatusNotFound
 
+		case errors.Is(err, repository.ErrDBInternal):
+			fallthrough
 		default:
 			e.Logger.Error(err)
 			code = http.StatusInternalServerError

diff --git a/usecases/repository/errors.go b/usecases/repository/errors.go
@@ -17,6 +17,8 @@ var (
 	ErrAlreadyExists = errors.New("already exists")
 	// ErrInvalidArg argument error
 	ErrInvalidArg = errors.New("argument error")
+	// ErrDBInternal database internal error
+	ErrDBInternal = errors.New("database internal error")
 	// ErrBind failed to bind request
 	ErrBind = errors.New("bind error")
 	// ErrValidate failed to validate request