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 /model/service_terms.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 'model/service_terms.go')
-rw-r--r-- | model/service_terms.go | 70 |
1 files changed, 0 insertions, 70 deletions
diff --git a/model/service_terms.go b/model/service_terms.go deleted file mode 100644 index 84ee0d395..000000000 --- a/model/service_terms.go +++ /dev/null @@ -1,70 +0,0 @@ -// Copyright (c) 2015-present Mattermost, Inc. All Rights Reserved. -// See License.txt for license information. - -package model - -import ( - "encoding/json" - "fmt" - "io" - "net/http" - "unicode/utf8" -) - -// we only ever need the latest version of service terms -const SERVICE_TERMS_CACHE_SIZE = 1 - -type ServiceTerms struct { - Id string `json:"id"` - CreateAt int64 `json:"create_at"` - UserId string `json:"user_id"` - Text string `json:"text"` -} - -func (t *ServiceTerms) IsValid() *AppError { - if len(t.Id) != 26 { - return InvalidServiceTermsError("id", "") - } - - if t.CreateAt == 0 { - return InvalidServiceTermsError("create_at", t.Id) - } - - if len(t.UserId) != 26 { - return InvalidServiceTermsError("user_id", t.Id) - } - - if utf8.RuneCountInString(t.Text) > POST_MESSAGE_MAX_RUNES_V2 { - return InvalidServiceTermsError("text", t.Id) - } - - return nil -} - -func (t *ServiceTerms) ToJson() string { - b, _ := json.Marshal(t) - return string(b) -} - -func ServiceTermsFromJson(data io.Reader) *ServiceTerms { - var serviceTerms *ServiceTerms - json.NewDecoder(data).Decode(&serviceTerms) - return serviceTerms -} - -func InvalidServiceTermsError(fieldName string, serviceTermsId string) *AppError { - id := fmt.Sprintf("model.service_terms.is_valid.%s.app_error", fieldName) - details := "" - if serviceTermsId != "" { - details = "service_terms_id=" + serviceTermsId - } - return NewAppError("ServiceTerms.IsValid", id, map[string]interface{}{"MaxLength": POST_MESSAGE_MAX_RUNES_V2}, details, http.StatusBadRequest) -} - -func (t *ServiceTerms) PreSave() { - if t.Id == "" { - t.Id = NewId() - } - - t.CreateAt = GetMillis() -} |