Merge pull request #26 from umamiMike/main

updates for functioning build in domain-hex

domain-hex/cmd/sample-data/sample_reviews.go

@@ -3,10 +3,10 @@ package main
 import "github.com/katzien/go-structure-examples/domain-hex/pkg/reviewing"
 
 var DefaultReviews = []reviewing.Review{
-	{BeerID: 1, FirstName: "Joe", LastName: "Tribiani", Score: 5, Text: "This is good but this is not pizza!"},
-	{BeerID: 2, FirstName: "Chandler", LastName: "Bing", Score: 1, Text: "I would SO NOT drink this ever again."},
-	{BeerID: 1, FirstName: "Ross", LastName: "Geller", Score: 4, Text: "Drank while on a break, was pretty good!"},
-	{BeerID: 2, FirstName: "Phoebe", LastName: "Buffay", Score: 2, Text: "Wasn't that great, so I gave it to my smelly cat."},
-	{BeerID: 1, FirstName: "Monica", LastName: "Geller", Score: 5, Text: "AMAZING! Like Chandler's jokes!"},
-	{BeerID: 2, FirstName: "Rachel", LastName: "Green", Score: 5, Text: "So yummy, just like my beef and custard trifle."},
+	{BeerID: "1", FirstName: "Joe", LastName: "Tribiani", Score: 5, Text: "This is good but this is not pizza!"},
+	{BeerID: "2", FirstName: "Chandler", LastName: "Bing", Score: 1, Text: "I would SO NOT drink this ever again."},
+	{BeerID: "1", FirstName: "Ross", LastName: "Geller", Score: 4, Text: "Drank while on a break, was pretty good!"},
+	{BeerID: "2", FirstName: "Phoebe", LastName: "Buffay", Score: 2, Text: "Wasn't that great, so I gave it to my smelly cat."},
+	{BeerID: "1", FirstName: "Monica", LastName: "Geller", Score: 5, Text: "AMAZING! Like Chandler's jokes!"},
+	{BeerID: "2", FirstName: "Rachel", LastName: "Green", Score: 5, Text: "So yummy, just like my beef and custard trifle."},
 }

domain-hex/pkg/http/rest/handler.go

@@ -37,7 +37,7 @@ func addBeer(s adding.Service) func(w http.ResponseWriter, r *http.Request, _ ht
 			return
 		}
 
-		_ := s.AddBeer(newBeer)
+		s.AddBeer(newBeer)
 		// error handling omitted for simplicity
 
 		w.Header().Set("Content-Type", "application/json")
@@ -48,20 +48,14 @@ func addBeer(s adding.Service) func(w http.ResponseWriter, r *http.Request, _ ht
 // addBeerReview returns a handler for POST /beers/:id/reviews requests
 func addBeerReview(s reviewing.Service) func(w http.ResponseWriter, r *http.Request, p httprouter.Params) {
 	return func(w http.ResponseWriter, r *http.Request, p httprouter.Params) {
-		ID, err := strconv.Atoi(p.ByName("id"))
-		if err != nil {
-			http.Error(w, fmt.Sprintf("%s is not a valid Beer ID, it must be a number.", p.ByName("id")), http.StatusBadRequest)
-			return
-		}
-
 		var newReview reviewing.Review
 		decoder := json.NewDecoder(r.Body)
 
 		if err := decoder.Decode(&newReview); err != nil {
 			http.Error(w, "Failed to parse review", http.StatusBadRequest)
 		}
 
-		newReview.BeerID = ID
+		newReview.BeerID = p.ByName("id")
 
 		s.AddBeerReview(newReview)
 
@@ -82,13 +76,7 @@ func getBeers(s listing.Service) func(w http.ResponseWriter, r *http.Request, _
 // getBeer returns a handler for GET /beers/:id requests
 func getBeer(s listing.Service) func(w http.ResponseWriter, r *http.Request, p httprouter.Params) {
 	return func(w http.ResponseWriter, r *http.Request, p httprouter.Params) {
-		ID, err := strconv.Atoi(p.ByName("id"))
-		if err != nil {
-			http.Error(w, fmt.Sprintf("%s is not a valid beer ID, it must be a number.", p.ByName("id")), http.StatusBadRequest)
-			return
-		}
-
-		beer, err := s.GetBeer(ID)
+		beer, err := s.GetBeer(p.ByName("id"))
 		if err == listing.ErrNotFound {
 			http.Error(w, "The beer you requested does not exist.", http.StatusNotFound)
 			return
@@ -102,13 +90,7 @@ func getBeer(s listing.Service) func(w http.ResponseWriter, r *http.Request, p h
 // getBeerReviews returns a handler for GET /beers/:id/reviews requests
 func getBeerReviews(s listing.Service) func(w http.ResponseWriter, r *http.Request, p httprouter.Params) {
 	return func(w http.ResponseWriter, r *http.Request, p httprouter.Params) {
-		ID, err := strconv.Atoi(p.ByName("id"))
-		if err != nil {
-			http.Error(w, fmt.Sprintf("%s is not a valid beer ID, it must be a number.", p.ByName("id")), http.StatusBadRequest)
-			return
-		}
-
-		reviews := s.GetBeerReviews(ID)
+		reviews := s.GetBeerReviews(p.ByName("id"))
 
 		w.Header().Set("Content-Type", "application/json")
 		json.NewEncoder(w).Encode(reviews)