Merge pull request #25 from microservices-demo/extend-return-message

Extend return message

service.go

@@ -2,6 +2,7 @@ package payment
 
 import (
 	"errors"
+	"fmt"
 	"time"
 )
 
@@ -11,7 +12,8 @@ type Service interface {
 }
 
 type Authorisation struct {
-	Authorised bool `json:"authorised"`
+	Authorised bool   `json:"authorised"`
+	Message    string `json:"message"`
 }
 
 type Health struct {
@@ -41,11 +43,16 @@ func (s *service) Authorise(amount float32) (Authorisation, error) {
 		return Authorisation{}, ErrInvalidPaymentAmount
 	}
 	authorised := false
+	message := "Payment declined"
 	if amount <= s.declineOverAmount {
 		authorised = true
+		message = "Payment authorised"
+	} else {
+		message = fmt.Sprintf("Payment declined: amount exceeds %.2f", s.declineOverAmount)
 	}
 	return Authorisation{
 		Authorised: authorised,
+		Message:    message,
 	}, nil
 }
 

service_test.go

@@ -1,24 +1,24 @@
 package payment
 
-import (
-	"testing"
-)
+import "testing"
+import "fmt"
 
 func TestAuthorise(t *testing.T) {
 	result, _ := NewAuthorisationService(100).Authorise(10)
-	expected := true
-	if result.Authorised != expected {
+	expected := Authorisation{true, "Payment authorised"}
+	if result != expected {
 		t.Errorf("Authorise returned unexpected result: got %v want %v",
-			result.Authorised, expected)
+			result, expected)
 	}
 }
 
 func TestFailOverCertainAmount(t *testing.T) {
-	result, _ := NewAuthorisationService(10).Authorise(100)
-	expected := false
-	if result.Authorised != expected {
+	declineAmount := float32(10)
+	result, _ := NewAuthorisationService(declineAmount).Authorise(100)
+	expected := Authorisation{false, fmt.Sprintf("Payment declined: amount exceeds %.2f", declineAmount)}
+	if result != expected {
 		t.Errorf("Authorise returned unexpected result: got %v want %v",
-			result.Authorised, expected)
+			result, expected)
 	}
 }