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/client4.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/client4.go')
-rw-r--r-- | model/client4.go | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/model/client4.go b/model/client4.go index 964218a68..903687ece 100644 --- a/model/client4.go +++ b/model/client4.go @@ -401,11 +401,11 @@ func (c *Client4) GetRedirectLocationRoute() string { return fmt.Sprintf("/redirect_location") } -func (c *Client4) GetRegisterServiceTermsRoute(userId string) string { +func (c *Client4) GetRegisterTermsOfServiceRoute(userId string) string { return c.GetUserRoute(userId) + "/terms_of_service" } -func (c *Client4) GetServiceTermsRoute() string { +func (c *Client4) GetTermsOfServiceRoute() string { return "/terms_of_service" } @@ -3828,9 +3828,9 @@ func (c *Client4) GetRedirectLocation(urlParam, etag string) (string, *Response) } } -func (c *Client4) RegisterServiceTermsAction(userId, serviceTermsId string, accepted bool) (*bool, *Response) { - url := c.GetRegisterServiceTermsRoute(userId) - data := map[string]interface{}{"serviceTermsId": serviceTermsId, "accepted": accepted} +func (c *Client4) RegisteTermsOfServiceAction(userId, termsOfServiceId string, accepted bool) (*bool, *Response) { + url := c.GetRegisterTermsOfServiceRoute(userId) + data := map[string]interface{}{"termsOfServiceId": termsOfServiceId, "accepted": accepted} if r, err := c.DoApiPost(url, StringInterfaceToJson(data)); err != nil { return nil, BuildErrorResponse(r, err) @@ -3840,25 +3840,25 @@ func (c *Client4) RegisterServiceTermsAction(userId, serviceTermsId string, acce } } -func (c *Client4) GetServiceTerms(etag string) (*ServiceTerms, *Response) { - url := c.GetServiceTermsRoute() +func (c *Client4) GetTermsOfService(etag string) (*TermsOfService, *Response) { + url := c.GetTermsOfServiceRoute() if r, err := c.DoApiGet(url, etag); err != nil { return nil, BuildErrorResponse(r, err) } else { defer closeBody(r) - return ServiceTermsFromJson(r.Body), BuildResponse(r) + return TermsOfServiceFromJson(r.Body), BuildResponse(r) } } -func (c *Client4) CreateServiceTerms(text, userId string) (*ServiceTerms, *Response) { - url := c.GetServiceTermsRoute() +func (c *Client4) CreateTermsOfService(text, userId string) (*TermsOfService, *Response) { + url := c.GetTermsOfServiceRoute() data := map[string]string{"text": text} if r, err := c.DoApiPost(url, MapToJson(data)); err != nil { return nil, BuildErrorResponse(r, err) } else { defer closeBody(r) - return ServiceTermsFromJson(r.Body), BuildResponse(r) + return TermsOfServiceFromJson(r.Body), BuildResponse(r) } } |