Refactor term_of_service_store to use squirrel (#16923)
* refactor: replace select statement with squirell * fix: fixed sqlquery for GetLatest * fix: gofmt * fix: replaced old AppError with errors.Wrap Co-authored-by: Mattermod <mattermod@users.noreply.github.com>
Этот коммит содержится в:
@@ -55,8 +55,18 @@ func (s SqlTermsOfServiceStore) Save(termsOfService *model.TermsOfService) (*mod
|
|||||||
func (s SqlTermsOfServiceStore) GetLatest(allowFromCache bool) (*model.TermsOfService, error) {
|
func (s SqlTermsOfServiceStore) GetLatest(allowFromCache bool) (*model.TermsOfService, error) {
|
||||||
var termsOfService *model.TermsOfService
|
var termsOfService *model.TermsOfService
|
||||||
|
|
||||||
err := s.GetReplica().SelectOne(&termsOfService, "SELECT * FROM TermsOfService ORDER BY CreateAt DESC LIMIT 1")
|
query := s.getQueryBuilder().
|
||||||
|
Select("*").
|
||||||
|
From("TermsOfService").
|
||||||
|
OrderBy("CreateAt DESC").
|
||||||
|
Limit(uint64(1))
|
||||||
|
|
||||||
|
queryString, args, err := query.ToSql()
|
||||||
if err != nil {
|
if err != nil {
|
||||||
|
return nil, errors.Wrap(err, "could not build sql query to get latest TOS")
|
||||||
|
}
|
||||||
|
|
||||||
|
if err := s.GetReplica().SelectOne(&termsOfService, queryString, args...); err != nil {
|
||||||
if err == sql.ErrNoRows {
|
if err == sql.ErrNoRows {
|
||||||
return nil, store.NewErrNotFound("TermsOfService", "CreateAt=latest")
|
return nil, store.NewErrNotFound("TermsOfService", "CreateAt=latest")
|
||||||
}
|
}
|
||||||
|
|||||||
Ссылка в новой задаче
Block a user