in session 6

Author: tebeka

unter/.gitignore session_6/unter/.gitignoreunter/.gitignore renamed to session_6/unter/.gitignore

@@ -17,27 +17,6 @@ func (a *API) Health(w http.ResponseWriter, r *http.Request) {
 	fmt.Fprintln(w, "OK")
 }
 
-func (a *API) Get(w http.ResponseWriter, r *http.Request) {
-	id := r.PathValue("id")
-	if id == "" {
-		http.Error(w, "missing ID", http.StatusBadRequest)
-		return
-	}
-
-	rd, err := a.db.Get(id)
-	if err != nil {
-		a.log.Error("scan", "error", err)
-		http.Error(w, "can't get rides", http.StatusInternalServerError)
-		return
-	}
-
-	w.Header().Set("content-type", "application/json")
-	if err := json.NewEncoder(w).Encode(rd); err != nil {
-		a.log.Error("encode", "error", err)
-		return
-	}
-}
-
 func (a *API) Add(w http.ResponseWriter, r *http.Request) {
 	var rd Ride
 	if err := json.NewDecoder(r.Body).Decode(&rd); err != nil {
@@ -57,8 +36,41 @@ func (a *API) Add(w http.ResponseWriter, r *http.Request) {
 		http.Error(w, "can't insert", http.StatusInternalServerError)
 		return
 	}
+	a.log.Info("added", "id", rd.ID)
 
-	json.NewEncoder(w).Encode(map[string]any{
+	resp := map[string]any{
 		"id": rd.ID,
-	})
+	}
+	a.sendJSON(w, resp)
+}
+
+func (a *API) Get(w http.ResponseWriter, r *http.Request) {
+	id := r.PathValue("id")
+	if id == "" {
+		http.Error(w, "missing ID", http.StatusBadRequest)
+		return
+	}
+
+	rd, err := a.db.Get(id)
+	if err != nil {
+		a.log.Error("scan", "error", err)
+		http.Error(w, "can't get rides", http.StatusInternalServerError)
+		return
+	}
+
+	resp := map[string]any{
+		"id":       rd.ID,
+		"distance": rd.Distance,
+		"shared":   rd.Shared,
+		"price":    RidePrice(rd.Distance, rd.Shared),
+	}
+	a.sendJSON(w, resp)
+}
+
+func (a *API) sendJSON(w http.ResponseWriter, resp any) {
+	w.Header().Set("content-type", "application/json")
+	if err := json.NewEncoder(w).Encode(resp); err != nil {
+		a.log.Error("encode", "error", err)
+		return
+	}
 }

unter/Makefile session_6/unter/Makefileunter/Makefile renamed to session_6/unter/Makefile

@@ -0,0 +1,15 @@
+package main
+
+import "math"
+
+// RidePrice returns ride price in ¢
+func RidePrice(distance float64, shared bool) int {
+	price := 250 // initial fare
+	price += int(math.Ceil(distance)) * 150
+
+	if shared {
+		price = int(float64(price) * 0.9)
+	}
+
+	return price
+}

unter/api.go session_6/unter/api.gounter/api.go renamed to session_6/unter/api.go

@@ -6,8 +6,8 @@ import (
 )
 
 type Ride struct {
-	ID       string    `json:"id"`
-	Time     time.Time `json:"time"`
+	ID       string
+	Time     time.Time
 	Distance float64
 	Shared   bool
 }