Skip to content

misc: extend(TimeUtils): add support for "last7Days", "last30Days", and "la… #338

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

Merged
prakash100198 merged 1 commit into from
Sep 22, 2025
Merged

misc: extend(TimeUtils): add support for "last7Days", "last30Days", and "la… #338

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
16 changes: 14 additions & 2 deletions common-lib/utils/TimeUtils.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ import (
type TimeRangeRequest struct {
From *time.Time `json:"from" schema:"from"`
To *time.Time `json:"to" schema:"to"`
TimeWindow *TimeWindows `json:"timeWindow" schema:"timeWindow" validate:"omitempty,oneof=today yesterday week month quarter lastWeek lastMonth lastQuarter"`
TimeWindow *TimeWindows `json:"timeWindow" schema:"timeWindow" validate:"omitempty,oneof=today yesterday week month quarter lastWeek lastMonth lastQuarter last7Days last30Days last90Days"`
}

func NewTimeRangeRequest(from *time.Time, to *time.Time) *TimeRangeRequest {
Expand Down Expand Up @@ -57,8 +57,11 @@ const (
Quarter TimeWindows = "quarter"
LastWeek TimeWindows = "lastWeek"
LastMonth TimeWindows = "lastMonth"
Year TimeWindows = "year"
Year TimeWindows = "year"
LastQuarter TimeWindows = "lastQuarter"
Last7Days TimeWindows = "last7Days"
Last30Days TimeWindows = "last30Days"
Last90Days TimeWindows = "last90Days"
)

func (timeRange *TimeRangeRequest) ParseAndValidateTimeRange() (*TimeRangeRequest, error) {
Expand Down Expand Up @@ -140,6 +143,15 @@ func (timeRange *TimeRangeRequest) ParseAndValidateTimeRange() (*TimeRangeReques
case Year:
start := time.Date(now.Year(), 1, 1, 0, 0, 0, 0, now.Location())
return NewTimeRangeRequest(&start, &now), nil
case Last7Days:
start := now.AddDate(0, 0, -7)
return NewTimeRangeRequest(&start, &now), nil
case Last30Days:
start := now.AddDate(0, 0, -30)
return NewTimeRangeRequest(&start, &now), nil
case Last90Days:
start := now.AddDate(0, 0, -90)
return NewTimeRangeRequest(&start, &now), nil
default:
return NewTimeRangeRequest(&time.Time{}, &time.Time{}), fmt.Errorf("unsupported time window: %q", *timeRange.TimeWindow)
}
Expand Down
Loading