diff options
| author | Harshil Sharma <harshil.sharma@joshtechnologygroup.com> | 2018-10-10 00:55:47 +0000 |
|---|---|---|
| committer | Jesse Hallam <jesse.hallam@gmail.com> | 2018-10-09 20:55:47 -0400 |
| commit | bffcccf99de8a8f3c68cff9e39d2847f0996b67b (patch) | |
| tree | 10bf45d87927dc792a233d0653d6ba273c9a7b28 /store/sqlstore/supplier.go | |
| parent | 59319b7915b8eb4c20a0d4878382cc0e41fc536d (diff) | |
| download | chat-bffcccf99de8a8f3c68cff9e39d2847f0996b67b.tar.gz chat-bffcccf99de8a8f3c68cff9e39d2847f0996b67b.tar.bz2 chat-bffcccf99de8a8f3c68cff9e39d2847f0996b67b.zip | |
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
Diffstat (limited to 'store/sqlstore/supplier.go')
| -rw-r--r-- | store/sqlstore/supplier.go | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/store/sqlstore/supplier.go b/store/sqlstore/supplier.go index 62c1102ca..2fc299dc9 100644 --- a/store/sqlstore/supplier.go +++ b/store/sqlstore/supplier.go @@ -92,7 +92,7 @@ type SqlSupplierOldStores struct { channelMemberHistory store.ChannelMemberHistoryStore role store.RoleStore scheme store.SchemeStore - serviceTerms store.ServiceTermsStore + TermsOfService store.TermsOfServiceStore } type SqlSupplier struct { @@ -146,7 +146,7 @@ func NewSqlSupplier(settings model.SqlSettings, metrics einterfaces.MetricsInter supplier.oldStores.userAccessToken = NewSqlUserAccessTokenStore(supplier) supplier.oldStores.channelMemberHistory = NewSqlChannelMemberHistoryStore(supplier) supplier.oldStores.plugin = NewSqlPluginStore(supplier) - supplier.oldStores.serviceTerms = NewSqlTermStore(supplier, metrics) + supplier.oldStores.TermsOfService = NewSqlTermsOfServiceStore(supplier, metrics) initSqlSupplierReactions(supplier) initSqlSupplierRoles(supplier) @@ -182,7 +182,7 @@ func NewSqlSupplier(settings model.SqlSettings, metrics einterfaces.MetricsInter supplier.oldStores.job.(*SqlJobStore).CreateIndexesIfNotExists() supplier.oldStores.userAccessToken.(*SqlUserAccessTokenStore).CreateIndexesIfNotExists() supplier.oldStores.plugin.(*SqlPluginStore).CreateIndexesIfNotExists() - supplier.oldStores.serviceTerms.(SqlServiceTermsStore).CreateIndexesIfNotExists() + supplier.oldStores.TermsOfService.(SqlTermsOfServiceStore).CreateIndexesIfNotExists() supplier.oldStores.preference.(*SqlPreferenceStore).DeleteUnusedFeatures() @@ -964,8 +964,8 @@ func (ss *SqlSupplier) Role() store.RoleStore { return ss.oldStores.role } -func (ss *SqlSupplier) ServiceTerms() store.ServiceTermsStore { - return ss.oldStores.serviceTerms +func (ss *SqlSupplier) TermsOfService() store.TermsOfServiceStore { + return ss.oldStores.TermsOfService } func (ss *SqlSupplier) Scheme() store.SchemeStore { |