From af275fe9242303581192258ef4f6457fa45a58e4 Mon Sep 17 00:00:00 2001 From: Harshil Sharma Date: Wed, 26 Sep 2018 20:49:22 +0000 Subject: #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 --- model/service_terms.go | 70 ++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 70 insertions(+) create mode 100644 model/service_terms.go (limited to 'model/service_terms.go') diff --git a/model/service_terms.go b/model/service_terms.go new file mode 100644 index 000000000..64ecabf31 --- /dev/null +++ b/model/service_terms.go @@ -0,0 +1,70 @@ +// 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.term.is_valid.%s.app_error", fieldName) + details := "" + if serviceTermsId != "" { + details = "service_terms_id=" + serviceTermsId + } + return NewAppError("ServiceTerms.IsValid", id, nil, details, http.StatusBadRequest) +} + +func (t *ServiceTerms) PreSave() { + if t.Id == "" { + t.Id = NewId() + } + + t.CreateAt = GetMillis() +} -- cgit v1.2.3-1-g7c22