Refactored to rename "service terms" to "terms of service" (#9581)

* #124 renamed identififers from service terms to terms of service

* #124 renamed identififers from service terms to terms of service

* 124 renamed ServiceTerms model to TermsOfService

* 124 Renamed EnableCustomServiceTerms feature flag to EnableCustomTermsOfService

* 124 Renamed EnableCustomServiceTerms feature flag to EnableCustomTermsOfService

* #124 fixed formatting

* #124 fixed formatting

* #132 renamed table ServiceTerms to TermsOfService

* #124 renamed some missed files from 'service_terms' to 'terms_of_service'

* #124 removed fixed TODOs

* drop migrate of ServiceTerms table, since backporting

* s/ServiceTerms/TermsOfService/ in tests

* s/AcceptedServiceTermsId/AcceptedTermsOfServiceId/

Change the model attribute, even though the column name will eventually be removed.

* s/accepted_service_terms_id/accepted_terms_of_service_id/ to match redux

* s/serviceTerms/termsOfService

* rename column too, and add max size constraint

* s/EnableCustomServiceTerms/EnableCustomTermsOfService

7 files changed, 141 insertions, 141 deletions

diff --git a/store/storetest/mocks/LayeredStoreDatabaseLayer.go b/store/storetest/mocks/LayeredStoreDatabaseLayer.go
index 7f653fc2f..3b06bbdf5 100644
--- a/store/storetest/mocks/LayeredStoreDatabaseLayer.go
+++ b/store/storetest/mocks/LayeredStoreDatabaseLayer.go
@@ -729,22 +729,6 @@ 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()
@@ -814,6 +798,22 @@ func (_m *LayeredStoreDatabaseLayer) Team() store.TeamStore {
 	return r0
 }
 
+// TermsOfService provides a mock function with given fields:
+func (_m *LayeredStoreDatabaseLayer) TermsOfService() store.TermsOfServiceStore {
+	ret := _m.Called()
+
+	var r0 store.TermsOfServiceStore
+	if rf, ok := ret.Get(0).(func() store.TermsOfServiceStore); ok {
+		r0 = rf()
+	} else {
+		if ret.Get(0) != nil {
+			r0 = ret.Get(0).(store.TermsOfServiceStore)
+		}
+	}
+
+	return r0
+}
+
 // Token provides a mock function with given fields:
 func (_m *LayeredStoreDatabaseLayer) Token() store.TokenStore {
 	ret := _m.Called()
diff --git a/store/storetest/mocks/SqlStore.go b/store/storetest/mocks/SqlStore.go
index c2852f3a1..278ca1a61 100644
--- a/store/storetest/mocks/SqlStore.go
+++ b/store/storetest/mocks/SqlStore.go
@@ -603,22 +603,6 @@ 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()
@@ -683,6 +667,22 @@ func (_m *SqlStore) Team() store.TeamStore {
 	return r0
 }
 
+// TermsOfService provides a mock function with given fields:
+func (_m *SqlStore) TermsOfService() store.TermsOfServiceStore {
+	ret := _m.Called()
+
+	var r0 store.TermsOfServiceStore
+	if rf, ok := ret.Get(0).(func() store.TermsOfServiceStore); ok {
+		r0 = rf()
+	} else {
+		if ret.Get(0) != nil {
+			r0 = ret.Get(0).(store.TermsOfServiceStore)
+		}
+	}
+
+	return r0
+}
+
 // Token provides a mock function with given fields:
 func (_m *SqlStore) Token() store.TokenStore {
 	ret := _m.Called()
diff --git a/store/storetest/mocks/Store.go b/store/storetest/mocks/Store.go
index 8f15650e8..b55df2097 100644
--- a/store/storetest/mocks/Store.go
+++ b/store/storetest/mocks/Store.go
@@ -320,22 +320,6 @@ 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()
@@ -400,6 +384,22 @@ func (_m *Store) Team() store.TeamStore {
 	return r0
 }
 
+// TermsOfService provides a mock function with given fields:
+func (_m *Store) TermsOfService() store.TermsOfServiceStore {
+	ret := _m.Called()
+
+	var r0 store.TermsOfServiceStore
+	if rf, ok := ret.Get(0).(func() store.TermsOfServiceStore); ok {
+		r0 = rf()
+	} else {
+		if ret.Get(0) != nil {
+			r0 = ret.Get(0).(store.TermsOfServiceStore)
+		}
+	}
+
+	return r0
+}
+
 // Token provides a mock function with given fields:
 func (_m *Store) Token() store.TokenStore {
 	ret := _m.Called()
diff --git a/store/storetest/mocks/ServiceTermsStore.go b/store/storetest/mocks/TermsOfServiceStore.go
index 9115e6093..54dcee1fc 100644
--- a/store/storetest/mocks/ServiceTermsStore.go
+++ b/store/storetest/mocks/TermsOfServiceStore.go
@@ -8,13 +8,13 @@ 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 {
+// TermsOfServiceStore is an autogenerated mock type for the TermsOfServiceStore type
+type TermsOfServiceStore struct {
 	mock.Mock
 }
 
 // Get provides a mock function with given fields: id, allowFromCache
-func (_m *ServiceTermsStore) Get(id string, allowFromCache bool) store.StoreChannel {
+func (_m *TermsOfServiceStore) Get(id string, allowFromCache bool) store.StoreChannel {
 	ret := _m.Called(id, allowFromCache)
 
 	var r0 store.StoreChannel
@@ -30,7 +30,7 @@ func (_m *ServiceTermsStore) Get(id string, allowFromCache bool) store.StoreChan
 }
 
 // GetLatest provides a mock function with given fields: allowFromCache
-func (_m *ServiceTermsStore) GetLatest(allowFromCache bool) store.StoreChannel {
+func (_m *TermsOfServiceStore) GetLatest(allowFromCache bool) store.StoreChannel {
 	ret := _m.Called(allowFromCache)
 
 	var r0 store.StoreChannel
@@ -45,13 +45,13 @@ func (_m *ServiceTermsStore) GetLatest(allowFromCache bool) 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)
+// Save provides a mock function with given fields: termsOfService
+func (_m *TermsOfServiceStore) Save(termsOfService *model.TermsOfService) store.StoreChannel {
+	ret := _m.Called(termsOfService)
 
 	var r0 store.StoreChannel
-	if rf, ok := ret.Get(0).(func(*model.ServiceTerms) store.StoreChannel); ok {
-		r0 = rf(serviceTerms)
+	if rf, ok := ret.Get(0).(func(*model.TermsOfService) store.StoreChannel); ok {
+		r0 = rf(termsOfService)
 	} else {
 		if ret.Get(0) != nil {
 			r0 = ret.Get(0).(store.StoreChannel)
diff --git a/store/storetest/service_terms_store.go b/store/storetest/service_terms_store.go
deleted file mode 100644
index fcb209934..000000000
--- a/store/storetest/service_terms_store.go
+++ /dev/null
@@ -1,82 +0,0 @@
-// 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 e7086a3a5..d6ef4fcd0 100644
--- a/store/storetest/store.go
+++ b/store/storetest/store.go
@@ -45,7 +45,7 @@ type Store struct {
 	ChannelMemberHistoryStore mocks.ChannelMemberHistoryStore
 	RoleStore                 mocks.RoleStore
 	SchemeStore               mocks.SchemeStore
-	ServiceTermsStore         mocks.ServiceTermsStore
+	TermsOfServiceStore       mocks.TermsOfServiceStore
 }
 
 func (s *Store) Team() store.TeamStore                         { return &s.TeamStore }
@@ -73,7 +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) TermsOfService() store.TermsOfServiceStore     { return &s.TermsOfServiceStore }
 func (s *Store) ChannelMemberHistory() store.ChannelMemberHistoryStore {
 	return &s.ChannelMemberHistoryStore
 }
diff --git a/store/storetest/terms_of_service_store.go b/store/storetest/terms_of_service_store.go
new file mode 100644
index 000000000..90af5c1ee
--- /dev/null
+++ b/store/storetest/terms_of_service_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 TestTermsOfServiceStore(t *testing.T, ss store.Store) {
+	t.Run("TestSaveTermsOfService", func(t *testing.T) { testSaveTermsOfService(t, ss) })
+	t.Run("TestGetLatestTermsOfService", func(t *testing.T) { testGetLatestTermsOfService(t, ss) })
+	t.Run("TestGetTermsOfService", func(t *testing.T) { testGetTermsOfService(t, ss) })
+}
+
+func testSaveTermsOfService(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))
+
+	termsOfService := &model.TermsOfService{Text: "terms of service", UserId: u1.Id}
+	r1 := <-ss.TermsOfService().Save(termsOfService)
+
+	if r1.Err != nil {
+		t.Fatal(r1.Err)
+	}
+
+	savedTermsOfService := r1.Data.(*model.TermsOfService)
+	if len(savedTermsOfService.Id) != 26 {
+		t.Fatal("Id should have been populated")
+	}
+
+	if savedTermsOfService.CreateAt == 0 {
+		t.Fatal("Create at should have been populated")
+	}
+}
+
+func testGetLatestTermsOfService(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))
+
+	termsOfService := &model.TermsOfService{Text: "terms of service", UserId: u1.Id}
+	store.Must(ss.TermsOfService().Save(termsOfService))
+
+	r1 := <-ss.TermsOfService().GetLatest(true)
+	if r1.Err != nil {
+		t.Fatal(r1.Err)
+	}
+
+	fetchedTermsOfService := r1.Data.(*model.TermsOfService)
+	assert.Equal(t, termsOfService.Text, fetchedTermsOfService.Text)
+	assert.Equal(t, termsOfService.UserId, fetchedTermsOfService.UserId)
+}
+
+func testGetTermsOfService(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))
+
+	termsOfService := &model.TermsOfService{Text: "terms of service", UserId: u1.Id}
+	store.Must(ss.TermsOfService().Save(termsOfService))
+
+	r1 := <-ss.TermsOfService().Get("an_invalid_id", true)
+	assert.NotNil(t, r1.Err)
+	assert.Nil(t, r1.Data)
+
+	r1 = <-ss.TermsOfService().Get(termsOfService.Id, true)
+	assert.Nil(t, r1.Err)
+
+	receivedTermsOfService := r1.Data.(*model.TermsOfService)
+	assert.Equal(t, "terms of service", receivedTermsOfService.Text)
+}