Add contact type support to SendEmail method

Signed-off-by: WashingtonKK <washingtonkigan@gmail.com>

Author: WashingtonKK

users/api/grpc/endpoint.go

@@ -8,6 +8,7 @@ import (
 	"context"
 	"text/template"
 
+	grpcUsersV1 "github.com/absmach/supermq/api/grpc/emails/v1"
 	"github.com/absmach/supermq/pkg/errors"
 	"github.com/absmach/supermq/users"
 	"github.com/go-kit/kit/endpoint"
@@ -22,7 +23,7 @@ func sendEmailEndpoint(svc users.Service) endpoint.Endpoint {
 			}, err
 		}
 
-		if err := svc.SendEmailWithUserId(ctx, req.to, req.from, req.subject, req.header, req.user, req.content, req.footer); err != nil {
+		if err := svc.SendEmail(ctx, req.to, req.toType, req.from, req.fromType, req.subject, req.header, req.user, req.content, req.footer); err != nil {
 			return sendEmailRes{
 				err: err,
 			}, err
@@ -36,7 +37,9 @@ func sendEmailEndpoint(svc users.Service) endpoint.Endpoint {
 
 type sendEmailReq struct {
 	to           []string
+	toType       grpcUsersV1.ContactType
 	from         string
+	fromType     grpcUsersV1.ContactType
 	subject      string
 	header       string
 	user         string

users/api/grpc/server.go

@@ -46,7 +46,9 @@ func decodeSendEmailRequest(_ context.Context, grpcReq any) (any, error) {
 
 	return sendEmailReq{
 		to:           req.GetTos(),
+		toType:       req.GetToType(),
 		from:         req.GetFrom(),
+		fromType:     req.GetFromType(),
 		subject:      req.GetSubject(),
 		header:       opts["header"],
 		user:         opts["user"],

users/events/streams.go

@@ -6,6 +6,7 @@ package events
 import (
 	"context"
 
+	grpcEmailsV1 "github.com/absmach/supermq/api/grpc/emails/v1"
 	grpcTokenV1 "github.com/absmach/supermq/api/grpc/token/v1"
 	"github.com/absmach/supermq/pkg/authn"
 	"github.com/absmach/supermq/pkg/events"
@@ -445,6 +446,6 @@ func (es *eventStore) OAuthAddUserPolicy(ctx context.Context, user users.User) e
 	return es.Publish(ctx, addPolicyStream, event)
 }
 
-func (es *eventStore) SendEmailWithUserId(ctx context.Context, to []string, from, subject, header, user, content, footer string) error {
-	return es.svc.SendEmailWithUserId(ctx, to, from, subject, header, user, content, footer)
+func (es *eventStore) SendEmail(ctx context.Context, to []string, toType grpcEmailsV1.ContactType, from string, fromType grpcEmailsV1.ContactType, subject, header, user, content, footer string) error {
+	return es.svc.SendEmail(ctx, to, toType, from, fromType, subject, header, user, content, footer)
 }

users/middleware/authorization.go

@@ -6,6 +6,7 @@ package middleware
 import (
 	"context"
 
+	grpcEmailsV1 "github.com/absmach/supermq/api/grpc/emails/v1"
 	grpcTokenV1 "github.com/absmach/supermq/api/grpc/token/v1"
 	smqauth "github.com/absmach/supermq/auth"
 	"github.com/absmach/supermq/pkg/authn"
@@ -335,8 +336,8 @@ func (am *authorizationMiddleware) OAuthAddUserPolicy(ctx context.Context, user
 	return am.svc.OAuthAddUserPolicy(ctx, user)
 }
 
-func (am *authorizationMiddleware) SendEmailWithUserId(ctx context.Context, to []string, from, subject, header, user, content, footer string) error {
-	return am.svc.SendEmailWithUserId(ctx, to, from, subject, header, user, content, footer)
+func (am *authorizationMiddleware) SendEmail(ctx context.Context, to []string, toType grpcEmailsV1.ContactType, from string, fromType grpcEmailsV1.ContactType, subject, header, user, content, footer string) error {
+	return am.svc.SendEmail(ctx, to, toType, from, fromType, subject, header, user, content, footer)
 }
 
 func (am *authorizationMiddleware) checkSuperAdmin(ctx context.Context, session authn.Session) error {

users/middleware/logging.go

@@ -8,6 +8,7 @@ import (
 	"log/slog"
 	"time"
 
+	grpcEmailsV1 "github.com/absmach/supermq/api/grpc/emails/v1"
 	grpcTokenV1 "github.com/absmach/supermq/api/grpc/token/v1"
 	"github.com/absmach/supermq/pkg/authn"
 	"github.com/absmach/supermq/users"
@@ -522,13 +523,16 @@ func (lm *loggingMiddleware) OAuthAddUserPolicy(ctx context.Context, user users.
 	return lm.svc.OAuthAddUserPolicy(ctx, user)
 }
 
-// SendEmailWithUserId logs the send_email request. It logs the recipients and the time it took to complete the request.
-func (lm *loggingMiddleware) SendEmailWithUserId(ctx context.Context, to []string, from, subject, header, user, content, footer string) (err error) {
+// SendEmail logs the send_email request. It logs the recipients and the time it took to complete the request.
+func (lm *loggingMiddleware) SendEmail(ctx context.Context, to []string, toType grpcEmailsV1.ContactType, from string, fromType grpcEmailsV1.ContactType, subject, header, user, content, footer string) (err error) {
 	defer func(begin time.Time) {
 		args := []any{
 			slog.String("duration", time.Since(begin).String()),
 			slog.String("request_id", middleware.GetReqID(ctx)),
 			slog.Any("to", to),
+			slog.String("to_type", toType.String()),
+			slog.String("from", from),
+			slog.String("from_type", fromType.String()),
 			slog.String("subject", subject),
 		}
 		if err != nil {
@@ -538,5 +542,5 @@ func (lm *loggingMiddleware) SendEmailWithUserId(ctx context.Context, to []strin
 		}
 		lm.logger.Info("Send email completed successfully", args...)
 	}(time.Now())
-	return lm.svc.SendEmailWithUserId(ctx, to, from, subject, header, user, content, footer)
+	return lm.svc.SendEmail(ctx, to, toType, from, fromType, subject, header, user, content, footer)
 }

users/middleware/metrics.go

@@ -7,6 +7,7 @@ import (
 	"context"
 	"time"
 
+	grpcEmailsV1 "github.com/absmach/supermq/api/grpc/emails/v1"
 	grpcTokenV1 "github.com/absmach/supermq/api/grpc/token/v1"
 	"github.com/absmach/supermq/pkg/authn"
 	"github.com/absmach/supermq/users"
@@ -246,11 +247,11 @@ func (ms *metricsMiddleware) OAuthAddUserPolicy(ctx context.Context, user users.
 	return ms.svc.OAuthAddUserPolicy(ctx, user)
 }
 
-// SendEmailWithUserId instruments SendEmail method with metrics.
-func (ms *metricsMiddleware) SendEmailWithUserId(ctx context.Context, to []string, from, subject, header, user, content, footer string) error {
+// SendEmail instruments SendEmail method with metrics.
+func (ms *metricsMiddleware) SendEmail(ctx context.Context, to []string, toType grpcEmailsV1.ContactType, from string, fromType grpcEmailsV1.ContactType, subject, header, user, content, footer string) error {
 	defer func(begin time.Time) {
 		ms.counter.With("method", "send_email").Add(1)
 		ms.latency.With("method", "send_email").Observe(time.Since(begin).Seconds())
 	}(time.Now())
-	return ms.svc.SendEmailWithUserId(ctx, to, from, subject, header, user, content, footer)
+	return ms.svc.SendEmail(ctx, to, toType, from, fromType, subject, header, user, content, footer)
 }

users/middleware/tracing.go

@@ -6,6 +6,7 @@ package middleware
 import (
 	"context"
 
+	grpcEmailsV1 "github.com/absmach/supermq/api/grpc/emails/v1"
 	grpcTokenV1 "github.com/absmach/supermq/api/grpc/token/v1"
 	"github.com/absmach/supermq/pkg/authn"
 	"github.com/absmach/supermq/pkg/tracing"
@@ -249,13 +250,16 @@ func (tm *tracingMiddleware) OAuthAddUserPolicy(ctx context.Context, user users.
 	return tm.svc.OAuthAddUserPolicy(ctx, user)
 }
 
-// SendEmailWithUserId traces the "SendEmailWithUserId" operation of the wrapped users.Service.
-func (tm *tracingMiddleware) SendEmailWithUserId(ctx context.Context, to []string, from, subject, header, user, content, footer string) error {
+// SendEmail traces the "SendEmail" operation of the wrapped users.Service.
+func (tm *tracingMiddleware) SendEmail(ctx context.Context, to []string, toType grpcEmailsV1.ContactType, from string, fromType grpcEmailsV1.ContactType, subject, header, user, content, footer string) error {
 	ctx, span := tracing.StartSpan(ctx, tm.tracer, "svc_send_email", trace.WithAttributes(
 		attribute.StringSlice("to", to),
+		attribute.String("to_type", toType.String()),
+		attribute.String("from", from),
+		attribute.String("from_type", fromType.String()),
 		attribute.String("subject", subject),
 	))
 	defer span.End()
 
-	return tm.svc.SendEmailWithUserId(ctx, to, from, subject, header, user, content, footer)
+	return tm.svc.SendEmail(ctx, to, toType, from, fromType, subject, header, user, content, footer)
 }

users/mocks/service.go

@@ -15,6 +15,7 @@ import (
 	"time"
 
 	"github.com/absmach/supermq"
+	grpcEmailsV1 "github.com/absmach/supermq/api/grpc/emails/v1"
 	grpcTokenV1 "github.com/absmach/supermq/api/grpc/token/v1"
 	apiutil "github.com/absmach/supermq/api/http/util"
 	smqauth "github.com/absmach/supermq/auth"
@@ -815,20 +816,38 @@ func changed(updated *string, old string) bool {
 	return *updated != old
 }
 
-func (svc service) SendEmailWithUserId(ctx context.Context, userIds []string, from, subject, header, user, content, footer string) error {
-	for i, userId := range userIds {
-		u, err := svc.users.RetrieveByID(ctx, userId)
-		if err != nil {
-			return errors.Wrap(svcerr.ErrViewEntity, err)
+func (svc service) SendEmail(ctx context.Context, to []string, toType grpcEmailsV1.ContactType, from string, fromType grpcEmailsV1.ContactType, subject, header, user, content, footer string) error {
+	// Convert recipients based on contact type
+	emails := make([]string, len(to))
+	for i, contact := range to {
+		switch toType {
+		case grpcEmailsV1.ContactType_CONTACT_TYPE_ID:
+			u, err := svc.users.RetrieveByID(ctx, contact)
+			if err != nil {
+				return errors.Wrap(svcerr.ErrViewEntity, err)
+			}
+			emails[i] = u.Email
+		case grpcEmailsV1.ContactType_CONTACT_TYPE_EMAIL:
+			emails[i] = contact
+		default:
+			return errors.Wrap(svcerr.ErrMalformedEntity, errors.New("invalid contact type for recipients"))
 		}
-
-		userIds[i] = u.Email
 	}
 
-	inviter, err := svc.users.RetrieveByID(ctx, from)
-	if err != nil {
-		return err
+	// Convert sender based on contact type
+	var senderName string
+	switch fromType {
+	case grpcEmailsV1.ContactType_CONTACT_TYPE_ID:
+		inviter, err := svc.users.RetrieveByID(ctx, from)
+		if err != nil {
+			return errors.Wrap(svcerr.ErrViewEntity, err)
+		}
+		senderName = inviter.FirstName + " " + inviter.LastName
+	case grpcEmailsV1.ContactType_CONTACT_TYPE_EMAIL:
+		senderName = from
+	default:
+		return errors.Wrap(svcerr.ErrMalformedEntity, errors.New("invalid contact type for sender"))
 	}
 
-	return svc.email.SendCustom(userIds, inviter.FirstName+" "+inviter.LastName, subject, header, user, content, footer)
+	return svc.email.SendCustom(emails, senderName, subject, header, user, content, footer)
 }