[MM-24663] Refactor link metadata store to use squirrel (#14464)
* Refactor link_metadata_store to use squirrel * Fix sql buil error string * Fix := on second err * Merging code to a single Where call * Saving a line. Co-authored-by: Ibrahim Serdar Acikgoz <serdaracikgoz86@gmail.com> Co-authored-by: mattermod <mattermod@users.noreply.github.com> Co-authored-by: Dante Pippi <dantepippi@gmai.com> Co-authored-by: dantepippi <dantepippi@users.noreply.github.com> Co-authored-by: Ibrahim Serdar Acikgoz <serdaracikgoz86@gmail.com>
Этот коммит содержится в:
@@ -7,6 +7,8 @@ import (
|
|||||||
"database/sql"
|
"database/sql"
|
||||||
"net/http"
|
"net/http"
|
||||||
|
|
||||||
|
sq "github.com/Masterminds/squirrel"
|
||||||
|
|
||||||
"github.com/mattermost/mattermost-server/v5/model"
|
"github.com/mattermost/mattermost-server/v5/model"
|
||||||
"github.com/mattermost/mattermost-server/v5/store"
|
"github.com/mattermost/mattermost-server/v5/store"
|
||||||
)
|
)
|
||||||
@@ -53,15 +55,15 @@ func (s SqlLinkMetadataStore) Save(metadata *model.LinkMetadata) (*model.LinkMet
|
|||||||
|
|
||||||
func (s SqlLinkMetadataStore) Get(url string, timestamp int64) (*model.LinkMetadata, *model.AppError) {
|
func (s SqlLinkMetadataStore) Get(url string, timestamp int64) (*model.LinkMetadata, *model.AppError) {
|
||||||
var metadata *model.LinkMetadata
|
var metadata *model.LinkMetadata
|
||||||
|
query, args, err := s.getQueryBuilder().
|
||||||
err := s.GetReplica().SelectOne(&metadata,
|
Select("*").
|
||||||
`SELECT
|
From("LinkMetadata").
|
||||||
*
|
Where(sq.Eq{"URL": url, "Timestamp": timestamp}).
|
||||||
FROM
|
ToSql()
|
||||||
LinkMetadata
|
if err != nil {
|
||||||
WHERE
|
return nil, model.NewAppError("SqlLinkMetadataStore.Get", "store.sql.build_query.app_error", nil, err.Error(), http.StatusInternalServerError)
|
||||||
URL = :URL
|
}
|
||||||
AND Timestamp = :Timestamp`, map[string]interface{}{"URL": url, "Timestamp": timestamp})
|
err = s.GetReplica().SelectOne(&metadata, query, args...)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
if err == sql.ErrNoRows {
|
if err == sql.ErrNoRows {
|
||||||
return nil, model.NewAppError("SqlLinkMetadataStore.Get", "store.sql_link_metadata.get.app_error", nil, "url="+url+", "+err.Error(), http.StatusNotFound)
|
return nil, model.NewAppError("SqlLinkMetadataStore.Get", "store.sql_link_metadata.get.app_error", nil, "url="+url+", "+err.Error(), http.StatusNotFound)
|
||||||
|
|||||||
Ссылка в новой задаче
Block a user