Member show on Activate and Hide on deactivate from channel member list and at_mention

1 files changed, 64 insertions, 0 deletions

diff --git a/store/sql_channel_store_test.go b/store/sql_channel_store_test.go
index 816a85aef..2213aa795 100644
--- a/store/sql_channel_store_test.go
+++ b/store/sql_channel_store_test.go
@@ -868,3 +868,67 @@ func TestGetMemberCount(t *testing.T) {
 		t.Fatal("got incorrect member count %v", result.Data)
 	}
 }
+
+func TestUpdateExtrasByUser(t *testing.T) {
+	Setup()
+
+	teamId := model.NewId()
+
+	c1 := model.Channel{
+		TeamId:      teamId,
+		DisplayName: "Channel1",
+		Name:        "a" + model.NewId() + "b",
+		Type:        model.CHANNEL_OPEN,
+	}
+	Must(store.Channel().Save(&c1))
+
+	c2 := model.Channel{
+		TeamId:      teamId,
+		DisplayName: "Channel2",
+		Name:        "a" + model.NewId() + "b",
+		Type:        model.CHANNEL_OPEN,
+	}
+	Must(store.Channel().Save(&c2))
+
+	t.Logf("c1.Id = %v", c1.Id)
+
+	u1 := model.User{
+		TeamId:   teamId,
+		Email:    model.NewId(),
+		DeleteAt: 0,
+	}
+	Must(store.User().Save(&u1))
+
+	m1 := model.ChannelMember{
+		ChannelId:   c1.Id,
+		UserId:      u1.Id,
+		NotifyProps: model.GetDefaultChannelNotifyProps(),
+	}
+	Must(store.Channel().SaveMember(&m1))
+
+	u1.DeleteAt = model.GetMillis()
+	Must(store.User().Update(&u1, true))
+
+	if result := <-store.Channel().ExtraUpdateByUser(u1.Id, u1.DeleteAt); result.Err != nil {
+		t.Fatal("failed to update extras by user: %v", result.Err)
+	}
+
+	if result := <-store.Channel().GetExtraMembers(c1.Id, -1); result.Err != nil {
+		t.Fatal("failed to get extras: %v", result.Err)
+	} else if len(result.Data.([]model.ExtraMember)) != 0 {
+		t.Fatal("got incorrect member count %v", len(result.Data.([]model.ExtraMember)))
+	}
+
+	u1.DeleteAt = 0
+	Must(store.User().Update(&u1, true))
+
+	if result := <-store.Channel().ExtraUpdateByUser(u1.Id, u1.DeleteAt); result.Err != nil {
+		t.Fatal("failed to update extras by user: %v", result.Err)
+	}
+
+	if result := <-store.Channel().GetExtraMembers(c1.Id, -1); result.Err != nil {
+		t.Fatal("failed to get extras: %v", result.Err)
+	} else if len(result.Data.([]model.ExtraMember)) != 1 {
+		t.Fatal("got incorrect member count %v", len(result.Data.([]model.ExtraMember)))
+	}
+}