update code chapter 3

Author: minaandrawos

Chapter03/myevents/src/eventsservice/main.go

@@ -2,10 +2,11 @@ package main
 
 import (
 	"flag"
-	"gocloudprogramming/chapter3/myevents/src/eventsservice/rest"
-	"gocloudprogramming/chapter3/myevents/src/lib/configuration"
-	"gocloudprogramming/chapter3/myevents/src/lib/persistence/dblayer"
 	"log"
+
+	"github.com/PacktPublishing/Cloud-Native-programming-with-Golang/chapter03/myevents/src/eventsservice/rest"
+	"github.com/PacktPublishing/Cloud-Native-programming-with-Golang/chapter03/myevents/src/lib/configuration"
+	"github.com/PacktPublishing/Cloud-Native-programming-with-Golang/chapter03/myevents/src/lib/persistence/dblayer"
 )
 
 func main() {

Chapter03/myevents/src/eventsservice/rest/handlers.go

@@ -4,18 +4,19 @@ import (
 	"encoding/hex"
 	"encoding/json"
 	"fmt"
-	"gocloudprogramming/chapter3/myevents/src/lib/persistence"
 	"net/http"
 	"strings"
 
+	"github.com/PacktPublishing/Cloud-Native-programming-with-Golang/chapter03/myevents/src/lib/persistence"
+
 	"github.com/gorilla/mux"
 )
 
 type eventServiceHandler struct {
 	dbhandler persistence.DatabaseHandler
 }
 
-func New(databasehandler persistence.DatabaseHandler) *eventServiceHandler {
+func NewEventHandler(databasehandler persistence.DatabaseHandler) *eventServiceHandler {
 	return &eventServiceHandler{
 		dbhandler: databasehandler,
 	}
@@ -25,15 +26,19 @@ func (eh *eventServiceHandler) FindEventHandler(w http.ResponseWriter, r *http.R
 	vars := mux.Vars(r)
 	criteria, ok := vars["SearchCriteria"]
 	if !ok {
-		fmt.Fprint(w, `No search criteria found, you can either search by id via /id/4
-						to search by name via /name/coldplayconcert`)
+		w.WriteHeader(400)
+		fmt.Fprint(w, `{"error": "No search criteria found, you can either
+						search by id via /id/4
+						to search by name via /name/coldplayconcert}"`)
 		return
 	}
 
 	searchkey, ok := vars["search"]
 	if !ok {
-		fmt.Fprint(w, `No search keys found, you can either search by id via /id/4
-						to search by name via /name/coldplayconcert`)
+		w.WriteHeader(400)
+		fmt.Fprint(w, `{"error": "No search keys found, you can either search
+						by id via /id/4
+						to search by name via /name/coldplayconcert}"`)
 		return
 	}
 
@@ -44,13 +49,12 @@ func (eh *eventServiceHandler) FindEventHandler(w http.ResponseWriter, r *http.R
 		event, err = eh.dbhandler.FindEventByName(searchkey)
 	case "id":
 		id, err := hex.DecodeString(searchkey)
-		if nil == err {
+		if err == nil {
 			event, err = eh.dbhandler.FindEvent(id)
 		}
 	}
 	if err != nil {
-		w.WriteHeader(404)
-		fmt.Fprintf(w, "Error occured %s", err)
+		fmt.Fprintf(w, `{"error": "%s"}`, err)
 		return
 	}
 	w.Header().Set("Content-Type", "application/json;charset=utf8")
@@ -61,14 +65,14 @@ func (eh *eventServiceHandler) AllEventHandler(w http.ResponseWriter, r *http.Re
 	events, err := eh.dbhandler.FindAllAvailableEvents()
 	if err != nil {
 		w.WriteHeader(500)
-		fmt.Fprintf(w, "Error occured while trying to find all available events %s", err)
+		fmt.Fprintf(w, `{"error": "Error occured while trying to find all available events %s"}`, err)
 		return
 	}
 	w.Header().Set("Content-Type", "application/json;charset=utf8")
 	err = json.NewEncoder(w).Encode(&events)
 	if err != nil {
 		w.WriteHeader(500)
-		fmt.Fprintf(w, "Error occured while trying encode events to JSON %s", err)
+		fmt.Fprintf(w, `{"error": "Error occured while trying encode events to JSON %s"}`, err)
 	}
 }
 
@@ -77,14 +81,14 @@ func (eh *eventServiceHandler) NewEventHandler(w http.ResponseWriter, r *http.Re
 	err := json.NewDecoder(r.Body).Decode(&event)
 	if nil != err {
 		w.WriteHeader(500)
-		fmt.Fprintf(w, "error occured while decoding event data %s", err)
+		fmt.Fprintf(w, `{"error": "error occured while decoding event data %s"}`, err)
 		return
 	}
 	id, err := eh.dbhandler.AddEvent(event)
 	if nil != err {
 		w.WriteHeader(500)
-		fmt.Fprintf(w, "error occured while persisting event %s", err)
+		fmt.Fprintf(w, `{"error": "error occured while persisting event %d %s"}`, id, err)
 		return
 	}
-	fmt.Fprint(w, id)
+	fmt.Fprint(w, `{"id":%d}`, id)
 }

Chapter03/myevents/src/eventsservice/rest/rest.go

@@ -1,14 +1,15 @@
 package rest
 
 import (
-	"gocloudprogramming/chapter3/myevents/src/lib/persistence"
 	"net/http"
 
+	"github.com/PacktPublishing/Cloud-Native-programming-with-Golang/chapter03/myevents/src/lib/persistence"
+
 	"github.com/gorilla/mux"
 )
 
 func ServeAPI(endpoint, tlsendpoint string, databasehandler persistence.DatabaseHandler) (chan error, chan error) {
-	handler := New(databasehandler)
+	handler := NewEventHandler(databasehandler)
 	r := mux.NewRouter()
 	eventsrouter := r.PathPrefix("/events").Subrouter()
 	eventsrouter.Methods("GET").Path("/{SearchCriteria}/{search}").HandlerFunc(handler.FindEventHandler)

Chapter03/myevents/src/lib/configuration/configuration.go

@@ -3,8 +3,9 @@ package configuration
 import (
 	"encoding/json"
 	"fmt"
-	"gocloudprogramming/chapter3/myevents/src/lib/persistence/dblayer"
 	"os"
+
+	"github.com/PacktPublishing/Cloud-Native-programming-with-Golang/chapter03/myevents/src/lib/persistence/dblayer"
 )
 
 var (

Chapter03/myevents/src/lib/persistence/dblayer/dblayer.go

@@ -1,8 +1,8 @@
 package dblayer
 
 import (
-	"gocloudprogramming/chapter3/myevents/src/lib/persistence"
-	"gocloudprogramming/chapter3/myevents/src/lib/persistence/mongolayer"
+	"github.com/PacktPublishing/Cloud-Native-programming-with-Golang/chapter03/myevents/src/lib/persistence"
+	"github.com/PacktPublishing/Cloud-Native-programming-with-Golang/chapter03/myevents/src/lib/persistence/mongolayer"
 )
 
 type DBTYPE string

Chapter03/myevents/src/lib/persistence/mongolayer/mongolayer.go

@@ -1,7 +1,7 @@
 package mongolayer
 
 import (
-	"gocloudprogramming/chapter3/myevents/src/lib/persistence"
+	"github.com/PacktPublishing/Cloud-Native-programming-with-Golang/chapter03/myevents/src/lib/persistence"
 
 	mgo "gopkg.in/mgo.v2"
 	"gopkg.in/mgo.v2/bson"