#MM-12130 changes for custom service terms (#9450)

* #MM-12130 changes for custom service terms

* Fixed styling

* Added getServiceTerms API

* removed unnecessary panic

* removed custom service terms text from flat config

* reverted user sql store as those changes are no longer needed

* added tests

* Updated a config key to be more standard

* Added copyright info

* Loading service terms only if the feature is enabled

* Loading service terms only if the feature is enabled

* removed unused index

* added createservice termns API

* made a param to bool instead of string

* added createservice termns API

* review fixes

* fixed styling

* Minor refactoring

* removed saveConfig and loadConfig magic

* added empty service terms text check to createServiceTerms API

* refactoed some urls to be terms_of_service instead of service_terms

* removed check for support settings

* changed URLs in tests

* removed unused code

* fixed a bug

* added service termd id in conif

* fixed a test

* review fixes

* minor fixes

* Fixed TestCreateServiceTerms

7 files changed, 195 insertions, 0 deletions

diff --git a/store/storetest/mocks/LayeredStoreDatabaseLayer.go b/store/storetest/mocks/LayeredStoreDatabaseLayer.go
index 8e82e9494..7f653fc2f 100644
--- a/store/storetest/mocks/LayeredStoreDatabaseLayer.go
+++ b/store/storetest/mocks/LayeredStoreDatabaseLayer.go
@@ -729,6 +729,22 @@ func (_m *LayeredStoreDatabaseLayer) SchemeSave(ctx context.Context, scheme *mod
 	return r0
 }
 
