Fix tests

3 files changed, 36 insertions, 32 deletions

diff --git a/server/guest/models.go b/server/guest/models.go
index 5cd1b8b..f792789 100644
--- a/server/guest/models.go
+++ b/server/guest/models.go
@@ -3,17 +3,17 @@ package guest
 import "github.com/golang-jwt/jwt/v5"
 
 type Guest struct {
-	ID         int          `json:"id"`
-	FirstName  string       `json:"firstName"`
-	LastName   string       `json:"lastName"`
-	Attendance string       `json:"attendance"`
-	Email      string       `json:"email"`
-	Message    string       `json:"message"`
-	PartySize  int          `json:"partySize"`
-	PartyList  []PartyGuest `json:"partyList"`
+	ID         int           `json:"id"`
+	FirstName  string        `json:"firstName"`
+	LastName   string        `json:"lastName"`
+	Attendance string        `json:"attendance"`
+	Email      string        `json:"email"`
+	Message    string        `json:"message"`
+	PartySize  int           `json:"partySize"`
+	PartyList  []PartyMember `json:"partyList"`
 }
 
-type PartyGuest struct {
+type PartyMember struct {
 	FirstName string `json:"firstName"`
 	LastName  string `json:"lastName"`
 }
diff --git a/server/guest/store.go b/server/guest/store.go
index 4290f8f..44fa6d7 100644
--- a/server/guest/store.go
+++ b/server/guest/store.go
@@ -65,13 +65,13 @@ func addParty(guestWithoutParty Guest, partyRows pgx.Rows) (Guest, error) {
 	guestWithParty := guestWithoutParty
 	for partyRows.Next() {
 		var guestID int
-		var partyGuest PartyGuest
-		err := partyRows.Scan(&guestID, &partyGuest.FirstName, &partyGuest.LastName)
+		var partyMember PartyMember
+		err := partyRows.Scan(&guestID, &partyMember.FirstName, &partyMember.LastName)
 		if err != nil {
 			return Guest{}, err
 		}
 		if guestID == guestWithParty.ID {
-			guestWithParty.PartyList = append(guestWithParty.PartyList, partyGuest)
+			guestWithParty.PartyList = append(guestWithParty.PartyList, partyMember)
 		}
 	}
 	return guestWithParty, nil
@@ -123,14 +123,14 @@ func addPartySlice(guestsWithoutParty []Guest,
 	guestsWithParty := guestsWithoutParty
 	for partyRows.Next() {
 		var guestID int
-		var partyGuest PartyGuest
-		err := partyRows.Scan(&guestID, &partyGuest.FirstName, &partyGuest.LastName)
+		var partyMember PartyMember
+		err := partyRows.Scan(&guestID, &partyMember.FirstName, &partyMember.LastName)
 		if err != nil {
 			return []Guest{}, err
 		}
 		for i, guest := range guestsWithParty {
 			if guestID == guest.ID {
-				guestsWithParty[i].PartyList = append(guest.PartyList, partyGuest)
+				guestsWithParty[i].PartyList = append(guest.PartyList, partyMember)
 			}
 		}
 	}
diff --git a/server/test/guest_test.go b/server/test/guest_test.go
index 26bd143..7a74443 100644
--- a/server/test/guest_test.go
+++ b/server/test/guest_test.go
@@ -36,12 +36,14 @@ func TestUpdateRSVP(test *testing.T) {
 	adminStore := admin.NewStore(databasePool)
 	adminHandler := admin.NewAdminHandler(adminStore, guestStore)
 
+	adminLogin := logInAdmin(adminHandler, test)
+	adminToken := adminLogin.Token
+	postGuest(guestHandler, adminToken, test)
+
 	guestLogin := logInGuest(guestHandler, test)
 	guestToken := guestLogin.Token
-	addPartyGuest(guestHandler, guestToken, test)
+	addPartyMember(guestHandler, guestToken, test)
 
-	adminLogin := logInAdmin(adminHandler, test)
-	adminToken := adminLogin.Token
 	guests := getGuests(guestHandler, adminToken, test)
 	guest := findGuest(guests)
 	assertEquals(test, guest.Attendance, "accept")
@@ -51,13 +53,14 @@ func TestUpdateRSVP(test *testing.T) {
 	assertEquals(test, guest.PartyList[0].FirstName, "Madison")
 	assertEquals(test, guest.PartyList[0].LastName, "Rossitto")
 
-	deletePartyGuest(guestHandler, guestToken, test)
+	deletePartyMember(guestHandler, guestToken, test)
 	guests = getGuests(guestHandler, adminToken, test)
 	guest = findGuest(guests)
 	assertEquals(test, guest.Attendance, "")
 	assertEquals(test, guest.Email, "")
 	assertEquals(test, guest.Message, "")
 	assertEquals(test, guest.PartySize, 1)
+	deleteGuest(guestHandler, adminToken, test)
 }
 
 func logInGuest(guestHandler *guest.GuestHandler, test *testing.T) guest.LoginResponse {
@@ -76,10 +79,10 @@ func logInGuest(guestHandler *guest.GuestHandler, test *testing.T) guest.LoginRe
 	return login
 }
 
-func addPartyGuest(guestHandler *guest.GuestHandler, token string, test *testing.T) {
+func addPartyMember(guestHandler *guest.GuestHandler, token string, test *testing.T) {
 	response := httptest.NewRecorder()
 	putRequest, err := http.NewRequest(http.MethodPut, "http://localhost:8080/guests/1",
-		strings.NewReader(getGuestWithParty()))
+		strings.NewReader(getUpdatedGuest()))
 	if err != nil {
 		test.Error(err)
 	}
@@ -120,10 +123,10 @@ func getGuests(guestHandler *guest.GuestHandler, token string, test *testing.T)
 	return guests
 }
 
-func deletePartyGuest(guestHandler *guest.GuestHandler, token string, test *testing.T) {
+func deletePartyMember(guestHandler *guest.GuestHandler, token string, test *testing.T) {
 	response := httptest.NewRecorder()
 	putRequest, err := http.NewRequest(http.MethodPut, "http://localhost:8080/guests/1",
-		strings.NewReader(getGuestWithoutParty()))
+		strings.NewReader(getEmptyGuest()))
 	if err != nil {
 		test.Error(err)
 	}
@@ -156,13 +159,13 @@ func getCredentials() string {
 	return "{ \"username\": \"mhunteman\", \"password\": \"password\"}"
 }
 
-func getGuestWithParty() string {
+func getUpdatedGuest() string {
 	return `{"id":1,"firstName":"Michael","lastName":"Hunteman", "attendance":"accept",
 		"email":"mhunteman@cox.net","message":"We'll be there!","partySize":2,
 		"partyList":[{"firstName":"Madison","lastName":"Rossitto"}]}`
 }
 
-func getGuestWithoutParty() string {
+func getEmptyGuest() string {
 	return `{"id":1,"firstName":"Michael","lastName":"Hunteman","attendance":"",
 		"email":"","message":"","partySize":1,"partyList":[]}`
 }
@@ -181,18 +184,19 @@ func TestAddGuest(test *testing.T) {
 
 	adminLogin := logInAdmin(adminHandler, test)
 	adminToken := adminLogin.Token
+	deleteGuest(guestHandler, adminToken, test)
 	guests := getGuests(guestHandler, adminToken, test)
 	assertEquals(test, findGuest(guests), findGuest([]guest.Guest{}))
 	postGuest(guestHandler, adminToken, test)
 
 	guests = getGuests(guestHandler, adminToken, test)
 	guest := findGuest(guests)
-	assertEquals(test, guest.Attendance, "accept")
-	assertEquals(test, guest.Email, "mhunteman@cox.net")
-	assertEquals(test, guest.Message, "We'll be there!")
-	assertEquals(test, guest.PartySize, 2)
-	assertEquals(test, guest.PartyList[0].FirstName, "Madison")
-	assertEquals(test, guest.PartyList[0].LastName, "Rossitto")
+	assertEquals(test, guest.FirstName, "Michael")
+	assertEquals(test, guest.LastName, "Hunteman")
+	assertEquals(test, guest.Attendance, "")
+	assertEquals(test, guest.Email, "")
+	assertEquals(test, guest.Message, "")
+	assertEquals(test, guest.PartySize, 1)
 	deleteGuest(guestHandler, adminToken, test)
 }
 
@@ -210,7 +214,7 @@ func deleteGuest(guestHandler *guest.GuestHandler, token string, test *testing.T
 func postGuest(guestHandler *guest.GuestHandler, token string, test *testing.T) {
 	response := httptest.NewRecorder()
 	putRequest, err := http.NewRequest(http.MethodPost, "http://localhost:8080/guests/",
-		strings.NewReader(getGuestWithParty()))
+		strings.NewReader(getEmptyGuest()))
 	if err != nil {
 		test.Error(err)
 	}