IntenseWebs/grafana
3
0
Fork 0
mirror of https://github.com/grafana/grafana.git synced 2025-02-25 18:55:37 -06:00
Code Issues Packages Projects Releases Wiki Activity

Short URL: Update last seen at when visiting a short URL (#28565)

Browse Source 
Ref #28248

Co-authored-by: Sofia Papagiannaki <papagian@users.noreply.github.com>
This commit is contained in:
Marcus Efraimsson 2020-10-27 16:16:06 +01:00 committed by GitHub
parent aa9134b3b4
commit 60d40fa99b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 39 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
pkg/api/short_url.go
View File

@ -57,6 +57,11 @@ func (hs *HTTPServer) redirectFromShortURL(c *models.ReqContext) {
return
}
// Failure to update LastSeenAt should still allow to redirect
if err := hs.ShortURLService.UpdateLastSeenAt(c.Req.Context(), shortURL); err != nil {
hs.log.Error("Failed to update short URL last seen at", "error", err)
}
hs.log.Debug("Redirecting short URL", "path", shortURL.Path)
c.Redirect(setting.ToAbsUrl(shortURL.Path), 302)
}

14
pkg/services/shorturls/short_url_service.go
View File

@ -10,6 +10,8 @@ import (
"github.com/grafana/grafana/pkg/util"
)
var getTime = time.Now
func init() {
registry.RegisterService(&ShortURLService{})
}
@ -42,6 +44,18 @@ func (s ShortURLService) GetShortURLByUID(ctx context.Context, user *models.Sign
return &shortURL, nil
}
func (s ShortURLService) UpdateLastSeenAt(ctx context.Context, shortURL *models.ShortUrl) error {
shortURL.LastSeenAt = getTime().Unix()
return s.SQLStore.WithTransactionalDbSession(ctx, func(dbSession *sqlstore.DBSession) error {
_, err := dbSession.ID(shortURL.Id).Update(shortURL)
if err != nil {
return err
}
return nil
})
}
func (s ShortURLService) CreateShortURL(ctx context.Context, user *models.SignedInUser, path string) (*models.ShortUrl, error) {
now := time.Now().Unix()
shortURL := models.ShortUrl{

20
pkg/services/shorturls/short_url_service_test.go
View File

@ -3,6 +3,7 @@ package shorturls
import (
"context"
"testing"
"time"
"github.com/grafana/grafana/pkg/models"
"github.com/grafana/grafana/pkg/services/sqlstore"
@ -27,6 +28,25 @@ func TestShortURLService(t *testing.T) {
require.NoError(t, err)
require.NotNil(t, existingShortURL)
require.Equal(t, refPath, existingShortURL.Path)
t.Run("and update last seen at", func(t *testing.T) {
origGetTime := getTime
t.Cleanup(func() {
getTime = origGetTime
})
expectedTime := time.Date(2020, time.November, 27, 6, 5, 1, 0, time.UTC)
getTime = func() time.Time {
return expectedTime
}
err := service.UpdateLastSeenAt(context.Background(), existingShortURL)
require.NoError(t, err)
updatedShortURL, err := service.GetShortURLByUID(context.Background(), user, existingShortURL.Uid)
require.NoError(t, err)
require.Equal(t, expectedTime.Unix(), updatedShortURL.LastSeenAt)
})
})
t.Run("User cannot look up nonexistent short URLs", func(t *testing.T) {