From 895bddce2c42e7acb631c23914d2f3568a498c3a Mon Sep 17 00:00:00 2001 From: Sam Anthony Date: Wed, 29 Jul 2026 15:16:34 -0230 Subject: rename LineItems to Items --- cmd/lulu/job.go | 2 +- cmd/lulu/jobs.go | 2 +- lulu.go | 2 +- print.go | 4 ++-- print_test.go | 22 +++++++++++----------- 5 files changed, 16 insertions(+), 16 deletions(-) diff --git a/cmd/lulu/job.go b/cmd/lulu/job.go index 0678337..b12fbe7 100644 --- a/cmd/lulu/job.go +++ b/cmd/lulu/job.go @@ -37,7 +37,7 @@ func (cmd JobCmd) Run(clnt *lulu.Client) error { if err := w.Indent(); err != nil { return err } - for _, item := range job.LineItems { + for _, item := range job.Items { print(w, "extid", item.ExternalId) print(w, "id", item.Id) print(w, "printable-id", item.PrintableId) diff --git a/cmd/lulu/jobs.go b/cmd/lulu/jobs.go index 19deb35..98d656b 100644 --- a/cmd/lulu/jobs.go +++ b/cmd/lulu/jobs.go @@ -39,7 +39,7 @@ func (cmd JobsCmd) Run(clnt *lulu.Client) error { job.ExternalId, job.Id, job.OrderId, - len(job.LineItems), + len(job.Items), fmt.Sprintf("%s%s", job.Cost.TotalCostInclTax, job.Cost.Currency), job.Status.Status) } diff --git a/lulu.go b/lulu.go index ae7bf23..c3838dc 100644 --- a/lulu.go +++ b/lulu.go @@ -340,7 +340,7 @@ func print[P Printable | Reprintable](c *Client, contact EmailAddress, externalI req := printReq[P]{ Contact: contact, ExternalId: externalId, - LineItems: items, + Items: items, ProductionDelayMins: uint(productionDelay.Round(time.Minute).Minutes()), ShipAddr: addr, ShipOpt: shipOpt, diff --git a/print.go b/print.go index 8157eb0..be701b2 100644 --- a/print.go +++ b/print.go @@ -14,7 +14,7 @@ const ( type printReq[P Printable | Reprintable] struct { Contact EmailAddress `json:"contact_email"` ExternalId string `json:"external_id"` - LineItems []P `json:"line_items"` + Items []P `json:"line_items"` ProductionDelayMins uint `json:"production_delay"` ShipAddr ShippingAddress `json:"shipping_address"` ShipOpt ShippingLevel `json:"shipping_level"` @@ -97,7 +97,7 @@ type PrintJob struct { Id uint64 `json:"id"` - LineItems []LineItem `json:"line_items"` + Items []LineItem `json:"line_items"` OrderId string `json:"order_id"` diff --git a/print_test.go b/print_test.go index 6ff55ba..23d54c8 100644 --- a/print_test.go +++ b/print_test.go @@ -77,7 +77,7 @@ var printJobSample = PrintJob{ }, ExternalId: "demo-time", Id: 1, - LineItems: []LineItem{{ + Items: []LineItem{{ ExternalId: "item-reference-1", Id: 1, PrintableId: "", @@ -119,7 +119,7 @@ func TestMarshalPrintReq(t *testing.T) { req := printReq[Printable]{ Contact: MustParseEmailAddress("test@test.com"), ExternalId: "demo-time", - LineItems: []Printable{{ + Items: []Printable{{ ExternalId: "item-reference-1", CoverUrl: "https://www.dropbox.com/s/7bv6mg2tj0h3l0r/lulu_trade_perfect_template.pdf?dl=1&raw=1", InteriorUrl: "https://www.dropbox.com/s/r20orb8umqjzav9/lulu_trade_interior_template-32.pdf?dl=1&raw=1", @@ -141,7 +141,7 @@ func TestMarshalReprintReq(t *testing.T) { req := printReq[Reprintable]{ Contact: MustParseEmailAddress("test@test.com"), ExternalId: "demo-time", - LineItems: []Reprintable{{ + Items: []Reprintable{{ ExternalId: "item-reference-1", PrintableId: PrintableId("11606ab3-9355-46d3-ae90-338db6f5d271"), Quantity: 30, @@ -180,8 +180,8 @@ func TestPrint(t *testing.T) { requireAfter(t, job.Modified, startTime) require.Equal(t, jobEid, job.ExternalId) require.NotZero(t, job.Id) - require.Len(t, job.LineItems, 1) - jobItem := job.LineItems[0] + require.Len(t, job.Items, 1) + jobItem := job.Items[0] require.Equal(t, item.ExternalId, jobItem.ExternalId) require.NotZero(t, jobItem.Id) require.Equal(t, item.CoverUrl, jobItem.PrintableNormalization.Cover.SrcUrl) @@ -214,12 +214,12 @@ func TestReprint(t *testing.T) { tpoll(t, func() bool { job1, err = c.Job(id1) require.NoError(t, err) - require.Len(t, job1.LineItems, 1) - return job1.LineItems[0].Status.Status != ItemCreated + require.Len(t, job1.Items, 1) + return job1.Items[0].Status.Status != ItemCreated }) t.Logf("Job 1: %#v\n", job1) - require.Len(t, job1.LineItems, 1) - pid := job1.LineItems[0].PrintableId + require.Len(t, job1.Items, 1) + pid := job1.Items[0].PrintableId require.NotEmpty(t, pid) // Reprint @@ -231,8 +231,8 @@ func TestReprint(t *testing.T) { } job2, err := c.Reprint(contact, "reprint", productionDelay, addr, shipOpt, []Reprintable{reprintItem}) require.NoError(t, err) - require.Len(t, job2.LineItems, 1) - item1, item2 := job1.LineItems[0], job2.LineItems[0] + require.Len(t, job2.Items, 1) + item1, item2 := job1.Items[0], job2.Items[0] require.Equal(t, item1.PrintableId, item2.PrintableId) require.Equal(t, item1.ExternalId, item2.ExternalId) require.Equal(t, item1.Title, item2.Title) -- cgit v1.2.3