removed obsolete errors

api/pkg/merrors/errors.go

@@ -49,13 +49,13 @@ func AccessDenied(object, action string, objectRef primitive.ObjectID) error {
 var ErrInvalidDataType = errors.New("invalidDataType")
 
 func InvalidDataType(msg string) error {
-	return fmt.Errorf("%w: %s", ErrDataConflict, msg)
+	return fmt.Errorf("%w: %s", ErrInvalidDataType, msg)
 }
 
 var ErrUnauthorized = errors.New("unathorized")
 
 func Unauthorized(msg string) error {
-	return fmt.Errorf("%w: %s", ErrDataConflict, msg)
+	return fmt.Errorf("%w: %s", ErrUnauthorized, msg)
 }
 
 var ErrNoMessagingTopic = errors.New("messagingTopicError")
@@ -63,3 +63,19 @@ var ErrNoMessagingTopic = errors.New("messagingTopicError")
 func NoMessagingTopic(topic string) error {
 	return fmt.Errorf("%w: messaging topic '%s' not found", ErrNoMessagingTopic, topic)
 }
+
+func InvalidArgumentWrap(err error, msg string) error {
+	return wrapError(ErrInvalidArg, msg, err)
+}
+
+func InternalWrap(err error, msg string) error {
+	return wrapError(ErrInternal, msg, err)
+}
+
+func wrapError(base error, msg string, err error) error {
+	baseErr := fmt.Errorf("%w: %s", base, msg)
+	if err == nil {
+		return baseErr
+	}
+	return errors.Join(baseErr, err)
+}

api/pkg/messaging/internal/notifications/site/notification.go

@@ -1,9 +1,8 @@
 package notifications
 
 import (
-	"fmt"
-
 	gmessaging "github.com/tech/sendico/pkg/generated/gmessaging"
+	"github.com/tech/sendico/pkg/merrors"
 	messaging "github.com/tech/sendico/pkg/messaging/envelope"
 	"github.com/tech/sendico/pkg/model"
 	nm "github.com/tech/sendico/pkg/model/notification"
@@ -18,7 +17,7 @@ type DemoRequestNotification struct {
 
 func (drn *DemoRequestNotification) Serialize() ([]byte, error) {
 	if drn.request == nil {
-		return nil, fmt.Errorf("demo request payload is empty")
+		return nil, merrors.InvalidArgument("demo request payload is empty")
 	}
 	msg := gmessaging.DemoRequestEvent{
 		Name:             drn.request.Name,