Merge pull request #13 from microservices-demo/changesingleresponse

Changesingleresponse

Author: jasonrichardsmith

.gitignore

@@ -0,0 +1,2 @@
+bin
+docker/user/bin

Makefile

@@ -51,6 +51,10 @@ docker: build
 	cp -rf bin docker/user/
 	docker build -t $(NAME) -f docker/user/Dockerfile-release docker/user/
 
+dockerlocal: build
+	cp -rf bin docker/user/
+	docker build -t $(INSTANCE)-local -f docker/user/Dockerfile-release docker/user/
+
 dockertravisbuild: build
 	cp -rf bin docker/user/
 	docker build -t $(NAME):$(TAG) -f docker/user/Dockerfile-release docker/user/

api/endpoints.go

@@ -8,6 +8,7 @@ import (
 	"time"
 
 	"github.com/go-kit/kit/endpoint"
+	"github.com/microservices-demo/user/db"
 	"github.com/microservices-demo/user/users"
 	"golang.org/x/net/context"
 )
@@ -22,6 +23,7 @@ type Endpoints struct {
 	AddressPostEndpoint endpoint.Endpoint
 	CardGetEndpoint     endpoint.Endpoint
 	CardPostEndpoint    endpoint.Endpoint
+	DeleteEndpoint      endpoint.Endpoint
 	HealthEndpoint      endpoint.Endpoint
 }
 
@@ -37,6 +39,7 @@ func MakeEndpoints(s Service) Endpoints {
 		AddressGetEndpoint:  MakeAddressGetEndpoint(s),
 		AddressPostEndpoint: MakeAddressPostEndpoint(s),
 		CardGetEndpoint:     MakeCardGetEndpoint(s),
+		DeleteEndpoint:      MakeDeleteEndpoint(s),
 		CardPostEndpoint:    MakeCardPostEndpoint(s),
 	}
 }
