fixed notifications dispatch

api/pkg/messaging/notifications/site/processor.go

@@ -14,72 +14,74 @@ import (
 	"google.golang.org/protobuf/proto"
 )
 
-type DemoRequestProcessor struct {
-	logger  mlogger.Logger
-	handler handler.DemoRequestHandler
-	event   model.NotificationEvent
+type SiteRequestProcessor struct {
+	logger         mlogger.Logger
+	demoHandler    handler.DemoRequestHandler
+	contactHandler handler.ContactRequestHandler
+	event          model.NotificationEvent
 }
 
-func (drp *DemoRequestProcessor) Process(ctx context.Context, envelope me.Envelope) error {
-	var msg gmessaging.DemoRequestEvent
+func (srp *SiteRequestProcessor) Process(ctx context.Context, envelope me.Envelope) error {
+	var msg gmessaging.SiteRequestEvent
 	if err := proto.Unmarshal(envelope.GetData(), &msg); err != nil {
-		drp.logger.Warn("Failed to decode demo request envelope", zap.Error(err), zap.String("topic", drp.event.ToString()))
+		srp.logger.Warn("Failed to decode site request envelope", zap.Error(err), zap.String("topic", srp.event.ToString()))
 		return err
 	}
-	request := &model.DemoRequest{
-		Name:             msg.GetName(),
-		OrganizationName: msg.GetOrganizationName(),
-		Phone:            msg.GetPhone(),
-		WorkEmail:        msg.GetWorkEmail(),
-		PayoutVolume:     msg.GetPayoutVolume(),
-		Comment:          msg.GetComment(),
-	}
-	return drp.handler(ctx, request)
-}
 
-func (drp *DemoRequestProcessor) GetSubject() model.NotificationEvent {
-	return drp.event
-}
-
-func NewDemoRequestProcessor(logger mlogger.Logger, handler handler.DemoRequestHandler) np.EnvelopeProcessor {
-	return &DemoRequestProcessor{
-		logger:  logger.Named("demo_request_processor"),
-		handler: handler,
-		event:   internalsite.NewDemoRequestEvent(),
+	switch msg.GetType() {
+	case gmessaging.SiteRequestEvent_REQUEST_TYPE_DEMO:
+		if srp.demoHandler == nil {
+			srp.logger.Warn("Demo request handler is not configured")
+			return nil
+		}
+		demo := msg.GetDemo()
+		if demo == nil {
+			srp.logger.Warn("Demo request payload is empty")
+			return nil
+		}
+		request := &model.DemoRequest{
+			Name:             demo.GetName(),
+			OrganizationName: demo.GetOrganizationName(),
+			Phone:            demo.GetPhone(),
+			WorkEmail:        demo.GetWorkEmail(),
+			PayoutVolume:     demo.GetPayoutVolume(),
+			Comment:          demo.GetComment(),
+		}
+		return srp.demoHandler(ctx, request)
+	case gmessaging.SiteRequestEvent_REQUEST_TYPE_CONTACT:
+		if srp.contactHandler == nil {
+			srp.logger.Warn("Contact request handler is not configured")
+			return nil
+		}
+		contact := msg.GetContact()
+		if contact == nil {
+			srp.logger.Warn("Contact request payload is empty")
+			return nil
+		}
+		request := &model.ContactRequest{
+			Name:    contact.GetName(),
+			Email:   contact.GetEmail(),
+			Phone:   contact.GetPhone(),
+			Company: contact.GetCompany(),
+			Topic:   contact.GetTopic(),
+			Message: contact.GetMessage(),
+		}
+		return srp.contactHandler(ctx, request)
+	default:
+		srp.logger.Warn("Received site request with unsupported type", zap.Any("type", msg.GetType()))
+		return nil
 	}
 }
 
-type ContactRequestProcessor struct {
-	logger  mlogger.Logger
-	handler handler.ContactRequestHandler
-	event   model.NotificationEvent
+func (srp *SiteRequestProcessor) GetSubject() model.NotificationEvent {
+	return srp.event
 }
 
-func (crp *ContactRequestProcessor) Process(ctx context.Context, envelope me.Envelope) error {
-	var msg gmessaging.ContactRequestEvent
-	if err := proto.Unmarshal(envelope.GetData(), &msg); err != nil {
-		crp.logger.Warn("Failed to decode contact request envelope", zap.Error(err), zap.String("topic", crp.event.ToString()))
-		return err
-	}
-	request := &model.ContactRequest{
-		Name:    msg.GetName(),
-		Email:   msg.GetEmail(),
-		Phone:   msg.GetPhone(),
-		Company: msg.GetCompany(),
-		Topic:   msg.GetTopic(),
-		Message: msg.GetMessage(),
-	}
-	return crp.handler(ctx, request)
-}
-
-func (crp *ContactRequestProcessor) GetSubject() model.NotificationEvent {
-	return crp.event
-}
-
-func NewContactRequestProcessor(logger mlogger.Logger, handler handler.ContactRequestHandler) np.EnvelopeProcessor {
-	return &ContactRequestProcessor{
-		logger:  logger.Named("contact_request_processor"),
-		handler: handler,
-		event:   internalsite.NewContactRequestEvent(),
+func NewSiteRequestProcessor(logger mlogger.Logger, demo handler.DemoRequestHandler, contact handler.ContactRequestHandler) np.EnvelopeProcessor {
+	return &SiteRequestProcessor{
+		logger:         logger.Named("site_request_processor"),
+		demoHandler:    demo,
+		contactHandler: contact,
+		event:          internalsite.NewDemoRequestEvent(),
 	}
 }