Fix unread count to not count messages sent by the reader

Author: Jeff Yanta

pkg/code/data/chat/v2/memory/store.go

@@ -98,12 +98,13 @@ func (s *store) GetAllMembersByPlatformId(_ context.Context, platform chat.Platf
 }
 
 // GetUnreadCount implements chat.store.GetUnreadCount
-func (s *store) GetUnreadCount(_ context.Context, chatId chat.ChatId, readPointer chat.MessageId) (uint32, error) {
+func (s *store) GetUnreadCount(_ context.Context, chatId chat.ChatId, memberId chat.MemberId, readPointer chat.MessageId) (uint32, error) {
 	s.mu.Lock()
 	defer s.mu.Unlock()
 
 	items := s.findMessagesByChatId(chatId)
 	items = s.filterMessagesAfter(items, readPointer)
+	items = s.filterMessagesNotSentBy(items, memberId)
 	items = s.filterNotifiedMessages(items)
 	return uint32(len(items)), nil
 }
@@ -414,6 +415,16 @@ func (s *store) filterMessagesAfter(items []*chat.MessageRecord, pointer chat.Me
 	return res
 }
 
+func (s *store) filterMessagesNotSentBy(items []*chat.MessageRecord, sender chat.MemberId) []*chat.MessageRecord {
+	var res []*chat.MessageRecord
+	for _, item := range items {
+		if item.Sender == nil || !bytes.Equal(item.Sender[:], sender[:]) {
+			res = append(res, item)
+		}
+	}
+	return res
+}
+
 func (s *store) filterNotifiedMessages(items []*chat.MessageRecord) []*chat.MessageRecord {
 	var res []*chat.MessageRecord
 	for _, item := range items {

pkg/code/data/chat/v2/store.go

@@ -42,8 +42,8 @@ type Store interface {
 	// Note: Cursor is a message ID
 	GetAllMessagesByChatId(ctx context.Context, chatId ChatId, cursor query.Cursor, direction query.Ordering, limit uint64) ([]*MessageRecord, error)
 
-	// GetUnreadCount gets the unread message count for a chat ID at a read pointer
-	GetUnreadCount(ctx context.Context, chatId ChatId, readPointer MessageId) (uint32, error)
+	// GetUnreadCount gets the unread message count for a chat ID at a read pointer for a given chat member
+	GetUnreadCount(ctx context.Context, chatId ChatId, memberId MemberId, readPointer MessageId) (uint32, error)
 
 	// PutChat creates a new chat
 	PutChat(ctx context.Context, record *ChatRecord) error

pkg/code/data/internal.go

@@ -402,7 +402,7 @@ type DatabaseData interface {
 	GetAllChatMembersV2(ctx context.Context, chatId chat_v2.ChatId) ([]*chat_v2.MemberRecord, error)
 	GetPlatformUserChatMembershipV2(ctx context.Context, platform chat_v2.Platform, platformId string, opts ...query.Option) ([]*chat_v2.MemberRecord, error)
 	GetAllChatMessagesV2(ctx context.Context, chatId chat_v2.ChatId, opts ...query.Option) ([]*chat_v2.MessageRecord, error)
-	GetChatUnreadCountV2(ctx context.Context, chatId chat_v2.ChatId, readPointer chat_v2.MessageId) (uint32, error)
+	GetChatUnreadCountV2(ctx context.Context, chatId chat_v2.ChatId, memberId chat_v2.MemberId, readPointer chat_v2.MessageId) (uint32, error)
 	PutChatV2(ctx context.Context, record *chat_v2.ChatRecord) error
 	PutChatMemberV2(ctx context.Context, record *chat_v2.MemberRecord) error
 	PutChatMessageV2(ctx context.Context, record *chat_v2.MessageRecord) error
@@ -1492,8 +1492,8 @@ func (dp *DatabaseProvider) GetAllChatMessagesV2(ctx context.Context, chatId cha
 	}
 	return dp.chatv2.GetAllMessagesByChatId(ctx, chatId, req.Cursor, req.SortBy, req.Limit)
 }
-func (dp *DatabaseProvider) GetChatUnreadCountV2(ctx context.Context, chatId chat_v2.ChatId, readPointer chat_v2.MessageId) (uint32, error) {
-	return dp.chatv2.GetUnreadCount(ctx, chatId, readPointer)
+func (dp *DatabaseProvider) GetChatUnreadCountV2(ctx context.Context, chatId chat_v2.ChatId, memberId chat_v2.MemberId, readPointer chat_v2.MessageId) (uint32, error) {
+	return dp.chatv2.GetUnreadCount(ctx, chatId, memberId, readPointer)
 }
 func (dp *DatabaseProvider) PutChatV2(ctx context.Context, record *chat_v2.ChatRecord) error {
 	return dp.chatv2.PutChat(ctx, record)

pkg/code/server/grpc/chat/v2/server.go

@@ -255,7 +255,7 @@ func (s *server) GetChats(ctx context.Context, req *chatpb.GetChatsRequest) (*ch
 			if platformUserMemberRecord.ReadPointer != nil {
 				readPointer = *platformUserMemberRecord.ReadPointer
 			}
-			unreadCount, err := s.data.GetChatUnreadCountV2(ctx, chatRecord.ChatId, readPointer)
+			unreadCount, err := s.data.GetChatUnreadCountV2(ctx, chatRecord.ChatId, platformUserMemberRecord.MemberId, readPointer)
 			if err != nil {
 				log.WithError(err).Warn("failure getting unread count")
 				return nil, status.Error(codes.Internal, "")