@@ -54,26 +57,46 @@ func MakeLoginEndpoint(s Service) endpoint.Endpoint {
 func MakeRegisterEndpoint(s Service) endpoint.Endpoint {
 	return func(ctx context.Context, request interface{}) (response interface{}, err error) {
 		req := request.(registerRequest)
-		status := s.Register(req.Username, req.Password, req.Email)
-		return statusResponse{Status: status}, err
+		id, err := s.Register(req.Username, req.Password, req.Email)
+		return postResponse{ID: id}, err
 	}
 }
 
 // MakeUserGetEndpoint returns an endpoint via the given service.
 func MakeUserGetEndpoint(s Service) endpoint.Endpoint {
 	return func(ctx context.Context, request interface{}) (response interface{}, err error) {
 		req := request.(GetRequest)
-		users, err := s.GetUsers(req.ID)
-		return usersResponse{Users: users}, err
+		usrs, err := s.GetUsers(req.ID)
+		if req.ID == "" {
+			return EmbedStruct{usersResponse{Users: usrs}}, err
+		}
+		if len(usrs) == 0 {
+			if req.Attr == "addresses" {
+				return EmbedStruct{addressesResponse{Addresses: make([]users.Address, 0)}}, err
+			}
+			if req.Attr == "cards" {
+				return EmbedStruct{cardsResponse{Cards: make([]users.Card, 0)}}, err
+			}
+			return users.User{}, err
+		}
+		user := usrs[0]
+		db.GetUserAttributes(&user)
+		if req.Attr == "addresses" {
+			return EmbedStruct{addressesResponse{Addresses: user.Addresses}}, err
+		}
+		if req.Attr == "cards" {
+			return EmbedStruct{cardsResponse{Cards: user.Cards}}, err
+		}
+		return user, err
 	}
 }
 
 // MakeUserPostEndpoint returns an endpoint via the given service.
 func MakeUserPostEndpoint(s Service) endpoint.Endpoint {
 	return func(ctx context.Context, request interface{}) (response interface{}, err error) {
-		req := request.(userPostRequest)
-		status := s.PostUser(req.User)
-		return statusResponse{Status: status}, err
+		req := request.(users.User)
+		id, err := s.PostUser(req)
+		return postResponse{ID: id}, err
 	}
 }
 
@@ -82,16 +105,22 @@ func MakeAddressGetEndpoint(s Service) endpoint.Endpoint {
 	return func(ctx context.Context, request interface{}) (response interface{}, err error) {
 		req := request.(GetRequest)
 		adds, err := s.GetAddresses(req.ID)
-		return addressesResponse{Addresses: adds}, err
+		if req.ID == "" {
+			return EmbedStruct{addressesResponse{Addresses: adds}}, err
+		}
+		if len(adds) == 0 {
+			return users.Address{}, err
+		}
+		return adds[0], err
 	}
 }
 
 // MakeAddressPostEndpoint returns an endpoint via the given service.
 func MakeAddressPostEndpoint(s Service) endpoint.Endpoint {
 	return func(ctx context.Context, request interface{}) (response interface{}, err error) {
 		req := request.(addressPostRequest)
-		status := s.PostAddress(req.Address, req.UserID)
-		return statusResponse{Status: status}, err
+		id, err := s.PostAddress(req.Address, req.UserID)
+		return postResponse{ID: id}, err
 	}
 }
 
@@ -100,16 +129,34 @@ func MakeCardGetEndpoint(s Service) endpoint.Endpoint {
 	return func(ctx context.Context, request interface{}) (response interface{}, err error) {
 		req := request.(GetRequest)
 		cards, err := s.GetCards(req.ID)
-		return cardsResponse{Cards: cards}, err
+		if req.ID == "" {
+			return EmbedStruct{cardsResponse{Cards: cards}}, err
+		}
+		if len(cards) == 0 {
+			return users.Card{}, err
+		}
+		return cards[0], err
 	}
 }
 
 // MakeCardPostEndpoint returns an endpoint via the given service.
 func MakeCardPostEndpoint(s Service) endpoint.Endpoint {
 	return func(ctx context.Context, request interface{}) (response interface{}, err error) {
 		req := request.(cardPostRequest)
-		status := s.PostCard(req.Card, req.UserID)
-		return statusResponse{Status: status}, err
+		id, err := s.PostCard(req.Card, req.UserID)
+		return postResponse{ID: id}, err
+	}
+}
+
+// MakeLoginEndpoint returns an endpoint via the given service.
+func MakeDeleteEndpoint(s Service) endpoint.Endpoint {
+	return func(ctx context.Context, request interface{}) (response interface{}, err error) {
+		req := request.(deleteRequest)
+		err = s.Delete(req.Entity, req.ID)
+		if err == nil {
+			return statusResponse{Status: true}, err
+		}
+		return statusResponse{Status: false}, err
 	}
 }
 
@@ -121,18 +168,15 @@ func MakeHealthEndpoint(s Service) endpoint.Endpoint {
 }
 
 type GetRequest struct {
-	ID string
+	ID   string
+	Attr string
 }
 
 type loginRequest struct {
 	Username string
 	Password string
 }
 
-type userPostRequest struct {
-	User users.User `json:"user"`
-}
-
 type userResponse struct {
 	User users.User `json:"user"`
 }
@@ -142,33 +186,42 @@ type usersResponse struct {
 }
 
 type addressPostRequest struct {
-	Address users.Address `json:"address"`
-	UserID  string        `json:"userID"`
+	users.Address
+	UserID string `json:"userID"`
 }
 
 type addressesResponse struct {
 	Addresses []users.Address `json:"address"`
 }
 
 type cardPostRequest struct {
-	Card   users.Card `json:"card"`
-	UserID string     `json:"userID"`
+	users.Card
+	UserID string `json:"userID"`
 }
 
 type cardsResponse struct {
 	Cards []users.Card `json:"card"`
 }
 
 type registerRequest struct {
-	Username string
-	Password string
-	Email    string
+	Username string `json:"username"`
+	Password string `json:"password"`
+	Email    string `json:"email"`
 }
 
 type statusResponse struct {
 	Status bool `json:"status"`
 }
 
+type postResponse struct {
+	ID string `json:"id"`
+}
+
+type deleteRequest struct {
+	Entity string
+	ID     string
+}
+
 type healthRequest struct {
 	//
 }
@@ -177,3 +230,7 @@ type healthResponse struct {
 	Status string `json:"status"`
 	Time   string `json:"time"`
 }
+
+type EmbedStruct struct {
+	Embed interface{} `json:"_embedded"`
+}

api/endpoints_test.go

@@ -6,15 +6,12 @@ import "testing"
 
 func TestMakeEndpoints(t *testing.T) {
 	//	eps := MakeEndpoints(TestService)
-	//	spew.Dump(TestService)
 }
 
 func TestMakeLoginEndpoint(t *testing.T) {
 	//	l := MakeLoginEndpoint(TestService)
-	//	spew.Dump(TestService)
 }
 
 func TestMakeRegisterEndpoint(t *testing.T) {
 	//	r := MakeRegisterEndpoint(TestService)
-	//	spew.Dump(TestService)
 }

api/middlewares.go

@@ -29,34 +29,31 @@ func (mw loggingMiddleware) Login(username, password string) (user users.User, e
 	defer func(begin time.Time) {
 		mw.logger.Log(
 			"method", "Login",
-			"username", username,
-			"result", user.UserID,
 			"took", time.Since(begin),
 		)
 	}(time.Now())
 	return mw.next.Login(username, password)
 }
 
-func (mw loggingMiddleware) Register(username, password, email string) (status bool) {
+func (mw loggingMiddleware) Register(username, password, email string) (string, error) {
 	defer func(begin time.Time) {
 		mw.logger.Log(
 			"method", "Register",
 			"username", username,
 			"email", email,
-			"result", status,
 			"took", time.Since(begin),
 		)
 	}(time.Now())
 	return mw.next.Register(username, password, email)
 }
 
-func (mw loggingMiddleware) PostUser(user users.User) (status bool) {
+func (mw loggingMiddleware) PostUser(user users.User) (id string, err error) {
 	defer func(begin time.Time) {
 		mw.logger.Log(
 			"method", "PostUser",
 			"username", user.Username,
 			"email", user.Email,
-			"result", status,
+			"result", id,
 			"took", time.Since(begin),
 		)
 	}(time.Now())
@@ -79,14 +76,13 @@ func (mw loggingMiddleware) GetUsers(id string) (u []users.User, err error) {
 	return mw.next.GetUsers(id)
 }
 
-func (mw loggingMiddleware) PostAddress(add users.Address, id string) (status bool) {
+func (mw loggingMiddleware) PostAddress(add users.Address, id string) (string, error) {
 	defer func(begin time.Time) {
 		mw.logger.Log(
 			"method", "PostAddress",
 			"street", add.Street,
 			"number", add.Number,
 			"user", id,
-			"result", status,
 			"took", time.Since(begin),
 		)
 	}(time.Now())
@@ -109,15 +105,14 @@ func (mw loggingMiddleware) GetAddresses(id string) (a []users.Address, err erro
 	return mw.next.GetAddresses(id)
 }
 
-func (mw loggingMiddleware) PostCard(card users.Card, id string) (status bool) {
+func (mw loggingMiddleware) PostCard(card users.Card, id string) (string, error) {
 	defer func(begin time.Time) {
 		cc := card
 		cc.MaskCC()
 		mw.logger.Log(
 			"method", "PostCard",
 			"card", cc.LongNum,
 			"user", id,
-			"result", status,
 			"took", time.Since(begin),
 		)
 	}(time.Now())
@@ -139,3 +134,15 @@ func (mw loggingMiddleware) GetCards(id string) (a []users.Card, err error) {
 	}(time.Now())
 	return mw.next.GetCards(id)
 }
+
+func (mw loggingMiddleware) Delete(entity, id string) (err error) {
+	defer func(begin time.Time) {
+		mw.logger.Log(
+			"method", "Delete",
+			"entity", entity,
+			"id", id,
+			"took", time.Since(begin),
+		)
+	}(time.Now())
+	return mw.next.Delete(entity, id)
+}