@@ -25,13 +25,13 @@ func GetFilterForProjects(fromDate, teamName, projectIDs string) string {
25
25
return getProjectFilterForEmptyDate (projectIDs , teamName )
26
26
}
27
27
if teamName == "" {
28
- return fmt .Sprintf ("CreatedDate gt %s and %s" , fromDate , getProjectIdsFilter (projectIDs ))
28
+ return fmt .Sprintf ("CreatedDate gt %s and %s" , fromDate , getProjectIDsFilter (projectIDs ))
29
29
}
30
30
if projectIDs == "" {
31
31
return fmt .Sprintf ("CreatedDate gt %s and %s" , fromDate , getTeamFilter (teamName ))
32
32
}
33
33
return fmt .Sprintf ("CreatedDate gt %s and %s and %s" , fromDate , getTeamFilter (teamName ),
34
- getProjectIdsFilter (projectIDs ))
34
+ getProjectIDsFilter (projectIDs ))
35
35
}
36
36
37
37
// GetFilterForProjectsWithLastScan get filter string for projects list with last scan
@@ -43,53 +43,53 @@ func GetFilterForProjectsWithLastScan(fromDate, teamName, projectIDs string) str
43
43
return getProjectFilterForEmptyDate (projectIDs , teamName )
44
44
}
45
45
if teamName == "" {
46
- return fmt .Sprintf ("LastScan/ScanCompletedOn gt %s and %s" , fromDate , getProjectIdsFilter (projectIDs ))
46
+ return fmt .Sprintf ("LastScan/ScanCompletedOn gt %s and %s" , fromDate , getProjectIDsFilter (projectIDs ))
47
47
}
48
48
if projectIDs == "" {
49
49
return fmt .Sprintf ("LastScan/ScanCompletedOn gt %s and %s" , fromDate , getTeamFilter (teamName ))
50
50
}
51
51
return fmt .Sprintf ("LastScan/ScanCompletedOn gt %s and %s and %s" , fromDate , getTeamFilter (teamName ),
52
- getProjectIdsFilter (projectIDs ))
52
+ getProjectIDsFilter (projectIDs ))
53
53
}
54
54
55
55
// getProjectFilterForEmptyDate get project filter when date empty
56
56
func getProjectFilterForEmptyDate (projectIDs , teamName string ) string {
57
57
if teamName == "" {
58
- return getProjectIdsFilter (projectIDs )
58
+ return getProjectIDsFilter (projectIDs )
59
59
}
60
- return fmt .Sprintf ("%s and %s" , getProjectIdsFilter (projectIDs ), getTeamFilter (teamName ))
60
+ return fmt .Sprintf ("%s and %s" , getProjectIDsFilter (projectIDs ), getTeamFilter (teamName ))
61
61
}
62
62
63
63
// getTeamFilter get filter string for team
64
64
func getTeamFilter (teamName string ) string {
65
65
return fmt .Sprintf ("OwningTeam/FullName eq '%s'" , teamName )
66
66
}
67
67
68
- // getProjectIdsFilter get filter string for project-id option
69
- func getProjectIdsFilter ( projectIds string ) string {
70
- if matched , _ := regexp .MatchString (`^\d+$` , projectIds ); matched {
71
- return fmt .Sprintf ("Id eq %s" , projectIds )
68
+ // getProjectIDsFilter get filter string for project-id option
69
+ func getProjectIDsFilter ( projectIDs string ) string {
70
+ if matched , _ := regexp .MatchString (`^\d+$` , projectIDs ); matched {
71
+ return fmt .Sprintf ("Id eq %s" , projectIDs )
72
72
}
73
- if matched , _ := regexp .MatchString (`^\d+(,\s?\d+)+$` , projectIds ); matched {
74
- return fmt .Sprintf ("Id in (%s)" , projectIds )
73
+ if matched , _ := regexp .MatchString (`^\d+(,\s?\d+)+$` , projectIDs ); matched {
74
+ return fmt .Sprintf ("Id in (%s)" , projectIDs )
75
75
}
76
- if matched , _ := regexp .MatchString (`^\d+\s?-\s?\d+$` , projectIds ); matched {
77
- ids := strings .Split (projectIds , "-" )
78
- min , max := getMinMax (ids )
79
- return fmt .Sprintf ("Id ge %d and Id le %d" , min , max )
76
+ if matched , _ := regexp .MatchString (`^\d+\s?-\s?\d+$` , projectIDs ); matched {
77
+ ids := strings .Split (projectIDs , "-" )
78
+ minValue , maxValue := getMinMax (ids )
79
+ return fmt .Sprintf ("Id ge %d and Id le %d" , minValue , maxValue )
80
80
}
81
81
82
82
log .Warn ().Msg ("--project-id has wrong param. It should be like --project-id 1 or 1,3,8 or 1-3" )
83
83
return "Id gt 0"
84
84
}
85
85
86
86
// getMinMax get min and max values
87
- func getMinMax (ids []string ) (min , max int ) {
88
- min , _ = strconv .Atoi (strings .Trim (ids [0 ], " " ))
89
- max , _ = strconv .Atoi (strings .Trim (ids [1 ], " " ))
90
- if min > max {
91
- min , max = max , min
87
+ func getMinMax (ids []string ) (minValue , maxValue int ) {
88
+ minValue , _ = strconv .Atoi (strings .Trim (ids [0 ], " " ))
89
+ maxValue , _ = strconv .Atoi (strings .Trim (ids [1 ], " " ))
90
+ if minValue > maxValue {
91
+ minValue , maxValue = maxValue , minValue
92
92
}
93
93
94
- return min , max
94
+ return minValue , maxValue
95
95
}
0 commit comments