Add sender attribute to messages

Author: oatmilkcat

internal/conversations/service.go

@@ -443,15 +443,29 @@ func (s *service) messageToView(ctx context.Context, message models.Message) (*M
 		return nil, err
 	}
 
+	if message.SenderPerspective == nil {
+		perspective := models.MessageSenderPerspectiveVolunteer
+		message.SenderPerspective = &perspective
+	}
+
 	view := &MessageView{
-		ID:              message.ID,
-		ConversationID:  message.ConversationID,
-		SenderID:        message.SenderID,
-		Timestamp:       message.Timestamp,
-		Type:            message.Type,
-		Edited:          message.Edited,
-		EditedTimestamp: message.EditedTimestamp,
-		Body:            body,
+		ID:                message.ID,
+		ConversationID:    message.ConversationID,
+		SenderID:          message.SenderID,
+		SenderPerspective: *message.SenderPerspective,
+		Timestamp:         message.Timestamp,
+		Type:              message.Type,
+		Edited:            message.Edited,
+		EditedTimestamp:   message.EditedTimestamp,
+		Body:              body,
+	}
+
+	if message.Sender != nil {
+		view.Sender = &MessageSenderView{
+			FirstName:      message.Sender.FirstName,
+			LastName:       message.Sender.LastName,
+			ProfilePicture: message.Sender.ProfilePicture,
+		}
 	}
 
 	return view, nil

internal/conversations/view.go

@@ -16,15 +16,23 @@ type ConversationView struct {
 
 // MessageView represents a view of a message.
 type MessageView struct {
-	ID                int64       `json:"id"`
-	ConversationID    int64       `json:"conversationId"`
-	SenderID          int64       `json:"senderId"`
-	SenderPerspective uint        `json:"senderPerspective"`
-	Timestamp         time.Time   `json:"timestamp"`
-	Type              string      `json:"type"`
-	Edited            bool        `json:"edited"`
-	EditedTimestamp   time.Time   `json:"editedTimestamp"`
-	Body              interface{} `json:"body"`
+	ID                int64              `json:"id"`
+	ConversationID    int64              `json:"conversationId"`
+	SenderID          int64              `json:"senderId"`
+	SenderPerspective uint               `json:"senderPerspective"`
+	Timestamp         time.Time          `json:"timestamp"`
+	Type              string             `json:"type"`
+	Edited            bool               `json:"edited"`
+	EditedTimestamp   time.Time          `json:"editedTimestamp"`
+	Body              interface{}        `json:"body"`
+	Sender            *MessageSenderView `json:"sender"`
+}
+
+// MessageSenderView represents the sender of a message.
+type MessageSenderView struct {
+	FirstName      string `json:"firstName"`
+	LastName       string `json:"lastName"`
+	ProfilePicture string `json:"profilePicture"`
 }
 
 // MessageVolunteerRequestProfileView represents a view of a message containing a user's profile.

internal/database/postgres/conversation_repository.go

@@ -25,7 +25,7 @@ func (r *conversationRepository) FindByID(id int64) (*models.Conversation, error
 	var conversation models.Conversation
 	if err := r.db.Preload("LastMessage", func(db *gorm.DB) *gorm.DB {
 		return db.Order("timestamp desc")
-	}).Preload("Organization").First(&conversation, id).Error; err != nil {
+	}).Preload("LastMessage.Sender").Preload("Organization").First(&conversation, id).Error; err != nil {
 		return &conversation, err
 	}
 	return &conversation, nil
@@ -41,7 +41,7 @@ func (r *conversationRepository) FindByIDs(ctx context.Context, ids []int64) (*m
 		Model(&models.Conversation{}).
 		Preload("LastMessage", func(db *gorm.DB) *gorm.DB {
 			return db.Order("timestamp desc")
-		}).
+		}).Preload("LastMessage.Sender").
 		Preload("Organization").
 		Limit(dbctx.Limit).
 		Joins("LEFT JOIN (select distinct on (timestamp) * from messages order by timestamp desc limit 1) as message ON message.conversation_id = conversations.id").
@@ -67,7 +67,7 @@ func (r *conversationRepository) FindByOrganizationID(ctx context.Context, organ
 		Model(&models.Conversation{}).
 		Preload("LastMessage", func(db *gorm.DB) *gorm.DB {
 			return db.Order("timestamp desc")
-		}).
+		}).Preload("LastMessage.Sender").
 		Limit(dbctx.Limit).
 		Joins("LEFT JOIN (select distinct on (timestamp) * from messages order by timestamp desc limit 1) as message ON message.conversation_id = conversations.id").
 		Where("conversations.organization_id = ? AND active = True", organizationID).

internal/database/postgres/message_repository.go

@@ -36,6 +36,7 @@ func (r *messageRepository) FindByConversationID(ctx context.Context, conversati
 	dbctx := dbctx.Get(ctx)
 
 	db := r.db.
+		Preload("Sender").
 		Model(&models.Message{}).
 		Limit(dbctx.Limit).
 		Where("conversation_id = ?", conversationID).Order("timestamp DESC", true).
@@ -63,6 +64,7 @@ func (r *messageRepository) FindBySenderID(ctx context.Context, senderID int64)
 	dbctx := dbctx.Get(ctx)
 
 	db := r.db.
+		Preload("Sender").
 		Model(&models.Message{}).
 		Limit(dbctx.Limit).
 		Where("sender_id = ?", senderID).Order("timestamp DESC", true).
@@ -89,6 +91,7 @@ func (r *messageRepository) FindInConversationBySenderID(ctx context.Context, co
 	dbctx := dbctx.Get(ctx)
 
 	db := r.db.
+		Preload("Sender").
 		Model(&models.Message{}).
 		Limit(dbctx.Limit).
 		Where("conversation_id = ? AND sender_id = ?", conversationID, senderID).Order("timestamp DESC", true).

internal/models/message.go

@@ -29,6 +29,7 @@ type Message struct {
 	Model
 	Timestamp         time.Time      `json:"timestamp"`
 	ConversationID    int64          `json:"conversationId"`
+	Sender            *User          `json:"-" gorm:"foreignkey:SenderID"`
 	SenderID          int64          `json:"senderId"`
 	SenderPerspective *uint          `json:"senderPerspective"`
 	Type              string         `json:"type"`