Skip to content

Commit 112faa9

Browse files
solovey23solovey23
authored
Merge pull request #4 from solovey23/fix/stats-query-params
Fix stats query params: sending_streams[] and add --esps filter
2 parents aced56e + eddab9a commit 112faa9

5 files changed

Lines changed: 35 additions & 10 deletions

File tree

‎internal/commands/stats/by_category.go‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ type ByCategoryOptions struct {
1818
DomainIDs []string
1919
Streams []string
2020
Categories []string
21+
ESPs []string
2122
}
2223

2324
func NewCmdByCategory(f *cmdutil.Factory) *cobra.Command {
@@ -50,6 +51,9 @@ func NewCmdByCategory(f *cmdutil.Factory) *cobra.Command {
5051
for _, cat := range opts.Categories {
5152
params.Add("categories[]", cat)
5253
}
54+
for _, esp := range opts.ESPs {
55+
params.Add("email_service_providers[]", esp)
56+
}
5357

5458
fullPath := fmt.Sprintf("%s?%s", path, params.Encode())
5559

@@ -68,8 +72,9 @@ func NewCmdByCategory(f *cmdutil.Factory) *cobra.Command {
6872
cmd.Flags().StringVar(&opts.StartDate, "start-date", "", "Start date (required)")
6973
cmd.Flags().StringVar(&opts.EndDate, "end-date", "", "End date (required)")
7074
cmd.Flags().StringSliceVar(&opts.DomainIDs, "domain-ids", nil, "Filter by domain IDs")
71-
cmd.Flags().StringSliceVar(&opts.Streams, "streams", nil, "Filter by streams")
75+
cmd.Flags().StringSliceVar(&opts.Streams, "streams", nil, "Filter by sending streams (e.g. transactional, bulk)")
7276
cmd.Flags().StringSliceVar(&opts.Categories, "categories", nil, "Filter by categories")
77+
cmd.Flags().StringSliceVar(&opts.ESPs, "esps", nil, "Filter by email service providers (e.g. Google, Yahoo)")
7378

7479
_ = cmd.MarkFlagRequired("start-date")
7580
_ = cmd.MarkFlagRequired("end-date")

‎internal/commands/stats/by_date.go‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ type ByDateOptions struct {
1818
DomainIDs []string
1919
Streams []string
2020
Categories []string
21+
ESPs []string
2122
}
2223

2324
func NewCmdByDate(f *cmdutil.Factory) *cobra.Command {
@@ -50,6 +51,9 @@ func NewCmdByDate(f *cmdutil.Factory) *cobra.Command {
5051
for _, cat := range opts.Categories {
5152
params.Add("categories[]", cat)
5253
}
54+
for _, esp := range opts.ESPs {
55+
params.Add("email_service_providers[]", esp)
56+
}
5357

5458
fullPath := fmt.Sprintf("%s?%s", path, params.Encode())
5559

@@ -68,8 +72,9 @@ func NewCmdByDate(f *cmdutil.Factory) *cobra.Command {
6872
cmd.Flags().StringVar(&opts.StartDate, "start-date", "", "Start date (required)")
6973
cmd.Flags().StringVar(&opts.EndDate, "end-date", "", "End date (required)")
7074
cmd.Flags().StringSliceVar(&opts.DomainIDs, "domain-ids", nil, "Filter by domain IDs")
71-
cmd.Flags().StringSliceVar(&opts.Streams, "streams", nil, "Filter by streams")
75+
cmd.Flags().StringSliceVar(&opts.Streams, "streams", nil, "Filter by sending streams (e.g. transactional, bulk)")
7276
cmd.Flags().StringSliceVar(&opts.Categories, "categories", nil, "Filter by categories")
77+
cmd.Flags().StringSliceVar(&opts.ESPs, "esps", nil, "Filter by email service providers (e.g. Google, Yahoo)")
7378

7479
_ = cmd.MarkFlagRequired("start-date")
7580
_ = cmd.MarkFlagRequired("end-date")

‎internal/commands/stats/by_domain.go‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ type ByDomainOptions struct {
1818
DomainIDs []string
1919
Streams []string
2020
Categories []string
21+
ESPs []string
2122
}
2223

2324
func NewCmdByDomain(f *cmdutil.Factory) *cobra.Command {
@@ -50,6 +51,9 @@ func NewCmdByDomain(f *cmdutil.Factory) *cobra.Command {
5051
for _, cat := range opts.Categories {
5152
params.Add("categories[]", cat)
5253
}
54+
for _, esp := range opts.ESPs {
55+
params.Add("email_service_providers[]", esp)
56+
}
5357

5458
fullPath := fmt.Sprintf("%s?%s", path, params.Encode())
5559

@@ -68,8 +72,9 @@ func NewCmdByDomain(f *cmdutil.Factory) *cobra.Command {
6872
cmd.Flags().StringVar(&opts.StartDate, "start-date", "", "Start date (required)")
6973
cmd.Flags().StringVar(&opts.EndDate, "end-date", "", "End date (required)")
7074
cmd.Flags().StringSliceVar(&opts.DomainIDs, "domain-ids", nil, "Filter by domain IDs")
71-
cmd.Flags().StringSliceVar(&opts.Streams, "streams", nil, "Filter by streams")
75+
cmd.Flags().StringSliceVar(&opts.Streams, "streams", nil, "Filter by sending streams (e.g. transactional, bulk)")
7276
cmd.Flags().StringSliceVar(&opts.Categories, "categories", nil, "Filter by categories")
77+
cmd.Flags().StringSliceVar(&opts.ESPs, "esps", nil, "Filter by email service providers (e.g. Google, Yahoo)")
7378

7479
_ = cmd.MarkFlagRequired("start-date")
7580
_ = cmd.MarkFlagRequired("end-date")

‎internal/commands/stats/by_esp.go‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ type ByESPOptions struct {
1818
DomainIDs []string
1919
Streams []string
2020
Categories []string
21+
ESPs []string
2122
}
2223

2324
func NewCmdByESP(f *cmdutil.Factory) *cobra.Command {
@@ -50,6 +51,9 @@ func NewCmdByESP(f *cmdutil.Factory) *cobra.Command {
5051
for _, cat := range opts.Categories {
5152
params.Add("categories[]", cat)
5253
}
54+
for _, esp := range opts.ESPs {
55+
params.Add("email_service_providers[]", esp)
56+
}
5357

5458
fullPath := fmt.Sprintf("%s?%s", path, params.Encode())
5559

@@ -68,8 +72,9 @@ func NewCmdByESP(f *cmdutil.Factory) *cobra.Command {
6872
cmd.Flags().StringVar(&opts.StartDate, "start-date", "", "Start date (required)")
6973
cmd.Flags().StringVar(&opts.EndDate, "end-date", "", "End date (required)")
7074
cmd.Flags().StringSliceVar(&opts.DomainIDs, "domain-ids", nil, "Filter by domain IDs")
71-
cmd.Flags().StringSliceVar(&opts.Streams, "streams", nil, "Filter by streams")
75+
cmd.Flags().StringSliceVar(&opts.Streams, "streams", nil, "Filter by sending streams (e.g. transactional, bulk)")
7276
cmd.Flags().StringSliceVar(&opts.Categories, "categories", nil, "Filter by categories")
77+
cmd.Flags().StringSliceVar(&opts.ESPs, "esps", nil, "Filter by email service providers (e.g. Google, Yahoo)")
7378

7479
_ = cmd.MarkFlagRequired("start-date")
7580
_ = cmd.MarkFlagRequired("end-date")

‎internal/commands/stats/get.go‎

Lines changed: 11 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -187,11 +187,12 @@ var dateStatsColumns = []output.Column{
187187
}
188188

189189
type GetOptions struct {
190-
StartDate string
191-
EndDate string
192-
DomainIDs []string
193-
Streams []string
190+
StartDate string
191+
EndDate string
192+
DomainIDs []string
193+
Streams []string
194194
Categories []string
195+
ESPs []string
195196
}
196197

197198
func NewCmdGet(f *cmdutil.Factory) *cobra.Command {
@@ -219,11 +220,14 @@ func NewCmdGet(f *cmdutil.Factory) *cobra.Command {
219220
params.Add("sending_domain_ids[]", d)
220221
}
221222
for _, s := range opts.Streams {
222-
params.Add("streams[]", s)
223+
params.Add("sending_streams[]", s)
223224
}
224225
for _, cat := range opts.Categories {
225226
params.Add("categories[]", cat)
226227
}
228+
for _, esp := range opts.ESPs {
229+
params.Add("email_service_providers[]", esp)
230+
}
227231

228232
fullPath := fmt.Sprintf("%s?%s", path, params.Encode())
229233

@@ -242,8 +246,9 @@ func NewCmdGet(f *cmdutil.Factory) *cobra.Command {
242246
cmd.Flags().StringVar(&opts.StartDate, "start-date", "", "Start date (required)")
243247
cmd.Flags().StringVar(&opts.EndDate, "end-date", "", "End date (required)")
244248
cmd.Flags().StringSliceVar(&opts.DomainIDs, "domain-ids", nil, "Filter by domain IDs")
245-
cmd.Flags().StringSliceVar(&opts.Streams, "streams", nil, "Filter by streams")
249+
cmd.Flags().StringSliceVar(&opts.Streams, "streams", nil, "Filter by sending streams (e.g. transactional, bulk)")
246250
cmd.Flags().StringSliceVar(&opts.Categories, "categories", nil, "Filter by categories")
251+
cmd.Flags().StringSliceVar(&opts.ESPs, "esps", nil, "Filter by email service providers (e.g. Google, Yahoo)")
247252

248253
_ = cmd.MarkFlagRequired("start-date")
249254
_ = cmd.MarkFlagRequired("end-date")

0 commit comments

Comments
 (0)