summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--api/channel_test.go82
-rw-r--r--model/channel_member_test.go11
-rw-r--r--model/client.go9
-rw-r--r--store/sql_channel_store_test.go16
-rw-r--r--store/sql_post_store_test.go1
5 files changed, 119 insertions, 0 deletions
diff --git a/api/channel_test.go b/api/channel_test.go
index 7845ac499..3276022fa 100644
--- a/api/channel_test.go
+++ b/api/channel_test.go
@@ -885,6 +885,88 @@ func TestUpdateNotifyLevel(t *testing.T) {
}
}
+func TestUpdateMarkUnreadLevel(t *testing.T) {
+ Setup()
+
+ team := &model.Team{DisplayName: "Name", Name: "z-z-" + model.NewId() + "a", Email: "test@nowhere.com", Type: model.TEAM_OPEN}
+ team = Client.Must(Client.CreateTeam(team)).Data.(*model.Team)
+
+ user := &model.User{TeamId: team.Id, Email: model.NewId() + "corey@test.com", Nickname: "Corey Hulen", Password: "pwd"}
+ user = Client.Must(Client.CreateUser(user, "")).Data.(*model.User)
+ store.Must(Srv.Store.User().VerifyEmail(user.Id))
+
+ Client.LoginByEmail(team.Name, user.Email, "pwd")
+
+ channel1 := &model.Channel{DisplayName: "A Test API Name", Name: "a" + model.NewId() + "a", Type: model.CHANNEL_OPEN, TeamId: team.Id}
+ channel1 = Client.Must(Client.CreateChannel(channel1)).Data.(*model.Channel)
+
+ data := make(map[string]string)
+ data["channel_id"] = channel1.Id
+ data["user_id"] = user.Id
+ data["mark_unread_level"] = model.CHANNEL_MARK_UNREAD_MENTION
+
+ timeBeforeUpdate := model.GetMillis()
+ time.Sleep(100 * time.Millisecond)
+
+ if _, err := Client.UpdateMarkUnreadLevel(data); err != nil {
+ t.Fatal(err)
+ }
+
+ rget := Client.Must(Client.GetChannels(""))
+ rdata := rget.Data.(*model.ChannelList)
+ if len(rdata.Members) == 0 || rdata.Members[channel1.Id].MarkUnreadLevel != data["mark_unread_level"] {
+ t.Fatal("MarkUnreadLevel did not update properly")
+ }
+
+ if rdata.Members[channel1.Id].LastUpdateAt <= timeBeforeUpdate {
+ t.Fatal("LastUpdateAt did not update")
+ }
+
+ data["user_id"] = "junk"
+ if _, err := Client.UpdateMarkUnreadLevel(data); err == nil {
+ t.Fatal("Should have errored - bad user id")
+ }
+
+ data["user_id"] = "12345678901234567890123456"
+ if _, err := Client.UpdateMarkUnreadLevel(data); err == nil {
+ t.Fatal("Should have errored - bad user id")
+ }
+
+ data["user_id"] = user.Id
+ data["channel_id"] = "junk"
+ if _, err := Client.UpdateMarkUnreadLevel(data); err == nil {
+ t.Fatal("Should have errored - bad channel id")
+ }
+
+ data["channel_id"] = "12345678901234567890123456"
+ if _, err := Client.UpdateMarkUnreadLevel(data); err == nil {
+ t.Fatal("Should have errored - bad channel id")
+ }
+
+ data["channel_id"] = channel1.Id
+ data["mark_unread_level"] = ""
+ if _, err := Client.UpdateMarkUnreadLevel(data); err == nil {
+ t.Fatal("Should have errored - empty notify level")
+ }
+
+ data["mark_unread_level"] = "junk"
+ if _, err := Client.UpdateMarkUnreadLevel(data); err == nil {
+ t.Fatal("Should have errored - bad notify level")
+ }
+
+ user2 := &model.User{TeamId: team.Id, Email: model.NewId() + "corey@test.com", Nickname: "Corey Hulen", Password: "pwd"}
+ user2 = Client.Must(Client.CreateUser(user2, "")).Data.(*model.User)
+
+ Client.LoginByEmail(team.Name, user2.Email, "pwd")
+
+ data["channel_id"] = channel1.Id
+ data["user_id"] = user2.Id
+ data["mark_unread_level"] = model.CHANNEL_MARK_UNREAD_MENTION
+ if _, err := Client.UpdateMarkUnreadLevel(data); err == nil {
+ t.Fatal("Should have errored - user not in channel")
+ }
+}
+
func TestFuzzyChannel(t *testing.T) {
Setup()
diff --git a/model/channel_member_test.go b/model/channel_member_test.go
index 3b64ffbf7..ae3da73cc 100644
--- a/model/channel_member_test.go
+++ b/model/channel_member_test.go
@@ -32,6 +32,7 @@ func TestChannelMemberIsValid(t *testing.T) {
o.Roles = "missing"
o.NotifyLevel = CHANNEL_NOTIFY_ALL
+ o.MarkUnreadLevel = CHANNEL_MARK_UNREAD_ALL
o.UserId = NewId()
if err := o.IsValid(); err == nil {
t.Fatal("should be invalid")
@@ -53,6 +54,16 @@ func TestChannelMemberIsValid(t *testing.T) {
t.Fatal(err)
}
+ o.MarkUnreadLevel = "123456789012345678901"
+ if err := o.IsValid(); err == nil {
+ t.Fatal("should be invalid")
+ }
+
+ o.MarkUnreadLevel = CHANNEL_MARK_UNREAD_ALL
+ if err := o.IsValid(); err != nil {
+ t.Fatal(err)
+ }
+
o.Roles = ""
if err := o.IsValid(); err != nil {
t.Fatal(err)
diff --git a/model/client.go b/model/client.go
index 26e00864d..1d1c5a52c 100644
--- a/model/client.go
+++ b/model/client.go
@@ -459,6 +459,15 @@ func (c *Client) UpdateNotifyLevel(data map[string]string) (*Result, *AppError)
}
}
+func (c *Client) UpdateMarkUnreadLevel(data map[string]string) (*Result, *AppError) {
+ if r, err := c.DoApiPost("/channels/update_mark_unread_level", MapToJson(data)); err != nil {
+ return nil, err
+ } else {
+ return &Result{r.Header.Get(HEADER_REQUEST_ID),
+ r.Header.Get(HEADER_ETAG_SERVER), MapFromJson(r.Body)}, nil
+ }
+}
+
func (c *Client) GetChannels(etag string) (*Result, *AppError) {
if r, err := c.DoApiGet("/channels/", "", etag); err != nil {
return nil, err
diff --git a/store/sql_channel_store_test.go b/store/sql_channel_store_test.go
index dabe39904..b97440306 100644
--- a/store/sql_channel_store_test.go
+++ b/store/sql_channel_store_test.go
@@ -136,12 +136,14 @@ func TestChannelStoreDelete(t *testing.T) {
m1.ChannelId = o1.Id
m1.UserId = model.NewId()
m1.NotifyLevel = model.CHANNEL_NOTIFY_ALL
+ m1.MarkUnreadLevel = model.CHANNEL_MARK_UNREAD_ALL
Must(store.Channel().SaveMember(&m1))
m2 := model.ChannelMember{}
m2.ChannelId = o2.Id
m2.UserId = m1.UserId
m2.NotifyLevel = model.CHANNEL_NOTIFY_ALL
+ m2.MarkUnreadLevel = model.CHANNEL_MARK_UNREAD_ALL
Must(store.Channel().SaveMember(&m2))
if r := <-store.Channel().Delete(o1.Id, model.GetMillis()); r.Err != nil {
@@ -223,12 +225,14 @@ func TestChannelMemberStore(t *testing.T) {
o1.ChannelId = c1.Id
o1.UserId = u1.Id
o1.NotifyLevel = model.CHANNEL_NOTIFY_ALL
+ o1.MarkUnreadLevel = model.CHANNEL_MARK_UNREAD_ALL
Must(store.Channel().SaveMember(&o1))
o2 := model.ChannelMember{}
o2.ChannelId = c1.Id
o2.UserId = u2.Id
o2.NotifyLevel = model.CHANNEL_NOTIFY_ALL
+ o2.MarkUnreadLevel = model.CHANNEL_MARK_UNREAD_ALL
Must(store.Channel().SaveMember(&o2))
c1t2 := (<-store.Channel().Get(c1.Id)).Data.(*model.Channel)
@@ -292,6 +296,7 @@ func TestChannelStorePermissionsTo(t *testing.T) {
m1.ChannelId = o1.Id
m1.UserId = model.NewId()
m1.NotifyLevel = model.CHANNEL_NOTIFY_ALL
+ m1.MarkUnreadLevel = model.CHANNEL_MARK_UNREAD_ALL
Must(store.Channel().SaveMember(&m1))
count := (<-store.Channel().CheckPermissionsTo(o1.TeamId, o1.Id, m1.UserId)).Data.(int64)
@@ -372,18 +377,21 @@ func TestChannelStoreGetChannels(t *testing.T) {
m1.ChannelId = o1.Id
m1.UserId = model.NewId()
m1.NotifyLevel = model.CHANNEL_NOTIFY_ALL
+ m1.MarkUnreadLevel = model.CHANNEL_MARK_UNREAD_ALL
Must(store.Channel().SaveMember(&m1))
m2 := model.ChannelMember{}
m2.ChannelId = o1.Id
m2.UserId = model.NewId()
m2.NotifyLevel = model.CHANNEL_NOTIFY_ALL
+ m2.MarkUnreadLevel = model.CHANNEL_MARK_UNREAD_ALL
Must(store.Channel().SaveMember(&m2))
m3 := model.ChannelMember{}
m3.ChannelId = o2.Id
m3.UserId = model.NewId()
m3.NotifyLevel = model.CHANNEL_NOTIFY_ALL
+ m3.MarkUnreadLevel = model.CHANNEL_MARK_UNREAD_ALL
Must(store.Channel().SaveMember(&m3))
cresult := <-store.Channel().GetChannels(o1.TeamId, m1.UserId)
@@ -415,18 +423,21 @@ func TestChannelStoreGetMoreChannels(t *testing.T) {
m1.ChannelId = o1.Id
m1.UserId = model.NewId()
m1.NotifyLevel = model.CHANNEL_NOTIFY_ALL
+ m1.MarkUnreadLevel = model.CHANNEL_MARK_UNREAD_ALL
Must(store.Channel().SaveMember(&m1))
m2 := model.ChannelMember{}
m2.ChannelId = o1.Id
m2.UserId = model.NewId()
m2.NotifyLevel = model.CHANNEL_NOTIFY_ALL
+ m2.MarkUnreadLevel = model.CHANNEL_MARK_UNREAD_ALL
Must(store.Channel().SaveMember(&m2))
m3 := model.ChannelMember{}
m3.ChannelId = o2.Id
m3.UserId = model.NewId()
m3.NotifyLevel = model.CHANNEL_NOTIFY_ALL
+ m3.MarkUnreadLevel = model.CHANNEL_MARK_UNREAD_ALL
Must(store.Channel().SaveMember(&m3))
o3 := model.Channel{}
@@ -483,18 +494,21 @@ func TestChannelStoreGetChannelCounts(t *testing.T) {
m1.ChannelId = o1.Id
m1.UserId = model.NewId()
m1.NotifyLevel = model.CHANNEL_NOTIFY_ALL
+ m1.MarkUnreadLevel = model.CHANNEL_MARK_UNREAD_ALL
Must(store.Channel().SaveMember(&m1))
m2 := model.ChannelMember{}
m2.ChannelId = o1.Id
m2.UserId = model.NewId()
m2.NotifyLevel = model.CHANNEL_NOTIFY_ALL
+ m2.MarkUnreadLevel = model.CHANNEL_MARK_UNREAD_ALL
Must(store.Channel().SaveMember(&m2))
m3 := model.ChannelMember{}
m3.ChannelId = o2.Id
m3.UserId = model.NewId()
m3.NotifyLevel = model.CHANNEL_NOTIFY_ALL
+ m3.MarkUnreadLevel = model.CHANNEL_MARK_UNREAD_ALL
Must(store.Channel().SaveMember(&m3))
cresult := <-store.Channel().GetChannelCounts(o1.TeamId, m1.UserId)
@@ -524,6 +538,7 @@ func TestChannelStoreUpdateLastViewedAt(t *testing.T) {
m1.ChannelId = o1.Id
m1.UserId = model.NewId()
m1.NotifyLevel = model.CHANNEL_NOTIFY_ALL
+ m1.MarkUnreadLevel = model.CHANNEL_MARK_UNREAD_ALL
Must(store.Channel().SaveMember(&m1))
err := (<-store.Channel().UpdateLastViewedAt(m1.ChannelId, m1.UserId)).Err
@@ -552,6 +567,7 @@ func TestChannelStoreIncrementMentionCount(t *testing.T) {
m1.ChannelId = o1.Id
m1.UserId = model.NewId()
m1.NotifyLevel = model.CHANNEL_NOTIFY_ALL
+ m1.MarkUnreadLevel = model.CHANNEL_MARK_UNREAD_ALL
Must(store.Channel().SaveMember(&m1))
err := (<-store.Channel().IncrementMentionCount(m1.ChannelId, m1.UserId)).Err
diff --git a/store/sql_post_store_test.go b/store/sql_post_store_test.go
index 257054033..39761c51c 100644
--- a/store/sql_post_store_test.go
+++ b/store/sql_post_store_test.go
@@ -485,6 +485,7 @@ func TestPostStoreSearch(t *testing.T) {
m1.ChannelId = c1.Id
m1.UserId = userId
m1.NotifyLevel = model.CHANNEL_NOTIFY_ALL
+ m1.MarkUnreadLevel = model.CHANNEL_MARK_UNREAD_ALL
Must(store.Channel().SaveMember(&m1))
c2 := &model.Channel{}
generated by cgit v1.2.3-1-g7c22 (git 2.25.1) at 2024-06-02 06:30:52 +0000