Skip to content

support filter by start and end time in release plan list #4438

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
PetrusZ wants to merge 1 commit into
base: main
Choose a base branch
from
Open

support filter by start and end time in release plan list #4438

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
8 changes: 8 additions & 0 deletions pkg/microservice/aslan/core/common/repository/mongodb/release_plan.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -148,6 +148,8 @@ type ListReleasePlanOption struct {
SuccessTimeEnd int64
UpdateTimeStart int64
UpdateTimeEnd int64
StartTime int64
EndTime int64
IsSort bool
SortBy SortReleasePlanBy
ExcludedFields []string
Expand Down Expand Up @@ -190,6 +192,12 @@ func (c *ReleasePlanColl) ListByOptions(opt *ListReleasePlanOption) ([]*models.R
if opt.UpdateTimeStart > 0 && opt.UpdateTimeEnd > 0 {
query["update_time"] = bson.M{"$gte": opt.UpdateTimeStart, "$lte": opt.UpdateTimeEnd}
}
if opt.StartTime > 0 && opt.EndTime > 0 {
query["$or"] = []bson.M{
{"start_time": bson.M{"$gte": opt.StartTime, "$lte": opt.EndTime}},
{"end_time": bson.M{"$gte": opt.StartTime, "$lte": opt.EndTime}},
}
}
if opt.Status != "" {
query["status"] = opt.Status
}
Expand Down
18 changes: 14 additions & 4 deletions pkg/microservice/aslan/core/release_plan/service/release_plan.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1235,10 +1235,12 @@ const (
)

type ListReleasePlanOption struct {
PageNum int64 `form:"pageNum" binding:"required"`
PageSize int64 `form:"pageSize" binding:"required"`
Type ListReleasePlanType `form:"type" binding:"required"`
Keyword string `form:"keyword"`
PageNum int64 `form:"pageNum" binding:"required"`
PageSize int64 `form:"pageSize" binding:"required"`
StartTime int64 `form:"startTime"`
EndTime int64 `form:"endTime"`
Type ListReleasePlanType `form:"type" binding:"required"`
Keyword string `form:"keyword"`
}

type ListReleasePlanResp struct {
Expand All @@ -1259,6 +1261,8 @@ func ListReleasePlans(opt *ListReleasePlanOption) (*ListReleasePlanResp, error)
IsSort: true,
PageNum: opt.PageNum,
PageSize: opt.PageSize,
StartTime: opt.StartTime,
EndTime: opt.EndTime,
ExcludedFields: []string{"jobs", "logs"},
})
case ListReleasePlanTypeManager:
Expand All @@ -1267,6 +1271,8 @@ func ListReleasePlans(opt *ListReleasePlanOption) (*ListReleasePlanResp, error)
IsSort: true,
PageNum: opt.PageNum,
PageSize: opt.PageSize,
StartTime: opt.StartTime,
EndTime: opt.EndTime,
ExcludedFields: []string{"jobs", "logs"},
})
case ListReleasePlanTypeSuccessTime:
Expand All @@ -1293,6 +1299,8 @@ func ListReleasePlans(opt *ListReleasePlanOption) (*ListReleasePlanResp, error)
SortBy: mongodb.SortReleasePlanByUpdateTime,
PageNum: opt.PageNum,
PageSize: opt.PageSize,
StartTime: opt.StartTime,
EndTime: opt.EndTime,
ExcludedFields: []string{"jobs", "logs"},
})
case ListReleasePlanTypeUpdateTime:
Expand All @@ -1319,6 +1327,8 @@ func ListReleasePlans(opt *ListReleasePlanOption) (*ListReleasePlanResp, error)
SortBy: mongodb.SortReleasePlanByUpdateTime,
PageNum: opt.PageNum,
PageSize: opt.PageSize,
StartTime: opt.StartTime,
EndTime: opt.EndTime,
ExcludedFields: []string{"jobs", "logs"},
})
case ListReleasePlanTypeStatus:
Expand Down