Change update error handling for mattermost and teams message delivery (#182)

## What

- update error handling for mattermost and teams message delivery

## References

<!-- Add identifier for issue tickets, links to other PRs, etc. -->

## Checklist

<!-- Remove this section if not applicable to your changes -->

- [ ] Tests

Author: stefanTolksdorf

pkg/services/notificationchannelservice/mattermostChannelService.go

@@ -16,6 +16,7 @@ var (
 	ErrMattermostChannelLimitReached = errors.New("Mattermost channel limit reached.")
 	ErrListMattermostChannels        = errors.New("failed to list mattermost channels")
 	ErrMattermostChannelNameExists   = errors.New("Mattermost channel name already exists.")
+	ErrMattermostMassageDelivery     = errors.New("mattermost message could not be send")
 )
 
 type MattermostChannelService interface {
@@ -58,7 +59,11 @@ func (m *mattermostChannelService) SendMattermostTestMessage(webhookUrl string)
 	}()
 
 	if resp.StatusCode < 200 || resp.StatusCode >= 300 {
-		return fmt.Errorf("failed to send test message to Mattermost webhook: %s", resp.Status)
+		return fmt.Errorf(
+			"%w: http status: %s",
+			ErrMattermostMassageDelivery,
+			resp.Status,
+		)
 	}
 
 	return nil

pkg/services/notificationchannelservice/teamsChannelService.go

@@ -16,6 +16,7 @@ var (
 	ErrTeamsChannelLimitReached = errors.New("Teams channel limit reached.")
 	ErrListTeamsChannels        = errors.New("failed to list teams channels")
 	ErrTeamsChannelNameExists   = errors.New("Teams channel name already exists.")
+	ErrTeamsMassageDelivery     = errors.New("teams message could not be send")
 )
 
 type TeamsChannelService interface {
@@ -58,7 +59,11 @@ func (t *teamsChannelService) SendTeamsTestMessage(webhookUrl string) error {
 	}()
 
 	if resp.StatusCode < 200 || resp.StatusCode >= 300 {
-		return fmt.Errorf("failed to send test message to Teams webhook: %s", resp.Status)
+		return fmt.Errorf(
+			"%w: http status: %s",
+			ErrTeamsMassageDelivery,
+			resp.Status,
+		)
 	}
 
 	return nil

pkg/web/mattermostcontroller/mattermostController.go

@@ -1,6 +1,7 @@
 package mattermostcontroller
 
 import (
+	"errors"
 	"net/http"
 
 	"github.com/gin-gonic/gin"
@@ -29,11 +30,32 @@ func NewMattermostController(
 		notificationChannelServicer: notificationChannelServicer,
 		mattermostChannelService:    mattermostChannelService,
 	}
-	ctrl.registerRoutes(router, auth)
+
+	group := router.Group("/notification-channel/mattermost").
+		Use(middleware.AuthorizeRoles(auth, "admin")...)
+	group.POST("", ctrl.CreateMattermostChannel)
+	group.GET("", ctrl.ListMattermostChannelsByType)
+	group.PUT("/:id", ctrl.UpdateMattermostChannel)
+	group.DELETE("/:id", ctrl.DeleteMattermostChannel)
+	group.POST("/check", ctrl.SendMattermostTestMessage)
+
+	router.Use(errorHandler(gin.ErrorTypePrivate))
 	ctrl.configureMappings(registry)
 	return ctrl
 }
 
+func errorHandler(errorType gin.ErrorType) gin.HandlerFunc {
+	return func(c *gin.Context) {
+		c.Next()
+		for _, errorValue := range c.Errors.ByType(errorType) {
+			if errors.Is(errorValue, notificationchannelservice.ErrMattermostMassageDelivery) {
+				c.AbortWithStatusJSON(http.StatusBadRequest, errorResponses.NewErrorGenericResponse(errorValue.Error()))
+				return
+			}
+		}
+	}
+}
+
 func (mc *MattermostController) configureMappings(r *errmap.Registry) {
 	r.Register(
 		notificationchannelservice.ErrMattermostChannelLimitReached,
@@ -52,16 +74,6 @@ func (mc *MattermostController) configureMappings(r *errmap.Registry) {
 	)
 }
 
-func (mc *MattermostController) registerRoutes(router gin.IRouter, auth gin.HandlerFunc) {
-	group := router.Group("/notification-channel/mattermost").
-		Use(middleware.AuthorizeRoles(auth, "admin")...)
-	group.POST("", mc.CreateMattermostChannel)
-	group.GET("", mc.ListMattermostChannelsByType)
-	group.PUT("/:id", mc.UpdateMattermostChannel)
-	group.DELETE("/:id", mc.DeleteMattermostChannel)
-	group.POST("/check", mc.SendMattermostTestMessage)
-}
-
 // CreateMattermostChannel
 //
 //	@Summary		Create Mattermost Channel

pkg/web/middleware/error_interpreter.go

@@ -14,8 +14,12 @@ import (
 func InterpretErrors(errorType gin.ErrorType, r errmap.ErrorRegistry) gin.HandlerFunc {
 	return func(c *gin.Context) {
 		c.Next()
-		for _, errorValue := range c.Errors.ByType(errorType) {
 
+		if c.IsAborted() {
+			return
+		}
+
+		for _, errorValue := range c.Errors.ByType(errorType) {
 			actual := errorValue.Unwrap()
 
 			bindingError := ginEx.BindingError{}

pkg/web/teamsController/teamsController.go

@@ -43,10 +43,23 @@ func AddTeamsController(
 	group.DELETE("/:id", ctrl.DeleteTeamsChannel)
 	group.POST("/check", ctrl.SendTeamsTestMessage)
 
+	router.Use(errorHandler(gin.ErrorTypePrivate))
 	ctrl.configureMappings(registry)
 	return ctrl
 }
 
+func errorHandler(errorType gin.ErrorType) gin.HandlerFunc {
+	return func(c *gin.Context) {
+		c.Next()
+		for _, errorValue := range c.Errors.ByType(errorType) {
+			if errors.Is(errorValue, notificationchannelservice.ErrTeamsMassageDelivery) {
+				c.AbortWithStatusJSON(http.StatusBadRequest, errorResponses.NewErrorGenericResponse(errorValue.Error()))
+				return
+			}
+		}
+	}
+}
+
 func (tc *TeamsController) configureMappings(r *errmap.Registry) {
 	r.Register(
 		notificationchannelservice.ErrTeamsChannelLimitReached,