fixed notifications dispatch

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

@@ -10,72 +10,84 @@ import (
 	"google.golang.org/protobuf/proto"
 )
 
-type DemoRequestNotification struct {
+type SiteRequestNotification struct {
 	messaging.Envelope
-	request *model.DemoRequest
+	requestType    gmessaging.SiteRequestEvent_RequestType
+	demoRequest    *model.DemoRequest
+	contactRequest *model.ContactRequest
 }
 
-func (drn *DemoRequestNotification) Serialize() ([]byte, error) {
-	if drn.request == nil {
-		return nil, merrors.InvalidArgument("demo request payload is empty", "request")
+func (srn *SiteRequestNotification) Serialize() ([]byte, error) {
+	msg := gmessaging.SiteRequestEvent{
+		Type: srn.requestType,
 	}
-	msg := gmessaging.DemoRequestEvent{
-		Name:             drn.request.Name,
-		OrganizationName: drn.request.OrganizationName,
-		Phone:            drn.request.Phone,
-		WorkEmail:        drn.request.WorkEmail,
-		PayoutVolume:     drn.request.PayoutVolume,
-		Comment:          drn.request.Comment,
+
+	switch srn.requestType {
+	case gmessaging.SiteRequestEvent_REQUEST_TYPE_DEMO:
+		if srn.demoRequest == nil {
+			return nil, merrors.InvalidArgument("demo request payload is empty", "request")
+		}
+		msg.Payload = &gmessaging.SiteRequestEvent_Demo{
+			Demo: &gmessaging.SiteDemoRequest{
+				Name:             srn.demoRequest.Name,
+				OrganizationName: srn.demoRequest.OrganizationName,
+				Phone:            srn.demoRequest.Phone,
+				WorkEmail:        srn.demoRequest.WorkEmail,
+				PayoutVolume:     srn.demoRequest.PayoutVolume,
+				Comment:          srn.demoRequest.Comment,
+			},
+		}
+	case gmessaging.SiteRequestEvent_REQUEST_TYPE_CONTACT:
+		if srn.contactRequest == nil {
+			return nil, merrors.InvalidArgument("contact request payload is empty", "request")
+		}
+		msg.Payload = &gmessaging.SiteRequestEvent_Contact{
+			Contact: &gmessaging.SiteContactRequest{
+				Name:    srn.contactRequest.Name,
+				Email:   srn.contactRequest.Email,
+				Phone:   srn.contactRequest.Phone,
+				Company: srn.contactRequest.Company,
+				Topic:   srn.contactRequest.Topic,
+				Message: srn.contactRequest.Message,
+			},
+		}
+	default:
+		return nil, merrors.InvalidArgument("unsupported site request type", "type")
 	}
+
 	data, err := proto.Marshal(&msg)
 	if err != nil {
 		return nil, err
 	}
-	return drn.Envelope.Wrap(data)
+	return srn.Envelope.Wrap(data)
+}
+
+func newSiteRequestEvent() model.NotificationEvent {
+	return model.NewNotification(mservice.Site, nm.NACreated)
 }
 
 func NewDemoRequestEvent() model.NotificationEvent {
-	return model.NewNotification(mservice.Site, nm.NACreated)
-}
-
-func NewDemoRequestEnvelope(sender string, request *model.DemoRequest) messaging.Envelope {
-	return &DemoRequestNotification{
-		Envelope: messaging.CreateEnvelope(sender, NewDemoRequestEvent()),
-		request:  request,
-	}
-}
-
-type ContactRequestNotification struct {
-	messaging.Envelope
-	request *model.ContactRequest
-}
-
-func (crn *ContactRequestNotification) Serialize() ([]byte, error) {
-	if crn.request == nil {
-		return nil, merrors.InvalidArgument("contact request payload is empty", "request")
-	}
-	msg := gmessaging.ContactRequestEvent{
-		Name:    crn.request.Name,
-		Email:   crn.request.Email,
-		Phone:   crn.request.Phone,
-		Company: crn.request.Company,
-		Topic:   crn.request.Topic,
-		Message: crn.request.Message,
-	}
-	data, err := proto.Marshal(&msg)
-	if err != nil {
-		return nil, err
-	}
-	return crn.Envelope.Wrap(data)
+	return newSiteRequestEvent()
 }
 
 func NewContactRequestEvent() model.NotificationEvent {
-	return model.NewNotification(mservice.Site, nm.NACreated)
+	return newSiteRequestEvent()
+}
+
+func NewDemoRequestEnvelope(sender string, request *model.DemoRequest) messaging.Envelope {
+	return &SiteRequestNotification{
+		Envelope:       messaging.CreateEnvelope(sender, newSiteRequestEvent()),
+		requestType:    gmessaging.SiteRequestEvent_REQUEST_TYPE_DEMO,
+		demoRequest:    request,
+		contactRequest: nil,
+	}
 }
 
 func NewContactRequestEnvelope(sender string, request *model.ContactRequest) messaging.Envelope {
-	return &ContactRequestNotification{
-		Envelope: messaging.CreateEnvelope(sender, NewContactRequestEvent()),
-		request:  request,
+	return &SiteRequestNotification{
+		Envelope:       messaging.CreateEnvelope(sender, newSiteRequestEvent()),
+		requestType:    gmessaging.SiteRequestEvent_REQUEST_TYPE_CONTACT,
+		contactRequest: request,
+		demoRequest:    nil,
 	}
 }