snapshot of https://github.com/traggo/server.git (master, 2026-09-16; blobs > 131072B omitted)
Some checks failed
build / build (push) Failing after 3s
Some checks failed
build / build (push) Failing after 3s
This commit is contained in:
28
dashboard/dbrange/add.go
Normal file
28
dashboard/dbrange/add.go
Normal file
@@ -0,0 +1,28 @@
|
||||
package dbrange
|
||||
|
||||
import (
|
||||
"context"
|
||||
|
||||
"github.com/traggo/server/auth"
|
||||
"github.com/traggo/server/dashboard/convert"
|
||||
"github.com/traggo/server/dashboard/util"
|
||||
"github.com/traggo/server/generated/gqlmodel"
|
||||
)
|
||||
|
||||
// AddDashboardRange adds a dashboard range.
|
||||
func (r *ResolverForRange) AddDashboardRange(ctx context.Context, dashboardID int, rangeArg gqlmodel.InputNamedDateRange) (*gqlmodel.NamedDateRange, error) {
|
||||
userID := auth.GetUser(ctx).ID
|
||||
if _, err := util.FindDashboard(r.DB, userID, dashboardID); err != nil {
|
||||
return nil, err
|
||||
}
|
||||
|
||||
rangeToAdd, err := convert.ToInternalDashboardRange(rangeArg)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
|
||||
rangeToAdd.DashboardID = dashboardID
|
||||
|
||||
save := r.DB.Create(&rangeToAdd)
|
||||
return convert.ToExternalDashboardRange(rangeToAdd), save.Error
|
||||
}
|
||||
8
dashboard/dbrange/dbrangeresolver.go
Normal file
8
dashboard/dbrange/dbrangeresolver.go
Normal file
@@ -0,0 +1,8 @@
|
||||
package dbrange
|
||||
|
||||
import "github.com/jinzhu/gorm"
|
||||
|
||||
// ResolverForRange resolves range specific things.
|
||||
type ResolverForRange struct {
|
||||
DB *gorm.DB
|
||||
}
|
||||
201
dashboard/dbrange/ranges_test.go
Normal file
201
dashboard/dbrange/ranges_test.go
Normal file
@@ -0,0 +1,201 @@
|
||||
package dbrange_test
|
||||
|
||||
import (
|
||||
"testing"
|
||||
|
||||
"github.com/stretchr/testify/require"
|
||||
"github.com/traggo/server/dashboard"
|
||||
"github.com/traggo/server/generated/gqlmodel"
|
||||
"github.com/traggo/server/test"
|
||||
"github.com/traggo/server/test/fake"
|
||||
)
|
||||
|
||||
func TestRanges(t *testing.T) {
|
||||
db := test.InMemoryDB(t)
|
||||
defer db.Close()
|
||||
|
||||
resolver := dashboard.NewResolverForDashboard(db.DB)
|
||||
|
||||
// initial no dashboards
|
||||
user1 := fake.User(1)
|
||||
user2 := fake.User(2)
|
||||
db.User(1)
|
||||
db.User(2)
|
||||
dashboards, err := resolver.Dashboards(user1)
|
||||
require.NoError(t, err)
|
||||
require.Empty(t, dashboards)
|
||||
|
||||
dashboard, err := resolver.CreateDashboard(user1, "cool dashboard")
|
||||
require.NoError(t, err)
|
||||
expectAdded := &gqlmodel.Dashboard{
|
||||
ID: 1,
|
||||
Name: "cool dashboard",
|
||||
Ranges: []*gqlmodel.NamedDateRange{},
|
||||
Items: []*gqlmodel.DashboardEntry{},
|
||||
}
|
||||
require.Equal(t, expectAdded, dashboard)
|
||||
|
||||
dashboards, err = resolver.Dashboards(user1)
|
||||
require.NoError(t, err)
|
||||
require.Equal(t, []*gqlmodel.Dashboard{expectAdded}, dashboards)
|
||||
|
||||
dashboards, err = resolver.Dashboards(user2)
|
||||
require.NoError(t, err)
|
||||
require.Empty(t, dashboards)
|
||||
|
||||
xrange, err := resolver.AddDashboardRange(user1, dashboard.ID, gqlmodel.InputNamedDateRange{
|
||||
Name: "new range",
|
||||
Editable: false,
|
||||
Range: &gqlmodel.InputRelativeOrStaticRange{
|
||||
From: "now-1d",
|
||||
To: "now-2d",
|
||||
},
|
||||
})
|
||||
require.NoError(t, err)
|
||||
require.Equal(t, &gqlmodel.NamedDateRange{
|
||||
ID: 1,
|
||||
Name: "new range",
|
||||
Editable: false,
|
||||
Range: &gqlmodel.RelativeOrStaticRange{
|
||||
From: "now-1d",
|
||||
To: "now-2d",
|
||||
},
|
||||
}, xrange)
|
||||
_, err = resolver.AddDashboardRange(user1, dashboard.ID, gqlmodel.InputNamedDateRange{
|
||||
Name: "new range",
|
||||
Editable: false,
|
||||
Range: &gqlmodel.InputRelativeOrStaticRange{
|
||||
From: "now-1",
|
||||
To: "now-2d",
|
||||
},
|
||||
})
|
||||
require.EqualError(t, err, "range from (now-1) invalid: expected unit at the end but got nothing")
|
||||
_, err = resolver.AddDashboardRange(user1, dashboard.ID, gqlmodel.InputNamedDateRange{
|
||||
Name: "new range",
|
||||
Editable: false,
|
||||
Range: &gqlmodel.InputRelativeOrStaticRange{
|
||||
From: "now-1d",
|
||||
To: "now-2",
|
||||
},
|
||||
})
|
||||
require.EqualError(t, err, "range to (now-2) invalid: expected unit at the end but got nothing")
|
||||
_, err = resolver.AddDashboardRange(user1, 100, gqlmodel.InputNamedDateRange{
|
||||
Name: "new range",
|
||||
Editable: false,
|
||||
Range: &gqlmodel.InputRelativeOrStaticRange{
|
||||
From: "now-1d",
|
||||
To: "now-2",
|
||||
},
|
||||
})
|
||||
require.EqualError(t, err, "dashboard does not exist")
|
||||
dashboards, err = resolver.Dashboards(user1)
|
||||
require.NoError(t, err)
|
||||
require.Equal(t, []*gqlmodel.Dashboard{{
|
||||
ID: 1,
|
||||
Name: "cool dashboard",
|
||||
Ranges: []*gqlmodel.NamedDateRange{{
|
||||
ID: 1,
|
||||
Name: "new range",
|
||||
Editable: false,
|
||||
Range: &gqlmodel.RelativeOrStaticRange{
|
||||
From: "now-1d",
|
||||
To: "now-2d",
|
||||
},
|
||||
}},
|
||||
Items: []*gqlmodel.DashboardEntry{},
|
||||
}}, dashboards)
|
||||
|
||||
_, err = resolver.UpdateDashboardRange(user2, 1, gqlmodel.InputNamedDateRange{
|
||||
Name: "my range",
|
||||
Editable: true,
|
||||
Range: &gqlmodel.InputRelativeOrStaticRange{
|
||||
From: "now-1d",
|
||||
To: "now-2d/w",
|
||||
},
|
||||
})
|
||||
require.EqualError(t, err, "dashboard does not exist")
|
||||
xrange, err = resolver.UpdateDashboardRange(user1, 1, gqlmodel.InputNamedDateRange{
|
||||
Name: "my range",
|
||||
Editable: true,
|
||||
Range: &gqlmodel.InputRelativeOrStaticRange{
|
||||
From: "now-1d",
|
||||
To: "now-2d/w",
|
||||
},
|
||||
})
|
||||
require.Equal(t, &gqlmodel.NamedDateRange{
|
||||
ID: 1,
|
||||
Name: "my range",
|
||||
Editable: true,
|
||||
Range: &gqlmodel.RelativeOrStaticRange{
|
||||
From: "now-1d",
|
||||
To: "now-2d/w",
|
||||
},
|
||||
}, xrange)
|
||||
_, err = resolver.UpdateDashboardRange(user1, 1, gqlmodel.InputNamedDateRange{
|
||||
Name: "my range",
|
||||
Editable: true,
|
||||
Range: &gqlmodel.InputRelativeOrStaticRange{
|
||||
From: "now-1d",
|
||||
To: "now-2",
|
||||
},
|
||||
})
|
||||
require.EqualError(t, err, "range to (now-2) invalid: expected unit at the end but got nothing")
|
||||
_, err = resolver.UpdateDashboardRange(user1, 44, gqlmodel.InputNamedDateRange{
|
||||
Name: "my range",
|
||||
Editable: true,
|
||||
Range: &gqlmodel.InputRelativeOrStaticRange{
|
||||
From: "now-1d",
|
||||
To: "now-2",
|
||||
},
|
||||
})
|
||||
require.EqualError(t, err, "dashboard range does not exist")
|
||||
|
||||
entry, err := resolver.AddDashboardEntry(user1, 1, gqlmodel.EntryTypeBarChart, "other", true, gqlmodel.InputStatsSelection{
|
||||
Interval: gqlmodel.StatsIntervalDaily,
|
||||
Tags: []string{"abc"},
|
||||
RangeID: &xrange.ID,
|
||||
}, &gqlmodel.InputResponsiveDashboardEntryPos{Desktop: &gqlmodel.InputDashboardEntryPos{
|
||||
H: 1,
|
||||
W: 2,
|
||||
X: 1,
|
||||
Y: 3,
|
||||
}})
|
||||
require.NoError(t, err)
|
||||
_, err = resolver.RemoveDashboardRange(user1, xrange.ID)
|
||||
require.EqualError(t, err, "range is used in entries: other")
|
||||
_, err = resolver.RemoveDashboardEntry(user1, entry.ID)
|
||||
require.NoError(t, err)
|
||||
|
||||
dashboards, err = resolver.Dashboards(user1)
|
||||
require.NoError(t, err)
|
||||
require.Equal(t, []*gqlmodel.Dashboard{{
|
||||
ID: 1,
|
||||
Name: "cool dashboard",
|
||||
Ranges: []*gqlmodel.NamedDateRange{{
|
||||
ID: 1,
|
||||
Name: "my range",
|
||||
Editable: true,
|
||||
Range: &gqlmodel.RelativeOrStaticRange{
|
||||
From: "now-1d",
|
||||
To: "now-2d/w",
|
||||
},
|
||||
}},
|
||||
Items: []*gqlmodel.DashboardEntry{},
|
||||
}}, dashboards)
|
||||
|
||||
_, err = resolver.RemoveDashboardRange(user2, 1)
|
||||
require.EqualError(t, err, "dashboard does not exist")
|
||||
_, err = resolver.RemoveDashboardRange(user2, 55)
|
||||
require.EqualError(t, err, "dashboard range does not exist")
|
||||
|
||||
dashboards, err = resolver.Dashboards(user1)
|
||||
require.NoError(t, err)
|
||||
require.Len(t, dashboards[0].Ranges, 1)
|
||||
|
||||
_, err = resolver.RemoveDashboardRange(user1, 1)
|
||||
require.NoError(t, err)
|
||||
dashboards, err = resolver.Dashboards(user1)
|
||||
require.NoError(t, err)
|
||||
require.Len(t, dashboards[0].Ranges, 0)
|
||||
|
||||
}
|
||||
43
dashboard/dbrange/remove.go
Normal file
43
dashboard/dbrange/remove.go
Normal file
@@ -0,0 +1,43 @@
|
||||
package dbrange
|
||||
|
||||
import (
|
||||
"context"
|
||||
"errors"
|
||||
"strings"
|
||||
|
||||
"github.com/traggo/server/auth"
|
||||
"github.com/traggo/server/dashboard/convert"
|
||||
"github.com/traggo/server/dashboard/util"
|
||||
"github.com/traggo/server/generated/gqlmodel"
|
||||
"github.com/traggo/server/model"
|
||||
)
|
||||
|
||||
// RemoveDashboardRange removes a dashboard range.
|
||||
func (r *ResolverForRange) RemoveDashboardRange(ctx context.Context, rangeID int) (*gqlmodel.NamedDateRange, error) {
|
||||
userID := auth.GetUser(ctx).ID
|
||||
dashboardRange, err := util.FindDashboardRange(r.DB, rangeID)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
|
||||
if _, err := util.FindDashboard(r.DB, userID, dashboardRange.DashboardID); err != nil {
|
||||
return nil, err
|
||||
}
|
||||
|
||||
entries := []model.DashboardEntry{}
|
||||
if err := r.DB.Where(model.DashboardEntry{RangeID: rangeID}).Find(&entries).Error; err != nil {
|
||||
return nil, err
|
||||
}
|
||||
|
||||
names := []string{}
|
||||
for _, entry := range entries {
|
||||
names = append(names, entry.Title)
|
||||
}
|
||||
|
||||
if len(entries) != 0 {
|
||||
return nil, errors.New("range is used in entries: " + strings.Join(names, ","))
|
||||
}
|
||||
|
||||
remove := r.DB.Delete(&model.DashboardRange{}, rangeID)
|
||||
return convert.ToExternalDashboardRange(dashboardRange), remove.Error
|
||||
}
|
||||
35
dashboard/dbrange/update.go
Normal file
35
dashboard/dbrange/update.go
Normal file
@@ -0,0 +1,35 @@
|
||||
package dbrange
|
||||
|
||||
import (
|
||||
"context"
|
||||
|
||||
"github.com/traggo/server/auth"
|
||||
"github.com/traggo/server/dashboard/convert"
|
||||
"github.com/traggo/server/dashboard/util"
|
||||
"github.com/traggo/server/generated/gqlmodel"
|
||||
)
|
||||
|
||||
// UpdateDashboardRange updates a dashboard range.
|
||||
func (r *ResolverForRange) UpdateDashboardRange(ctx context.Context, rangeID int, rangeArg gqlmodel.InputNamedDateRange) (*gqlmodel.NamedDateRange, error) {
|
||||
userID := auth.GetUser(ctx).ID
|
||||
|
||||
dashboardRange, err := util.FindDashboardRange(r.DB, rangeID)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
|
||||
if _, err := util.FindDashboard(r.DB, userID, dashboardRange.DashboardID); err != nil {
|
||||
return nil, err
|
||||
}
|
||||
|
||||
rangeToUpdate, err := convert.ToInternalDashboardRange(rangeArg)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
|
||||
rangeToUpdate.DashboardID = dashboardRange.DashboardID
|
||||
rangeToUpdate.ID = dashboardRange.ID
|
||||
|
||||
save := r.DB.Save(rangeToUpdate)
|
||||
return convert.ToExternalDashboardRange(rangeToUpdate), save.Error
|
||||
}
|
||||
Reference in New Issue
Block a user