Fix incorrect perspectives on messages + volunteer acceptance message

Author: oatmilkcat

internal/conversations/message_types.go

@@ -14,6 +14,7 @@ type MessageVolunteerRequestProfile struct {
 // MessageTypeVolunteerRequestAcceptance represents the message sent when a user is accepted to an opportunity.
 type MessageTypeVolunteerRequestAcceptance struct {
 	UserID        int64 `json:"userId"`
+	AccepterID    int64 `json:"accepterId"`
 	OpportunityID int64 `json:"opportunityId"`
 }
 

internal/conversations/service.go

@@ -49,6 +49,8 @@ type Service interface {
 	SendHoursRequestAcceptedMessage(ctx context.Context, userID, requestID int64) (int64, error)
 	// SendHoursRequestDeclinedMessage sends an hours request decline message to a user's organization message.
 	SendHoursRequestDeclinedMessage(ctx context.Context, userID, requestID int64) (int64, error)
+	// SendVolunteerRequestAcceptanceMessage sends a VolunteerRequestAcceptance message based on request ID and opportunity ID.
+	SendVolunteerRequestAcceptanceMessage(ctx context.Context, userID, accepterID, opportunityID int64) (int64, error)
 }
 
 // service represents the internal implementation of the conversations Service.
@@ -469,7 +471,7 @@ func (s *service) parseMessage(ctx context.Context, messageType string, rawMessa
 			return nil, err
 		}
 
-		view, err := s.getMessageVolunteerRequestAcceptance(ctx, body.UserID, body.OpportunityID)
+		view, err := s.getMessageVolunteerRequestAcceptance(ctx, body.UserID, body.AccepterID, body.OpportunityID)
 		if err != nil {
 			return nil, err
 		}
@@ -593,15 +595,34 @@ func (s *service) getMessageVolunteerRequestProfileView(ctx context.Context, use
 }
 
 // getMessageVolunteerRequestAcceptance gets a MessageTypeVolunteerRequestAcceptanceView by user ID and opportunity ID.
-func (s *service) getMessageVolunteerRequestAcceptance(ctx context.Context, userID, opportunityID int64) (*MessageTypeVolunteerRequestAcceptanceView, error) {
+func (s *service) getMessageVolunteerRequestAcceptance(ctx context.Context, userID, accepterID, opportunityID int64) (*MessageTypeVolunteerRequestAcceptanceView, error) {
 	view := &MessageTypeVolunteerRequestAcceptanceView{}
 
 	opportunity, err := s.opportunityRepository.FindByID(ctx, opportunityID)
 	if err != nil {
 		return nil, err
 	}
 
-	view.UserID = userID
+	volunteer, err := s.userRepository.FindByID(userID)
+	if err != nil {
+		return nil, err
+	}
+
+	accepter, err := s.userRepository.FindByID(accepterID)
+	if err != nil {
+		return nil, err
+	}
+
+	view.Volunteer = &MessageUserWithName{
+		ID:        userID,
+		FirstName: volunteer.FirstName,
+		LastName:  volunteer.LastName,
+	}
+	view.Accepter = &MessageUserWithName{
+		ID:        accepterID,
+		FirstName: accepter.FirstName,
+		LastName:  accepter.LastName,
+	}
 	view.OpportunityID = opportunityID
 	view.OpportunityTitle = opportunity.Title
 
@@ -688,7 +709,7 @@ func (s *service) SendHoursRequestAcceptedMessage(ctx context.Context, userID, r
 	message.ConversationID = conversation.ID
 	message.SenderID = userID
 	message.Type = models.MessageTypeHoursAccepted
-	perspective := models.MessageSenderPerspectiveVolunteer
+	perspective := models.MessageSenderPerspectiveOrganization
 
 	message.SenderPerspective = &perspective
 
@@ -729,7 +750,7 @@ func (s *service) SendHoursRequestDeclinedMessage(ctx context.Context, userID, r
 	message.ConversationID = conversation.ID
 	message.SenderID = userID
 	message.Type = models.MessageTypeHoursDeclined
-	perspective := models.MessageSenderPerspectiveVolunteer
+	perspective := models.MessageSenderPerspectiveOrganization
 
 	message.SenderPerspective = &perspective
 
@@ -751,3 +772,46 @@ func (s *service) SendHoursRequestDeclinedMessage(ctx context.Context, userID, r
 
 	return message.ID, nil
 }
+
+// SendVolunteerRequestAcceptanceMessage sends a VolunteerRequestAcceptance message based on request ID and opportunity ID.
+func (s *service) SendVolunteerRequestAcceptanceMessage(ctx context.Context, userID, accepterID, opportunityID int64) (int64, error) {
+	opportunity, err := s.opportunityRepository.FindByID(ctx, opportunityID)
+	if err != nil {
+		return 0, NewErrServerError()
+	}
+
+	conversation, err := s.conversationRepository.FindUserOrganizationConversation(ctx, userID, opportunity.OrganizationID)
+	if err != nil {
+		return 0, NewErrConversationNotFound()
+	}
+
+	message := models.Message{}
+	message.ID = s.snowflakeService.GenerateID()
+	message.Timestamp = time.Now()
+	message.ConversationID = conversation.ID
+	message.SenderID = accepterID
+	message.Type = models.MessageTypeVolunteerRequestAcceptance
+	perspective := models.MessageSenderPerspectiveOrganization
+
+	message.SenderPerspective = &perspective
+
+	messageBody := MessageTypeVolunteerRequestAcceptance{
+		UserID:        userID,
+		AccepterID:    accepterID,
+		OpportunityID: opportunityID,
+	}
+
+	jsonBytes, err := marshalMessageBody(messageBody)
+	if err != nil {
+		return 0, NewErrServerError()
+	}
+
+	message.Body = *jsonBytes
+	message.Edited = false
+	if err := s.sendMessage(ctx, message); err != nil {
+		s.logger.Error().Err(err).Msg("Error creating message")
+		return 0, NewErrServerError()
+	}
+
+	return message.ID, nil
+}

internal/conversations/view.go

@@ -48,9 +48,17 @@ type PreviousExperience struct {
 
 // MessageTypeVolunteerRequestAcceptanceView represents a view of a message containing an opportunity acceptance.
 type MessageTypeVolunteerRequestAcceptanceView struct {
-	UserID           int64  `json:"userId"`
-	OpportunityID    int64  `json:"opportunityId"`
-	OpportunityTitle string `json:"opportunityTitle"`
+	Volunteer        *MessageUserWithName `json:"volunteer"`
+	Accepter         *MessageUserWithName `json:"accepter"`
+	OpportunityID    int64                `json:"opportunityId"`
+	OpportunityTitle string               `json:"opportunityTitle"`
+}
+
+// MessageUserWithName represents a first and last name pair.
+type MessageUserWithName struct {
+	ID        int64  `json:"id"`
+	FirstName string `json:"firstName"`
+	LastName  string `json:"lastName"`
 }
 
 // MessageTypeHoursRequestedView represents the message sent when a volunteer requests hours from an organization.

internal/core/handlers/opportunities/volunteers_accept_post.go

@@ -3,16 +3,18 @@ package opportunities
 import (
 	"net/http"
 
+	"github.com/joinimpact/api/internal/conversations"
 	"github.com/joinimpact/api/internal/core/middleware/auth"
 	"github.com/joinimpact/api/internal/opportunities"
 	"github.com/joinimpact/api/pkg/idctx"
 	"github.com/joinimpact/api/pkg/resp"
 )
 
 // VolunteersAcceptPost accepts a volunteer's request.
-func VolunteersAcceptPost(opportunitiesService opportunities.Service) http.HandlerFunc {
+func VolunteersAcceptPost(opportunitiesService opportunities.Service, conversationsService conversations.Service) http.HandlerFunc {
 	type response struct {
-		Success bool `json:"success"`
+		Success   bool  `json:"success"`
+		MessageID int64 `json:"messageId"`
 	}
 	return func(w http.ResponseWriter, r *http.Request) {
 		ctx := r.Context()
@@ -46,6 +48,22 @@ func VolunteersAcceptPost(opportunitiesService opportunities.Service) http.Handl
 			return
 		}
 
-		resp.OK(w, r, response{true})
+		id, err := conversationsService.SendVolunteerRequestAcceptanceMessage(ctx, volunteerID, userID, opportunityID)
+		if err != nil {
+			switch err.(type) {
+			case *conversations.ErrConversationNotFound, *conversations.ErrUserNotFound:
+				resp.NotFound(w, r, resp.APIError(err, nil))
+			case *conversations.ErrServerError:
+				resp.ServerError(w, r, resp.APIError(err, nil))
+			default:
+				resp.ServerError(w, r, resp.UnknownError)
+			}
+			return
+		}
+
+		resp.OK(w, r, response{
+			Success:   true,
+			MessageID: id,
+		})
 	}
 }