From 69076934ecebaaa9ec73651a68b15fbb535915af Mon Sep 17 00:00:00 2001 From: Christopher Speller Date: Fri, 7 Jun 2019 08:09:34 -0700 Subject: [PATCH] Adding bot description field to bot users. (#11066) --- model/user.go | 1 + store/sqlstore/user_store.go | 2 +- store/storetest/user_store.go | 9 ++++++--- 3 files changed, 8 insertions(+), 4 deletions(-) diff --git a/model/user.go b/model/user.go index 5a2829aace..09cf369713 100644 --- a/model/user.go +++ b/model/user.go @@ -83,6 +83,7 @@ type User struct { MfaSecret string `json:"mfa_secret,omitempty"` LastActivityAt int64 `db:"-" json:"last_activity_at,omitempty"` IsBot bool `db:"-" json:"is_bot,omitempty"` + BotDescription string `db:"-" json:"bot_description,omitempty"` TermsOfServiceId string `db:"-" json:"terms_of_service_id,omitempty"` TermsOfServiceCreateAt int64 `db:"-" json:"terms_of_service_create_at,omitempty"` } diff --git a/store/sqlstore/user_store.go b/store/sqlstore/user_store.go index b8b55a25a7..d36525237c 100644 --- a/store/sqlstore/user_store.go +++ b/store/sqlstore/user_store.go @@ -69,7 +69,7 @@ func NewSqlUserStore(sqlStore SqlStore, metrics einterfaces.MetricsInterface) st } us.usersQuery = us.getQueryBuilder(). - Select("u.*", "b.UserId IS NOT NULL AS IsBot"). + Select("u.*", "b.UserId IS NOT NULL AS IsBot", "COALESCE(b.Description, '') AS BotDescription"). From("Users u"). LeftJoin("Bots b ON ( b.UserId = u.Id )") diff --git a/store/storetest/user_store.go b/store/storetest/user_store.go index ecd90fc03e..d8751fbc7e 100644 --- a/store/storetest/user_store.go +++ b/store/storetest/user_store.go @@ -258,11 +258,13 @@ func testUserStoreGet(t *testing.T, ss store.Store) { Username: model.NewId(), })).(*model.User) store.Must(ss.Bot().Save(&model.Bot{ - UserId: u2.Id, - Username: u2.Username, - OwnerId: u1.Id, + UserId: u2.Id, + Username: u2.Username, + Description: "bot description", + OwnerId: u1.Id, })) u2.IsBot = true + u2.BotDescription = "bot description" defer func() { store.Must(ss.Bot().PermanentDelete(u2.Id)) }() defer func() { require.Nil(t, ss.User().PermanentDelete(u2.Id)) }() @@ -285,6 +287,7 @@ func testUserStoreGet(t *testing.T, ss store.Store) { require.Nil(t, err) require.Equal(t, u2, actual) require.True(t, actual.IsBot) + require.Equal(t, "bot description", actual.BotDescription) }) }