MM-33746 Add TotalMsgCountRoot and MsgCountRoot columns (#17150)

model/channel.go

@@ -34,24 +34,25 @@ const (
 )
 
 type Channel struct {
-	Id               string                 `json:"id"`
-	CreateAt         int64                  `json:"create_at"`
-	UpdateAt         int64                  `json:"update_at"`
-	DeleteAt         int64                  `json:"delete_at"`
-	TeamId           string                 `json:"team_id"`
-	Type             string                 `json:"type"`
-	DisplayName      string                 `json:"display_name"`
-	Name             string                 `json:"name"`
-	Header           string                 `json:"header"`
-	Purpose          string                 `json:"purpose"`
-	LastPostAt       int64                  `json:"last_post_at"`
-	TotalMsgCount    int64                  `json:"total_msg_count"`
-	ExtraUpdateAt    int64                  `json:"extra_update_at"`
-	CreatorId        string                 `json:"creator_id"`
-	SchemeId         *string                `json:"scheme_id"`
-	Props            map[string]interface{} `json:"props" db:"-"`
-	GroupConstrained *bool                  `json:"group_constrained"`
-	Shared           *bool                  `json:"shared"`
+	Id                string                 `json:"id"`
+	CreateAt          int64                  `json:"create_at"`
+	UpdateAt          int64                  `json:"update_at"`
+	DeleteAt          int64                  `json:"delete_at"`
+	TeamId            string                 `json:"team_id"`
+	Type              string                 `json:"type"`
+	DisplayName       string                 `json:"display_name"`
+	Name              string                 `json:"name"`
+	Header            string                 `json:"header"`
+	Purpose           string                 `json:"purpose"`
+	LastPostAt        int64                  `json:"last_post_at"`
+	TotalMsgCount     int64                  `json:"total_msg_count"`
+	ExtraUpdateAt     int64                  `json:"extra_update_at"`
+	CreatorId         string                 `json:"creator_id"`
+	SchemeId          *string                `json:"scheme_id"`
+	Props             map[string]interface{} `json:"props" db:"-"`
+	GroupConstrained  *bool                  `json:"group_constrained"`
+	Shared            *bool                  `json:"shared"`
+	TotalMsgCountRoot int64                  `json:"total_msg_count_root"`
 }
 
 type ChannelWithTeamData struct {

model/channel_count.go

@@ -14,11 +14,12 @@ import (
 
 type ChannelCounts struct {
 	Counts      map[string]int64 `json:"counts"`
+	CountsRoot  map[string]int64 `json:"counts_root"`
 	UpdateTimes map[string]int64 `json:"update_times"`
 }
 
 func (o *ChannelCounts) Etag() string {
-
+	// we don't include CountsRoot in ETag calculation, since it's a deriviative
 	ids := []string{}
 	for id := range o.Counts {
 		ids = append(ids, id)

model/channel_member.go

@@ -27,6 +27,7 @@ type ChannelUnread struct {
 	TeamId       string    `json:"team_id"`
 	ChannelId    string    `json:"channel_id"`
 	MsgCount     int64     `json:"msg_count"`
+	MsgCountRoot int64     `json:"msg_count_root"`
 	MentionCount int64     `json:"mention_count"`
 	NotifyProps  StringMap `json:"-"`
 }
@@ -36,6 +37,7 @@ type ChannelUnreadAt struct {
 	UserId       string    `json:"user_id"`
 	ChannelId    string    `json:"channel_id"`
 	MsgCount     int64     `json:"msg_count"`
+	MsgCountRoot int64     `json:"msg_count_root"`
 	MentionCount int64     `json:"mention_count"`
 	LastViewedAt int64     `json:"last_viewed_at"`
 	NotifyProps  StringMap `json:"-"`
@@ -54,6 +56,7 @@ type ChannelMember struct {
 	SchemeUser    bool      `json:"scheme_user"`
 	SchemeAdmin   bool      `json:"scheme_admin"`
 	ExplicitRoles string    `json:"explicit_roles"`
+	MsgCountRoot  int64     `json:"msg_count_root"`
 }
 
 type ChannelMembers []ChannelMember

model/team_member.go

@@ -33,6 +33,7 @@ type TeamMember struct {
 type TeamUnread struct {
 	TeamId       string `json:"team_id"`
 	MsgCount     int64  `json:"msg_count"`
+	MsgCountRoot int64  `json:"msg_count_root"`
 	MentionCount int64  `json:"mention_count"`
 }