Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
7 changes: 6 additions & 1 deletion internal/commands/stats/by_category.go
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ type ByCategoryOptions struct {
DomainIDs []string
Streams []string
Categories []string
ESPs []string
}

func NewCmdByCategory(f *cmdutil.Factory) *cobra.Command {
Expand Down Expand Up @@ -50,6 +51,9 @@ func NewCmdByCategory(f *cmdutil.Factory) *cobra.Command {
for _, cat := range opts.Categories {
params.Add("categories[]", cat)
}
for _, esp := range opts.ESPs {
params.Add("email_service_providers[]", esp)
}

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

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

_ = cmd.MarkFlagRequired("start-date")
_ = cmd.MarkFlagRequired("end-date")
Expand Down
7 changes: 6 additions & 1 deletion internal/commands/stats/by_date.go
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ type ByDateOptions struct {
DomainIDs []string
Streams []string
Categories []string
ESPs []string
}

func NewCmdByDate(f *cmdutil.Factory) *cobra.Command {
Expand Down Expand Up @@ -50,6 +51,9 @@ func NewCmdByDate(f *cmdutil.Factory) *cobra.Command {
for _, cat := range opts.Categories {
params.Add("categories[]", cat)
}
for _, esp := range opts.ESPs {
params.Add("email_service_providers[]", esp)
}

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

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

_ = cmd.MarkFlagRequired("start-date")
_ = cmd.MarkFlagRequired("end-date")
Expand Down
7 changes: 6 additions & 1 deletion internal/commands/stats/by_domain.go
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ type ByDomainOptions struct {
DomainIDs []string
Streams []string
Categories []string
ESPs []string
}

func NewCmdByDomain(f *cmdutil.Factory) *cobra.Command {
Expand Down Expand Up @@ -50,6 +51,9 @@ func NewCmdByDomain(f *cmdutil.Factory) *cobra.Command {
for _, cat := range opts.Categories {
params.Add("categories[]", cat)
}
for _, esp := range opts.ESPs {
params.Add("email_service_providers[]", esp)
}

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

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

_ = cmd.MarkFlagRequired("start-date")
_ = cmd.MarkFlagRequired("end-date")
Expand Down
7 changes: 6 additions & 1 deletion internal/commands/stats/by_esp.go
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ type ByESPOptions struct {
DomainIDs []string
Streams []string
Categories []string
ESPs []string
}

func NewCmdByESP(f *cmdutil.Factory) *cobra.Command {
Expand Down Expand Up @@ -50,6 +51,9 @@ func NewCmdByESP(f *cmdutil.Factory) *cobra.Command {
for _, cat := range opts.Categories {
params.Add("categories[]", cat)
}
for _, esp := range opts.ESPs {
params.Add("email_service_providers[]", esp)
}

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

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

_ = cmd.MarkFlagRequired("start-date")
_ = cmd.MarkFlagRequired("end-date")
Expand Down
17 changes: 11 additions & 6 deletions internal/commands/stats/get.go
Original file line number Diff line number Diff line change
Expand Up @@ -187,11 +187,12 @@ var dateStatsColumns = []output.Column{
}

type GetOptions struct {
StartDate string
EndDate string
DomainIDs []string
Streams []string
StartDate string
EndDate string
DomainIDs []string
Streams []string
Categories []string
ESPs []string
}

func NewCmdGet(f *cmdutil.Factory) *cobra.Command {
Expand Down Expand Up @@ -219,11 +220,14 @@ func NewCmdGet(f *cmdutil.Factory) *cobra.Command {
params.Add("sending_domain_ids[]", d)
}
for _, s := range opts.Streams {
params.Add("streams[]", s)
params.Add("sending_streams[]", s)
}
for _, cat := range opts.Categories {
params.Add("categories[]", cat)
}
for _, esp := range opts.ESPs {
params.Add("email_service_providers[]", esp)
}

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

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

_ = cmd.MarkFlagRequired("start-date")
_ = cmd.MarkFlagRequired("end-date")
Expand Down
Loading