Add ticket type to notification message

test/assets/message.md

@@ -0,0 +1,10 @@
+Test Venue, Test Location
+Monday 1 January 0001 12:00am
+
+2 ticket(s) - Standing
+Ticket Price: £1.50
+Total Price: £3.00
+Discount: 25.00%
+
+Original Ticket Price: £2.00
+Original Total Price: £4.00

test/testutils/path.go

@@ -31,6 +31,10 @@ func ProjectDirectory(t *testing.T) string {
 
 // ProjectDirectoryJoinPath returns a path joined to the project directory.
 // See `ProjectDirectory` for more information
-func ProjectDirectoryJoin(t *testing.T, path string) string {
-	return filepath.Join(ProjectDirectory(t), path)
+func ProjectDirectoryJoin(t *testing.T, pathElems ...string) string {
+	pathElems = append(
+		[]string{ProjectDirectory(t)},
+		pathElems...,
+	)
+	return filepath.Join(pathElems...)
 }

twickets/notification/gotify.go

@@ -25,7 +25,7 @@ type GotifyClient struct {
 var _ Client = GotifyClient{}
 
 func (g GotifyClient) SendTicketNotification(ticket twickets.Ticket) error {
-	notificationMessage, err := renderMessage(ticket, true)
+	notificationMessage, err := RenderMessage(ticket)
 	if err != nil {
 		return err
 	}

twickets/notification/notification.go

@@ -29,10 +29,11 @@ type Client interface {
 }
 
 type MessageTemplateData struct {
-	Venue               string
-	Location            string
 	Date                string
 	Time                string
+	Venue               string
+	Location            string
+	TicketType          string // Standing, Stalls etc.
 	NumTickets          int
 	TotalTicketPrice    string
 	TotalPrice          string
@@ -42,22 +43,20 @@ type MessageTemplateData struct {
 	Link                string
 }
 
-func renderMessage(ticket twickets.Ticket, includeLink bool) (string, error) { // nolint: revive
+func RenderMessage(ticket twickets.Ticket) (string, error) {
 	templateData := MessageTemplateData{
-		Venue:               ticket.Event.Venue.Name,
-		Location:            ticket.Event.Venue.Location.Name,
 		Date:                ticket.Event.Date.Format("Monday 2 January 2006"),
 		Time:                ticket.Event.Time.Format("3:04pm"),
+		Venue:               ticket.Event.Venue.Name,
+		Location:            ticket.Event.Venue.Location.Name,
+		TicketType:          ticket.TicketType,
 		NumTickets:          ticket.TicketQuantity,
 		TotalTicketPrice:    ticket.TotalTicketPrice().String(),
 		TotalPrice:          ticket.TotalPrice().String(),
 		OriginalTicketPrice: ticket.OriginalTicketPrice().String(),
 		OriginalTotalPrice:  ticket.OriginalTotalPrice.String(),
 		Discount:            ticket.Discount(),
 	}
-	if includeLink {
-		templateData.Link = ticket.Link()
-	}
 
 	var buffer bytes.Buffer
 	err := messageTemplate.Execute(&buffer, templateData)

twickets/notification/notification_test.go

@@ -1,6 +1,14 @@
 package notification_test
 
-import "github.com/ahobsonsayers/twitchets/twickets"
+import (
+	"os"
+	"testing"
+
+	"github.com/ahobsonsayers/twitchets/test/testutils"
+	"github.com/ahobsonsayers/twitchets/twickets"
+	"github.com/ahobsonsayers/twitchets/twickets/notification"
+	"github.com/stretchr/testify/require"
+)
 
 func testNotificationTicket() twickets.Ticket {
 	return twickets.Ticket{
@@ -14,6 +22,7 @@ func testNotificationTicket() twickets.Ticket {
 				},
 			},
 		},
+		TicketType:     "Standing",
 		TicketQuantity: 2,
 		TicketsPrice: twickets.Price{
 			Currency: twickets.CurrencyGBP,
@@ -29,3 +38,16 @@ func testNotificationTicket() twickets.Ticket {
 		},
 	}
 }
+
+func TestRenderMessage(t *testing.T) {
+	expectedMessagePath := testutils.ProjectDirectoryJoin(t, "test", "assets", "message.md")
+	expectedMessageBytes, err := os.ReadFile(expectedMessagePath)
+	require.NoError(t, err)
+	expectedMessage := string(expectedMessageBytes)
+
+	tickets := testNotificationTicket()
+	actualMessage, err := notification.RenderMessage(tickets)
+	require.NoError(t, err)
+
+	require.Equal(t, expectedMessage, actualMessage)
+}

twickets/notification/ntfy.go

@@ -23,7 +23,7 @@ type NtfyClient struct {
 var _ Client = NtfyClient{}
 
 func (c NtfyClient) SendTicketNotification(ticket twickets.Ticket) error {
-	notificationMessage, err := renderMessage(ticket, false)
+	notificationMessage, err := RenderMessage(ticket)
 	if err != nil {
 		return err
 	}

twickets/notification/template/message.tmpl.md

@@ -1,7 +1,7 @@
 {{ .Venue }}, {{ .Location }}
 {{ .Date }} {{ .Time }}
 
-Number: {{ .NumTickets }} ticket(s)
+{{ .NumTickets }} ticket(s) - {{ .TicketType }}
 Ticket Price: {{ .TotalTicketPrice }}
 Total Price: {{ .TotalPrice }}
 {{ if lt .Discount 0.0 -}}
@@ -12,7 +12,3 @@ Discount: {{ printf "%.2f" .Discount }}%
 
 Original Ticket Price: {{ .OriginalTicketPrice }}
 Original Total Price: {{ .OriginalTotalPrice }}
-
-{{ if ne .Link "" -}}
-Buy: {{ .Link }}
-{{- end }}