Skip to content

update campaigns create to match api changes #60

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
notnmeyer merged 1 commit into from
Apr 27, 2026
Merged

update campaigns create to match api changes #60

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
50 changes: 5 additions & 45 deletions cmd/campaigns.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,29 +2,23 @@ package cmd

import (
"fmt"
"strings"

"github.com/loops-so/cli/internal/api"
"github.com/loops-so/cli/internal/config"
"github.com/spf13/cobra"
)

func fromEmailUsername(s string) string {
before, _, _ := strings.Cut(s, "@")
return before
}

func runCampaignsGet(cfg *config.Config, id string) (*api.Campaign, error) {
return newAPIClient(cfg).GetCampaign(id)
}

func runCampaignsList(cfg *config.Config, params api.PaginationParams) ([]api.Campaign, error) {
func runCampaignsList(cfg *config.Config, params api.PaginationParams) ([]api.CampaignListItem, error) {
client := newAPIClient(cfg)
if params.Cursor != "" {
campaigns, _, err := client.ListCampaigns(params)
return campaigns, err
}
return api.Paginate(func(cursor string) ([]api.Campaign, *api.Pagination, error) {
return api.Paginate(func(cursor string) ([]api.CampaignListItem, *api.Pagination, error) {
return client.ListCampaigns(api.PaginationParams{
PerPage: params.PerPage,
Cursor: cursor,
Expand Down Expand Up @@ -53,7 +47,7 @@ var campaignsListCmd = &cobra.Command{

if isJSONOutput() {
if campaigns == nil {
campaigns = []api.Campaign{}
campaigns = []api.CampaignListItem{}
}
return printJSON(cmd.OutOrStdout(), campaigns)
}
Expand Down Expand Up @@ -87,29 +81,13 @@ var campaignsCreateCmd = &cobra.Command{
Short: "Create a draft campaign",
RunE: func(cmd *cobra.Command, args []string) error {
name, _ := cmd.Flags().GetString("name")
params, err := emailMessageFieldParamsFromCmd(cmd)
if err != nil {
return err
}

req := api.CreateCampaignRequest{Name: name}
if len(params.Set) > 0 {
req.EmailMessage = &api.EmailMessageFields{
Subject: params.Subject,
PreviewText: params.PreviewText,
FromName: params.FromName,
FromEmail: params.FromEmail,
ReplyToEmail: params.ReplyToEmail,
LMX: params.LMX,
}
}

cfg, err := loadConfig()
if err != nil {
return err
}

resp, err := runCampaignsCreate(cfg, req)
resp, err := runCampaignsCreate(cfg, api.CreateCampaignRequest{Name: name})
if err != nil {
return err
}
Expand All @@ -118,24 +96,7 @@ var campaignsCreateCmd = &cobra.Command{
return printJSON(cmd.OutOrStdout(), resp)
}

emailMessageID := ""
if resp.EmailMessage != nil {
emailMessageID = resp.EmailMessage.EmailMessageID
}
fmt.Fprintf(cmd.OutOrStdout(), "Created. (id: %s, emailMessageId: %s)\n", resp.CampaignID, emailMessageID)

if len(resp.Warnings) > 0 {
fmt.Fprintln(cmd.OutOrStdout())
fmt.Fprintln(cmd.OutOrStdout(), "Warnings:")
for _, warn := range resp.Warnings {
if warn.Path != "" {
fmt.Fprintf(cmd.OutOrStdout(), " [%s] %s (%s)\n", warn.Rule, warn.Message, warn.Path)
} else {
fmt.Fprintf(cmd.OutOrStdout(), " [%s] %s\n", warn.Rule, warn.Message)
}
}
}

fmt.Fprintf(cmd.OutOrStdout(), "Created. (id: %s, emailMessageId: %s, contentRevisionId: %s)\n", resp.CampaignID, deref(resp.EmailMessageID), deref(resp.EmailMessageContentRevisionID))
return nil
},
}
Expand Down Expand Up @@ -176,7 +137,6 @@ func init() {
campaignsCmd.AddCommand(campaignsGetCmd)

campaignsCreateCmd.Flags().StringP("name", "n", "", "Campaign name (required)")
addEmailMessageFieldFlags(campaignsCreateCmd)
campaignsCreateCmd.MarkFlagRequired("name")
campaignsCmd.AddCommand(campaignsCreateCmd)

Expand Down
41 changes: 7 additions & 34 deletions cmd/campaigns_create_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,18 +15,8 @@ func TestRunCampaignsCreate(t *testing.T) {
"status": "Draft",
"createdAt": "2026-04-20T10:00:00Z",
"updatedAt": "2026-04-20T10:00:00Z",
"emailMessage": {
"emailMessageId": "em_new",
"campaignId": "cmp_new",
"subject": "Hello",
"previewText": "",
"fromName": "",
"fromEmail": "",
"replyToEmail": "",
"lmx": "",
"contentRevisionId": "rev_1",
"updatedAt": "2026-04-20T10:00:00Z"
}
"emailMessageId": "em_new",
"emailMessageContentRevisionId": "rev_1"
}`

t.Run("returns response on success", func(t *testing.T) {
Expand All @@ -38,8 +28,11 @@ func TestRunCampaignsCreate(t *testing.T) {
if resp.CampaignID != "cmp_new" {
t.Errorf("CampaignID = %q, want cmp_new", resp.CampaignID)
}
if resp.EmailMessage == nil || resp.EmailMessage.EmailMessageID != "em_new" {
t.Errorf("EmailMessage = %v, want em_new", resp.EmailMessage)
if deref(resp.EmailMessageID) != "em_new" {
t.Errorf("EmailMessageID = %q, want em_new", deref(resp.EmailMessageID))
}
if deref(resp.EmailMessageContentRevisionID) != "rev_1" {
t.Errorf("EmailMessageContentRevisionID = %q, want rev_1", deref(resp.EmailMessageContentRevisionID))
}
})

Expand All @@ -51,23 +44,3 @@ func TestRunCampaignsCreate(t *testing.T) {
}
})
}

func TestFromEmailUsername(t *testing.T) {
tests := []struct {
in string
want string
}{
{"hello", "hello"},
{"hello@acme.com", "hello"},
{"hello@", "hello"},
{"", ""},
{"@acme.com", ""},
}
for _, tt := range tests {
t.Run(tt.in, func(t *testing.T) {
if got := fromEmailUsername(tt.in); got != tt.want {
t.Errorf("fromEmailUsername(%q) = %q, want %q", tt.in, got, tt.want)
}
})
}
}
6 changes: 6 additions & 0 deletions cmd/email_messages.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,18 @@ package cmd
import (
"fmt"
"os"
"strings"

"github.com/loops-so/cli/internal/api"
"github.com/loops-so/cli/internal/config"
"github.com/spf13/cobra"
)

func fromEmailUsername(s string) string {
before, _, _ := strings.Cut(s, "@")
return before
}

// emailMessageFieldParams holds the six content fields shared by
// `campaigns create` and `email-messages update`. Set records which fields the
// user explicitly provided (keyed by JSON field name) so partial updates can
Expand Down
20 changes: 20 additions & 0 deletions cmd/email_messages_update_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,26 @@ func TestRunEmailMessagesUpdate(t *testing.T) {
})
}

func TestFromEmailUsername(t *testing.T) {
tests := []struct {
in string
want string
}{
{"hello", "hello"},
{"hello@acme.com", "hello"},
{"hello@", "hello"},
{"", ""},
{"@acme.com", ""},
}
for _, tt := range tests {
t.Run(tt.in, func(t *testing.T) {
if got := fromEmailUsername(tt.in); got != tt.want {
t.Errorf("fromEmailUsername(%q) = %q, want %q", tt.in, got, tt.want)
}
})
}
}

func TestEmailMessageFieldParamsFromCmd(t *testing.T) {
t.Run("unset flags are absent from Set", func(t *testing.T) {
cmd := &cobra.Command{}
Expand Down
27 changes: 15 additions & 12 deletions internal/api/campaigns.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,15 @@ import (
)

type Campaign struct {
CampaignID string `json:"campaignId"`
EmailMessageID *string `json:"emailMessageId"`
Name string `json:"name"`
Status string `json:"status"`
CreatedAt string `json:"createdAt"`
UpdatedAt string `json:"updatedAt"`
}

type CampaignListItem struct {
CampaignID string `json:"campaignId"`
EmailMessageID *string `json:"emailMessageId"`
Name string `json:"name"`
Expand All @@ -35,18 +44,12 @@ type EmailMessageFields struct {
}

type CreateCampaignRequest struct {
Name string `json:"name"`
EmailMessage *EmailMessageFields `json:"emailMessage,omitempty"`
Name string `json:"name"`
}

type CampaignCreateResponse struct {
CampaignID string `json:"campaignId"`
Name string `json:"name"`
Status string `json:"status"`
CreatedAt string `json:"createdAt"`
UpdatedAt string `json:"updatedAt"`
EmailMessage *EmailMessage `json:"emailMessage,omitempty"`
Warnings []LmxWarning `json:"warnings,omitempty"`
Campaign
EmailMessageContentRevisionID *string `json:"emailMessageContentRevisionId"`
}

func (c *Client) CreateCampaign(req CreateCampaignRequest) (*CampaignCreateResponse, error) {
Expand Down Expand Up @@ -102,7 +105,7 @@ func (c *Client) GetCampaign(id string) (*Campaign, error) {
return &result, nil
}

func (c *Client) ListCampaigns(params PaginationParams) ([]Campaign, *Pagination, error) {
func (c *Client) ListCampaigns(params PaginationParams) ([]CampaignListItem, *Pagination, error) {
q := url.Values{}
if params.PerPage != "" {
q.Set("perPage", params.PerPage)
Expand Down Expand Up @@ -132,8 +135,8 @@ func (c *Client) ListCampaigns(params PaginationParams) ([]Campaign, *Pagination
}

var result struct {
Pagination Pagination `json:"pagination"`
Data []Campaign `json:"data"`
Pagination Pagination `json:"pagination"`
Data []CampaignListItem `json:"data"`
}
if err := json.NewDecoder(resp.Body).Decode(&result); err != nil {
return nil, nil, fmt.Errorf("failed to decode response: %w", err)
Expand Down
Loading