Merge branch 'master' into monitoring/prometheus

Makefile

@@ -62,6 +62,10 @@ dockertravisbuild: build
 	docker login -u $(DOCKER_USER) -p $(DOCKER_PASS)
 	scripts/push.sh
 
+
+mockservice: 
+	docker run -d --name user-mock -h user-mock -v $(PWD)/apispec/mock.json:/data/db.json clue/json-server
+
 dockertest: dockerruntest
 	scripts/testcontainer.sh
 	docker run -h openapi --rm --name $(OPENAPI) --link user-dev -v $(PWD)/apispec/:/tmp/specs/\
@@ -71,10 +75,10 @@ dockertest: dockerruntest
 	 $(MAKE) cleandocker
 
 cleandocker:
-	-docker stop $(INSTANCE)-dev
-	-docker stop my$(TESTDB)
-	-docker rm my$(TESTDB)
-	-docker rm $(INSTANCE)-dev
+	-docker rm -f my$(TESTDB)
+	-docker rm -f $(INSTANCE)-dev
+	-docker rm -f $(OPENAPI)
+	-docker rm -f user-mock
 
 clean: cleandocker 
 	rm -rf bin

api/endpoints.go

@@ -57,7 +57,7 @@ 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)
-		id, err := s.Register(req.Username, req.Password, req.Email)
+		id, err := s.Register(req.Username, req.Password, req.Email, req.FirstName, req.LastName)
 		return postResponse{ID: id}, err
 	}
 }
@@ -204,9 +204,11 @@ type cardsResponse struct {
 }
 
 type registerRequest struct {
-	Username string `json:"username"`
-	Password string `json:"password"`
-	Email    string `json:"email"`
+	Username  string `json:"username"`
+	Password  string `json:"password"`
+	Email     string `json:"email"`
+	FirstName string `json:"firstName"`
+	LastName  string `json:"lastName"`
 }
 
 type statusResponse struct {

api/middlewares.go

@@ -36,7 +36,7 @@ func (mw loggingMiddleware) Login(username, password string) (user users.User, e
 	return mw.next.Login(username, password)
 }
 
-func (mw loggingMiddleware) Register(username, password, email string) (string, error) {
+func (mw loggingMiddleware) Register(username, password, email, first, last string) (string, error) {
 	defer func(begin time.Time) {
 		mw.logger.Log(
 			"method", "Register",
@@ -45,7 +45,7 @@ func (mw loggingMiddleware) Register(username, password, email string) (string,
 			"took", time.Since(begin),
 		)
 	}(time.Now())
-	return mw.next.Register(username, password, email)
+	return mw.next.Register(username, password, email, first, last)
 }
 
 func (mw loggingMiddleware) PostUser(user users.User) (id string, err error) {

api/service.go

@@ -20,7 +20,7 @@ var (
 // Service is the user service, providing operations for users to login, register, and retrieve customer information.
 type Service interface {
 	Login(username, password string) (users.User, error) // GET /login
-	Register(username, password, email string) (string, error)
+	Register(username, password, email, first, last string) (string, error)
 	GetUsers(id string) ([]users.User, error)
 	PostUser(u users.User) (string, error)
 	GetAddresses(id string) ([]users.Address, error)
@@ -51,11 +51,13 @@ func (s *fixedService) Login(username, password string) (users.User, error) {
 
 }
 
-func (s *fixedService) Register(username, password, email string) (string, error) {
+func (s *fixedService) Register(username, password, email, first, last string) (string, error) {
 	u := users.New()
 	u.Username = username
 	u.Password = calculatePassHash(password, u.Salt)
 	u.Email = email
+	u.FirstName = first
+	u.LastName = last
 	err := db.CreateUser(&u)
 	return u.UserID, err
 }

apispec/hooks.js

@@ -9,7 +9,7 @@ hooks.before("/register > POST", function(transaction, done) {
     transaction.request.headers['Content-Type'] = 'application/json';
     transaction.request.body = JSON.stringify(
 	{
-	    "username":"testuser",
+	    "username": "testuser",
 	    "password": "testpassword"
 	}
     );

apispec/mock.json

@@ -0,0 +1,27 @@
+{
+    "customers": [
+        { "id": "57a98d98e4b00679b4a830af",
+	  "firstName": "Test",
+	  "lastname": "Test",
+	  "username": "testymctestface"
+	}
+    ],
+    "cards": [
+	{
+	    "id": "57a98d98e4b00679b4a830ae",
+	    "longNum": "23232*****2131",
+	    "expires": "12/18",
+	    "ccv": "940"
+	}
+    ],
+    "addresses": [
+	{
+	    "id": "57a98d98e4b00679b4a830ad",
+	    "number": "12",
+	    "street": "Cleverstreet",
+	    "city": "Tinytown",
+	    "postcode": "1923eq",
+	    "country": "Cambodia"
+	}
+    ]
+}