working apiservice

Author: prune998

src/apiservice/README.md

@@ -1,5 +1,9 @@
-# frontend
+# apiservice
 
-Run the following command to restore dependencies to `vendor/` directory:
+This is a stripped down version of the `frontend` application that just return json.
+ex:
 
-    dep ensure --vendor-only
+```
+curl -s "http://apiservice:8080/api/v1/"|jq '.'
+curl -s "http://apiservice:8080/api/v1/product/OLJCESPC7Z"|jq '.'
+```

src/apiservice/handlers.go

@@ -18,9 +18,9 @@ import (
 	"context"
 	"encoding/json"
 	"fmt"
-	"html/template"
 	"math/rand"
 	"net/http"
+	"os"
 	"strconv"
 	"time"
 
@@ -32,12 +32,56 @@ import (
 	"github.com/GoogleCloudPlatform/microservices-demo/src/frontend/money"
 )
 
-var (
-	templates = template.Must(template.New("").
-		Funcs(template.FuncMap{
-			"renderMoney": renderMoney,
-		}).ParseGlob("templates/*.html"))
-)
+func (fe *frontendServer) homeHandler(w http.ResponseWriter, r *http.Request) {
+	log := r.Context().Value(ctxKeyLog{}).(logrus.FieldLogger)
+	log.WithField("currency", currentCurrency(r)).Info("home")
+	currencies, err := fe.getCurrencies(r.Context())
+	if err != nil {
+		renderHTTPError(log, r, w, errors.Wrap(err, "could not retrieve currencies"), http.StatusInternalServerError)
+		return
+	}
+	products, err := fe.getProducts(r.Context())
+	if err != nil {
+		renderHTTPError(log, r, w, errors.Wrap(err, "could not retrieve products"), http.StatusInternalServerError)
+		return
+	}
+	cart, err := fe.getCart(r.Context(), sessionID(r))
+	if err != nil {
+		renderHTTPError(log, r, w, errors.Wrap(err, "could not retrieve cart"), http.StatusInternalServerError)
+		return
+	}
+
+	type productView struct {
+		Item  *pb.Product
+		Price *pb.Money
+	}
+	ps := make([]productView, len(products))
+	for i, p := range products {
+		price, err := fe.convertCurrency(r.Context(), p.GetPriceUsd(), currentCurrency(r))
+		if err != nil {
+			renderHTTPError(log, r, w, errors.Wrapf(err, "failed to do currency conversion for product %s", p.GetId()), http.StatusInternalServerError)
+			return
+		}
+		ps[i] = productView{p, price}
+	}
+
+	finalData := map[string]interface{}{
+		"session_id":    sessionID(r),
+		"request_id":    r.Context().Value(ctxKeyRequestID{}),
+		"user_currency": currentCurrency(r),
+		"currencies":    currencies,
+		"products":      ps,
+		"cart_size":     len(cart),
+		"banner_color":  os.Getenv("BANNER_COLOR"), // illustrates canary deployments
+		"ad":            fe.chooseAd(r.Context(), []string{}, log),
+	}
+
+	b, err := json.Marshal(finalData)
+	if err != nil {
+		log.Println(err)
+	}
+	w.Write(b)
+}
 
 func (fe *frontendServer) productHandler(w http.ResponseWriter, r *http.Request) {
 	log := r.Context().Value(ctxKeyLog{}).(logrus.FieldLogger)
@@ -68,9 +112,9 @@ func (fe *frontendServer) productHandler(w http.ResponseWriter, r *http.Request)
 
 	b, err := json.Marshal(product)
 	if err != nil {
-		log.Println(b)
+		log.Println(err)
 	}
-
+	w.Write(b)
 }
 
 func (fe *frontendServer) addToCartHandler(w http.ResponseWriter, r *http.Request) {
@@ -165,18 +209,18 @@ func (fe *frontendServer) viewCartHandler(w http.ResponseWriter, r *http.Request
 
 	year := time.Now().Year()
 
-	 var finalCart = map[string]interface{}{
-	"session_id":       sessionID(r),
-	"request_id":       r.Context().Value(ctxKeyRequestID{}),
-	"user_currency":    currentCurrency(r),
-	"currencies":       currencies,
-	"recommendations":  recommendations,
-	"cart_size":        len(cart),
-	"shipping_cost":    shippingCost,
-	"total_cost":       totalPrice,
-	"items":            items,
-	"expiration_years": []int{year, year + 1, year + 2, year + 3, year + 4},
-}
+	var finalCart = map[string]interface{}{
+		"session_id":       sessionID(r),
+		"request_id":       r.Context().Value(ctxKeyRequestID{}),
+		"user_currency":    currentCurrency(r),
+		"currencies":       currencies,
+		"recommendations":  recommendations,
+		"cart_size":        len(cart),
+		"shipping_cost":    shippingCost,
+		"total_cost":       totalPrice,
+		"items":            items,
+		"expiration_years": []int{year, year + 1, year + 2, year + 3, year + 4},
+	}
 
 	b, err := json.Marshal(finalCart)
 	if err != nil {
@@ -232,15 +276,18 @@ func (fe *frontendServer) placeOrderHandler(w http.ResponseWriter, r *http.Reque
 		totalPaid = money.Must(money.Sum(totalPaid, *v.GetCost()))
 	}
 
-	if err := templates.ExecuteTemplate(w, "order", map[string]interface{}{
+	var finalData = map[string]interface{}{
 		"session_id":      sessionID(r),
 		"request_id":      r.Context().Value(ctxKeyRequestID{}),
 		"user_currency":   currentCurrency(r),
 		"order":           order.GetOrder(),
 		"total_paid":      &totalPaid,
 		"recommendations": recommendations,
-	}); err != nil {
-		log.Println(err)
+	}
+
+	b, err := json.Marshal(finalData)
+	if err != nil {
+		log.Println(b)
 	}
 }
 
@@ -252,7 +299,7 @@ func (fe *frontendServer) logoutHandler(w http.ResponseWriter, r *http.Request)
 		c.MaxAge = -1
 		http.SetCookie(w, c)
 	}
-	w.Header().Set("Location", "/")
+	w.Header().Set("Location", "/api/v1")
 	w.WriteHeader(http.StatusFound)
 }
 
@@ -271,7 +318,7 @@ func (fe *frontendServer) setCurrencyHandler(w http.ResponseWriter, r *http.Requ
 	}
 	referer := r.Header.Get("referer")
 	if referer == "" {
-		referer = "/"
+		referer = "/api/v1"
 	}
 	w.Header().Set("Location", referer)
 	w.WriteHeader(http.StatusFound)
@@ -293,12 +340,19 @@ func renderHTTPError(log logrus.FieldLogger, r *http.Request, w http.ResponseWri
 	errMsg := fmt.Sprintf("%+v", err)
 
 	w.WriteHeader(code)
-	templates.ExecuteTemplate(w, "error", map[string]interface{}{
+	var finalData = map[string]interface{}{
 		"session_id":  sessionID(r),
 		"request_id":  r.Context().Value(ctxKeyRequestID{}),
 		"error":       errMsg,
 		"status_code": code,
-		"status":      http.StatusText(code)})
+		"status":      http.StatusText(code),
+	}
+
+	b, err := json.Marshal(finalData)
+	if err != nil {
+		w.Write(b)
+	}
+
 }
 
 func currentCurrency(r *http.Request) string {

src/apiservice/main.go

@@ -122,15 +122,17 @@ func main() {
 	mustConnGRPC(ctx, &svc.adSvcConn, svc.adSvcAddr)
 
 	r := mux.NewRouter()
+	r.HandleFunc("/", svc.homeHandler).Methods(http.MethodGet, http.MethodHead)
+	r.HandleFunc("/api/v1", svc.homeHandler).Methods(http.MethodGet, http.MethodHead)
 	r.HandleFunc("/api/v1/product/{id}", svc.productHandler).Methods(http.MethodGet, http.MethodHead)
 	r.HandleFunc("/api/v1/cart", svc.viewCartHandler).Methods(http.MethodGet, http.MethodHead)
 	r.HandleFunc("/api/v1/cart", svc.addToCartHandler).Methods(http.MethodPost)
 	r.HandleFunc("/api/v1/cart/empty", svc.emptyCartHandler).Methods(http.MethodPost)
 	r.HandleFunc("/api/v1/setCurrency", svc.setCurrencyHandler).Methods(http.MethodPost)
 	r.HandleFunc("/api/v1/logout", svc.logoutHandler).Methods(http.MethodGet)
 	r.HandleFunc("/api/v1/cart/checkout", svc.placeOrderHandler).Methods(http.MethodPost)
-	r.HandleFunc("/api/v1/robots.txt", func(w http.ResponseWriter, _ *http.Request) { fmt.Fprint(w, "User-agent: *\nDisallow: /") })
-	r.HandleFunc("/api/v1/_healthz", func(w http.ResponseWriter, _ *http.Request) { fmt.Fprint(w, "ok") })
+	r.HandleFunc("/robots.txt", func(w http.ResponseWriter, _ *http.Request) { fmt.Fprint(w, "User-agent: *\nDisallow: /") })
+	r.HandleFunc("/_healthz", func(w http.ResponseWriter, _ *http.Request) { fmt.Fprint(w, "ok") })
 
 	// also init the prometheus handler
 	initPrometheusStats(log, r)

tanka/lib/hipstershop/frontend.libsonnet

@@ -38,6 +38,7 @@
         SHIPPING_SERVICE_ADDR: $._config.shippingservice.URL,
         CHECKOUT_SERVICE_ADDR: $._config.checkoutservice.URL,
         AD_SERVICE_ADDR: $._config.adservice.URL,
+        // BANNER_COLOR: "red",
         // JAEGER_SERVICE_ADDR: "jaeger-collector:14268",
       },
       readinessProbe: container.mixin.readinessProbe.httpGet.withPath("/_healthz")