+// ServiceTerms provides a mock function with given fields:
+func (_m *LayeredStoreDatabaseLayer) ServiceTerms() store.ServiceTermsStore {
+	ret := _m.Called()
+
+	var r0 store.ServiceTermsStore
+	if rf, ok := ret.Get(0).(func() store.ServiceTermsStore); ok {
+		r0 = rf()
+	} else {
+		if ret.Get(0) != nil {
+			r0 = ret.Get(0).(store.ServiceTermsStore)
+		}
+	}
+
+	return r0
+}
+
 // Session provides a mock function with given fields:
 func (_m *LayeredStoreDatabaseLayer) Session() store.SessionStore {
 	ret := _m.Called()
diff --git a/store/storetest/mocks/ServiceTermsStore.go b/store/storetest/mocks/ServiceTermsStore.go
new file mode 100644
index 000000000..9115e6093
--- /dev/null
+++ b/store/storetest/mocks/ServiceTermsStore.go
@@ -0,0 +1,62 @@
+// Code generated by mockery v1.0.0. DO NOT EDIT.
+
+// Regenerate this file using `make store-mocks`.
+
+package mocks
+
+import mock "github.com/stretchr/testify/mock"
+import model "github.com/mattermost/mattermost-server/model"
+import store "github.com/mattermost/mattermost-server/store"
+
+// ServiceTermsStore is an autogenerated mock type for the ServiceTermsStore type
+type ServiceTermsStore struct {
+	mock.Mock
+}
+
+// Get provides a mock function with given fields: id, allowFromCache
+func (_m *ServiceTermsStore) Get(id string, allowFromCache bool) store.StoreChannel {
+	ret := _m.Called(id, allowFromCache)
+
+	var r0 store.StoreChannel
+	if rf, ok := ret.Get(0).(func(string, bool) store.StoreChannel); ok {
+		r0 = rf(id, allowFromCache)
+	} else {
+		if ret.Get(0) != nil {
+			r0 = ret.Get(0).(store.StoreChannel)
+		}
+	}
+
+	return r0
+}
+
+// GetLatest provides a mock function with given fields: allowFromCache
+func (_m *ServiceTermsStore) GetLatest(allowFromCache bool) store.StoreChannel {
+	ret := _m.Called(allowFromCache)
+
+	var r0 store.StoreChannel
+	if rf, ok := ret.Get(0).(func(bool) store.StoreChannel); ok {
+		r0 = rf(allowFromCache)
+	} else {
+		if ret.Get(0) != nil {
+			r0 = ret.Get(0).(store.StoreChannel)
+		}
+	}
+
+	return r0
+}
+
+// Save provides a mock function with given fields: serviceTerms
+func (_m *ServiceTermsStore) Save(serviceTerms *model.ServiceTerms) store.StoreChannel {
+	ret := _m.Called(serviceTerms)
+
+	var r0 store.StoreChannel
+	if rf, ok := ret.Get(0).(func(*model.ServiceTerms) store.StoreChannel); ok {
+		r0 = rf(serviceTerms)
+	} else {
+		if ret.Get(0) != nil {
+			r0 = ret.Get(0).(store.StoreChannel)
+		}
+	}
+
+	return r0
+}
diff --git a/store/storetest/mocks/SqlStore.go b/store/storetest/mocks/SqlStore.go
index 38cdc0a1b..c2852f3a1 100644
--- a/store/storetest/mocks/SqlStore.go
+++ b/store/storetest/mocks/SqlStore.go
@@ -603,6 +603,22 @@ func (_m *SqlStore) Scheme() store.SchemeStore {
 	return r0
 }
 
+// ServiceTerms provides a mock function with given fields:
+func (_m *SqlStore) ServiceTerms() store.ServiceTermsStore {
+	ret := _m.Called()
+
+	var r0 store.ServiceTermsStore
+	if rf, ok := ret.Get(0).(func() store.ServiceTermsStore); ok {
+		r0 = rf()
+	} else {
+		if ret.Get(0) != nil {
+			r0 = ret.Get(0).(store.ServiceTermsStore)
+		}
+	}
+
+	return r0
+}
+
 // Session provides a mock function with given fields:
 func (_m *SqlStore) Session() store.SessionStore {
 	ret := _m.Called()
diff --git a/store/storetest/mocks/Store.go b/store/storetest/mocks/Store.go
index e5d0c4290..8f15650e8 100644
--- a/store/storetest/mocks/Store.go
+++ b/store/storetest/mocks/Store.go
@@ -320,6 +320,22 @@ func (_m *Store) Scheme() store.SchemeStore {
 	return r0
 }
 
+// ServiceTerms provides a mock function with given fields:
+func (_m *Store) ServiceTerms() store.ServiceTermsStore {
+	ret := _m.Called()
+
+	var r0 store.ServiceTermsStore
+	if rf, ok := ret.Get(0).(func() store.ServiceTermsStore); ok {
+		r0 = rf()
+	} else {
+		if ret.Get(0) != nil {
+			r0 = ret.Get(0).(store.ServiceTermsStore)
+		}
+	}
+
+	return r0
+}
+
 // Session provides a mock function with given fields:
 func (_m *Store) Session() store.SessionStore {
 	ret := _m.Called()
diff --git a/store/storetest/service_terms_store.go b/store/storetest/service_terms_store.go
new file mode 100644
index 000000000..fcb209934
--- /dev/null
+++ b/store/storetest/service_terms_store.go
@@ -0,0 +1,82 @@
+// Copyright (c) 2017-present Mattermost, Inc. All Rights Reserved.
+// See License.txt for license information.
+
+package storetest
+
+import (
+	"github.com/mattermost/mattermost-server/model"
+	"github.com/mattermost/mattermost-server/store"
+	"github.com/stretchr/testify/assert"
+	"testing"
+)
+
+func TestServiceTermsStore(t *testing.T, ss store.Store) {
+	t.Run("TestSaveServiceTerms", func(t *testing.T) { testSaveServiceTerms(t, ss) })
+	t.Run("TestGetLatestServiceTerms", func(t *testing.T) { testGetLatestServiceTerms(t, ss) })
+	t.Run("TestGetServiceTerms", func(t *testing.T) { testGetServiceTerms(t, ss) })
+}
+
+func testSaveServiceTerms(t *testing.T, ss store.Store) {
+	u1 := model.User{}
+	u1.Username = model.NewId()
+	u1.Email = MakeEmail()
+	u1.Nickname = model.NewId()
+	store.Must(ss.User().Save(&u1))
+
+	serviceTerms := &model.ServiceTerms{Text: "service terms", UserId: u1.Id}
+	r1 := <-ss.ServiceTerms().Save(serviceTerms)
+
+	if r1.Err != nil {
+		t.Fatal(r1.Err)
+	}
+
+	savedServiceTerms := r1.Data.(*model.ServiceTerms)
+	if len(savedServiceTerms.Id) != 26 {
+		t.Fatal("Id should have been populated")
+	}
+
+	if savedServiceTerms.CreateAt == 0 {
+		t.Fatal("Create at should have been populated")
+	}
+}
+
+func testGetLatestServiceTerms(t *testing.T, ss store.Store) {
+	u1 := model.User{}
+	u1.Username = model.NewId()
+	u1.Email = MakeEmail()
+	u1.Nickname = model.NewId()
+	store.Must(ss.User().Save(&u1))
+
+	serviceTerms := &model.ServiceTerms{Text: "service terms", UserId: u1.Id}
+	store.Must(ss.ServiceTerms().Save(serviceTerms))
+
+	r1 := <-ss.ServiceTerms().GetLatest(true)
+	if r1.Err != nil {
+		t.Fatal(r1.Err)
+	}
+
+	fetchedServiceTerms := r1.Data.(*model.ServiceTerms)
+	assert.Equal(t, serviceTerms.Text, fetchedServiceTerms.Text)
+	assert.Equal(t, serviceTerms.UserId, fetchedServiceTerms.UserId)
+}
+
+func testGetServiceTerms(t *testing.T, ss store.Store) {
+	u1 := model.User{}
+	u1.Username = model.NewId()
+	u1.Email = MakeEmail()
+	u1.Nickname = model.NewId()
+	store.Must(ss.User().Save(&u1))
+
+	serviceTerms := &model.ServiceTerms{Text: "service terms", UserId: u1.Id}
+	store.Must(ss.ServiceTerms().Save(serviceTerms))
+
+	r1 := <-ss.ServiceTerms().Get("an_invalid_id", true)
+	assert.NotNil(t, r1.Err)
+	assert.Nil(t, r1.Data)
+
+	r1 = <-ss.ServiceTerms().Get(serviceTerms.Id, true)
+	assert.Nil(t, r1.Err)
+
+	receivedServiceTerms := r1.Data.(*model.ServiceTerms)
+	assert.Equal(t, "service terms", receivedServiceTerms.Text)
+}
diff --git a/store/storetest/store.go b/store/storetest/store.go
index e73596ec4..e7086a3a5 100644
--- a/store/storetest/store.go
+++ b/store/storetest/store.go
@@ -45,6 +45,7 @@ type Store struct {
 	ChannelMemberHistoryStore mocks.ChannelMemberHistoryStore
 	RoleStore                 mocks.RoleStore
 	SchemeStore               mocks.SchemeStore
+	ServiceTermsStore         mocks.ServiceTermsStore
 }
 
 func (s *Store) Team() store.TeamStore                         { return &s.TeamStore }
@@ -72,6 +73,7 @@ func (s *Store) UserAccessToken() store.UserAccessTokenStore   { return &s.UserA
 func (s *Store) Plugin() store.PluginStore                     { return &s.PluginStore }
 func (s *Store) Role() store.RoleStore                         { return &s.RoleStore }
 func (s *Store) Scheme() store.SchemeStore                     { return &s.SchemeStore }
+func (s *Store) ServiceTerms() store.ServiceTermsStore         { return &s.ServiceTermsStore }
 func (s *Store) ChannelMemberHistory() store.ChannelMemberHistoryStore {
 	return &s.ChannelMemberHistoryStore
 }
diff --git a/store/storetest/user_store.go b/store/storetest/user_store.go
index f3cc59946..533e376b2 100644
--- a/store/storetest/user_store.go
+++ b/store/storetest/user_store.go
@@ -2181,6 +2181,7 @@ func testUserStoreGetAllAfter(t *testing.T, ss store.Store) {
 
 	found := false
 	for _, u := range d1 {
+
 		if u.Id == u1.Id {
 			found = true
 			assert.Equal(t, u1.Id, u.Id)