Skip to content

Use global timezone for admin query #1382

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Rader wants to merge 1 commit into
base: main
Choose a base branch
from
+25 −11
Open

Use global timezone for admin query #1382

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 15 additions & 8 deletions api/handler/cluster.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,12 +23,14 @@ func NewClusterHandler(config *config.Config) (*ClusterHandler, error) {
return nil, err
}
return &ClusterHandler{
c: ncc,
c: ncc,
config: config,
}, nil
}

type ClusterHandler struct {
c component.ClusterComponent
c component.ClusterComponent
config *config.Config
}

const (
Expand Down Expand Up @@ -208,7 +210,7 @@ func (h *ClusterHandler) GetDeploysReport(ctx *gin.Context) {
req.Status = []int{code.DeployFailed}
}
req.Query = ctx.Query("search")
if err := bindDeployDateRange(ctx, &req); err != nil {
if err := h.bindDeployDateRange(ctx, &req); err != nil {
slog.ErrorContext(ctx.Request.Context(), "Invalid date range for deploy report", slog.Any("error", err))
httpbase.BadRequest(ctx, err.Error())
return
Expand Down Expand Up @@ -294,7 +296,7 @@ func (h *ClusterHandler) Update(ctx *gin.Context) {
httpbase.OK(ctx, result)
}

func bindDeployDateRange(ctx *gin.Context, req *types.DeployReq) error {
func (h *ClusterHandler) bindDeployDateRange(ctx *gin.Context, req *types.DeployReq) error {
startTime := ctx.Query("start_time")
endTime := ctx.Query("end_time")
if startTime == "" && endTime == "" {
Expand All @@ -303,11 +305,11 @@ func bindDeployDateRange(ctx *gin.Context, req *types.DeployReq) error {
if startTime == "" || endTime == "" {
return fmt.Errorf("start_time and end_time must be provided together")
}
parsedStart, err := parseDeployQueryTime(startTime, false)
parsedStart, err := h.parseDeployQueryTime(startTime, false)
if err != nil {
return err
}
parsedEnd, err := parseDeployQueryTime(endTime, true)
parsedEnd, err := h.parseDeployQueryTime(endTime, true)
if err != nil {
return err
}
Expand All @@ -316,10 +318,15 @@ func bindDeployDateRange(ctx *gin.Context, req *types.DeployReq) error {
return nil
}

func parseDeployQueryTime(value string, isEnd bool) (time.Time, error) {
func (h *ClusterHandler) parseDeployQueryTime(value string, isEnd bool) (time.Time, error) {
loc, err := time.LoadLocation(h.config.TimeZone)
if err != nil {
slog.Warn("failed to load timezone, falling back to UTC", "timezone", h.config.TimeZone, "error", err)
loc = time.UTC
}
layouts := []string{deployTimeLayout, deployDateOnlyLayout}
for _, layout := range layouts {
parsed, err := time.ParseInLocation(layout, value, time.UTC)
parsed, err := time.ParseInLocation(layout, value, loc)
if err != nil {
continue
}
Expand Down
13 changes: 10 additions & 3 deletions api/handler/cluster_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,13 @@ import (
"time"

"github.com/gin-gonic/gin"
"github.com/mcuadros/go-defaults"
"github.com/stretchr/testify/mock"
"github.com/stretchr/testify/require"
mockcomponent "opencsg.com/csghub-server/_mocks/opencsg.com/csghub-server/component"
"opencsg.com/csghub-server/api/httpbase"
"opencsg.com/csghub-server/builder/testutil"
"opencsg.com/csghub-server/common/config"
"opencsg.com/csghub-server/common/errorx"
"opencsg.com/csghub-server/common/types"
)
Expand All @@ -27,8 +29,11 @@ type clusterTester struct {
func newClusterTester(t *testing.T) *clusterTester {
tester := &clusterTester{GinTester: testutil.NewGinTester()}
tester.mocks.clusterComponent = mockcomponent.NewMockClusterComponent(t)
cfg := &config.Config{}
defaults.SetDefaults(cfg)
tester.handler = &ClusterHandler{
c: tester.mocks.clusterComponent,
c: tester.mocks.clusterComponent,
config: cfg,
}
return tester
}
Expand Down Expand Up @@ -101,9 +106,11 @@ func Test_GetDeploysReport(t *testing.T) {

start := "2024-01-01 00:00:00"
end := "2024-01-31"
expectedStart, err := time.ParseInLocation(time.DateTime, start, time.UTC)
loc, err := time.LoadLocation("Asia/Shanghai")
require.NoError(t, err)
endDate, err := time.ParseInLocation("2006-01-02", end, time.UTC)
expectedStart, err := time.ParseInLocation(time.DateTime, start, loc)
require.NoError(t, err)
endDate, err := time.ParseInLocation("2006-01-02", end, loc)
require.NoError(t, err)
expectedEnd := endDate.Add(24*time.Hour - time.Nanosecond)
tester.mocks.clusterComponent.EXPECT().
Expand Down
Loading