Skip to content

Commit 199e726

Browse files
committed
Add totalResults property to GET {conversationId}/messages endpoints
1 parent d8cbdc0 commit 199e726

File tree

2 files changed

+12
-8
lines changed

2 files changed

+12
-8
lines changed

internal/conversations/service.go

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -395,8 +395,9 @@ func (s *service) brokerPublishMessageSent(message models.Message) error {
395395

396396
// ConversationMessagesResponse represents a response containing messages and paging information.
397397
type ConversationMessagesResponse struct {
398-
Messages []MessageView `json:"messages"`
399-
Pages uint `json:"pages"`
398+
Messages []MessageView `json:"messages"`
399+
Pages uint `json:"pages"`
400+
TotalResults uint `json:"totalResults"`
400401
}
401402

402403
// GetConversationMessages gets messages by conversation ID.
@@ -420,8 +421,9 @@ func (s *service) GetConversationMessages(ctx context.Context, conversationID in
420421
}
421422

422423
return &ConversationMessagesResponse{
423-
Messages: views,
424-
Pages: uint(res.TotalResults/dbctx.Get(ctx).Limit) + 1,
424+
Messages: views,
425+
Pages: uint(res.TotalResults/dbctx.Get(ctx).Limit) + 1,
426+
TotalResults: uint(res.TotalResults),
425427
}, nil
426428
}
427429

internal/core/handlers/conversations/messages_get.go

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,9 @@ import (
1111
// MessagesGet gets messages by conversation ID.
1212
func MessagesGet(conversationsService conversations.Service) http.HandlerFunc {
1313
type response struct {
14-
Messages []conversations.MessageView `json:"messages"`
15-
Pages uint `json:"pages"`
14+
Messages []conversations.MessageView `json:"messages"`
15+
Pages uint `json:"pages"`
16+
TotalResults uint `json:"totalResults"`
1617
}
1718
return func(w http.ResponseWriter, r *http.Request) {
1819
ctx := r.Context()
@@ -36,8 +37,9 @@ func MessagesGet(conversationsService conversations.Service) http.HandlerFunc {
3637
}
3738

3839
resp.OK(w, r, response{
39-
Messages: res.Messages,
40-
Pages: res.Pages,
40+
Messages: res.Messages,
41+
Pages: res.Pages,
42+
TotalResults: res.TotalResults,
4143
})
4244
}
4345
}

0 commit comments

Comments
 (0)