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

Remove live.go from models (#61742)

Browse Source 
* Remove live.go from models

* Change Id to ID

* Add xorm tags
This commit is contained in:
idafurjes
2023-01-19 18:10:40 +01:00
committed by GitHub
parent c104cc7020
commit 8cbcdf1c26
6 changed files with 18 additions and 105 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
pkg/services/live/database/storage.go
View File

@@ -34,9 +34,9 @@ func (s *Storage) SaveLiveMessage(query *model.SaveLiveMessageQuery) error {
// return err
//})
// return err
s.cache.Set(getLiveMessageCacheKey(query.OrgId, query.Channel), model.LiveMessage{
Id: 0, // Not used actually.
OrgId: query.OrgId,
s.cache.Set(getLiveMessageCacheKey(query.OrgID, query.Channel), model.LiveMessage{
ID: 0, // Not used actually.
OrgID: query.OrgID,
Channel: query.Channel,
Data: query.Data,
Published: time.Now(),
@@ -54,7 +54,7 @@ func (s *Storage) GetLiveMessage(query *model.GetLiveMessageQuery) (model.LiveMe
// return err
//})
//return msg, exists, err
m, ok := s.cache.Get(getLiveMessageCacheKey(query.OrgId, query.Channel))
m, ok := s.cache.Get(getLiveMessageCacheKey(query.OrgID, query.Channel))
if !ok {
return model.LiveMessage{}, false, nil
}

12
pkg/services/live/database/tests/storage_test.go
View File

@@ -15,7 +15,7 @@ func TestIntegrationLiveMessage(t *testing.T) {
storage := SetupTestStorage(t)
getQuery := &model.GetLiveMessageQuery{
OrgId: 1,
OrgID: 1,
Channel: "test_channel",
}
_, ok, err := storage.GetLiveMessage(getQuery)
@@ -23,7 +23,7 @@ func TestIntegrationLiveMessage(t *testing.T) {
require.False(t, ok)
saveQuery := &model.SaveLiveMessageQuery{
OrgId: 1,
OrgID: 1,
Channel: "test_channel",
Data: []byte(`{}`),
}
@@ -33,14 +33,14 @@ func TestIntegrationLiveMessage(t *testing.T) {
msg, ok, err := storage.GetLiveMessage(getQuery)
require.NoError(t, err)
require.True(t, ok)
require.Equal(t, int64(1), msg.OrgId)
require.Equal(t, int64(1), msg.OrgID)
require.Equal(t, "test_channel", msg.Channel)
require.Equal(t, json.RawMessage(`{}`), msg.Data)
require.NotZero(t, msg.Published)
// try saving again, should be replaced.
saveQuery2 := &model.SaveLiveMessageQuery{
OrgId: 1,
OrgID: 1,
Channel: "test_channel",
Data: []byte(`{"input": "hello"}`),
}
@@ -48,13 +48,13 @@ func TestIntegrationLiveMessage(t *testing.T) {
require.NoError(t, err)
getQuery2 := &model.GetLiveMessageQuery{
OrgId: 1,
OrgID: 1,
Channel: "test_channel",
}
msg2, ok, err := storage.GetLiveMessage(getQuery2)
require.NoError(t, err)
require.True(t, ok)
require.Equal(t, int64(1), msg2.OrgId)
require.Equal(t, int64(1), msg2.OrgID)
require.Equal(t, "test_channel", msg2.Channel)
require.Equal(t, json.RawMessage(`{"input": "hello"}`), msg2.Data)
require.NotZero(t, msg2.Published)

4
pkg/services/live/features/broadcast.go
View File

@@ -43,7 +43,7 @@ func (b *BroadcastRunner) OnSubscribe(_ context.Context, u *user.SignedInUser, e
JoinLeave: true,
}
query := &model.GetLiveMessageQuery{
OrgId: u.OrgID,
OrgID: u.OrgID,
Channel: e.Channel,
}
msg, ok, err := b.liveMessageStore.GetLiveMessage(query)
@@ -59,7 +59,7 @@ func (b *BroadcastRunner) OnSubscribe(_ context.Context, u *user.SignedInUser, e
// OnPublish is called when a client wants to broadcast on the websocket
func (b *BroadcastRunner) OnPublish(_ context.Context, u *user.SignedInUser, e model.PublishEvent) (model.PublishReply, backend.PublishStreamStatus, error) {
query := &model.SaveLiveMessageQuery{
OrgId: u.OrgID,
OrgID: u.OrgID,
Channel: e.Channel,
Data: e.Data,
}

4
pkg/services/live/features/broadcast_test.go
View File

@@ -29,7 +29,7 @@ func TestBroadcastRunner_OnSubscribe(t *testing.T) {
data := json.RawMessage(`{}`)
mockDispatcher.EXPECT().GetLiveMessage(&model.GetLiveMessageQuery{
OrgId: 1,
OrgID: 1,
Channel: channel,
}).DoAndReturn(func(query *model.GetLiveMessageQuery) (model.LiveMessage, bool, error) {
return model.LiveMessage{
@@ -64,7 +64,7 @@ func TestBroadcastRunner_OnPublish(t *testing.T) {
var orgID int64 = 1
mockDispatcher.EXPECT().SaveLiveMessage(&model.SaveLiveMessageQuery{
OrgId: orgID,
OrgID: orgID,
Channel: channel,
Data: data,
}).DoAndReturn(func(query *model.SaveLiveMessageQuery) error {

8
pkg/services/live/model/model.go
View File

@@ -68,20 +68,20 @@ type ChannelHandlerFactory interface {
}
type LiveMessage struct {
Id int64
OrgId int64
ID int64 `xorm:"pk autoincr 'id'"`
OrgID int64 `xorm:"org_id"`
Channel string
Data json.RawMessage
Published time.Time
}
type SaveLiveMessageQuery struct {
OrgId int64
OrgID int64 `xorm:"org_id"`
Channel string
Data json.RawMessage
}
type GetLiveMessageQuery struct {
OrgId int64
OrgID int64 `xorm:"org_id"`
Channel string
}