add score calculation, hystrix and unit tests

README.md

@@ -56,7 +56,7 @@ Run the app
 
 And visit
 
-    http://localhost:8080/getPlayer/101
+    http://localhost:8080/getScore/Rafael/vs/Serena
 
 
 ----------

controllers/PlayerController.go

@@ -3,7 +3,6 @@ package controllers
 import (
 	"encoding/json"
 	"net/http"
-	"strconv"
 
 	"github.com/irahardianto/service-pattern-go/helpers"
 	"github.com/irahardianto/service-pattern-go/interfaces"
@@ -16,13 +15,19 @@ type PlayerController struct {
 	PlayerHelper  helpers.PlayerHelper
 }
 
-func (controller *PlayerController) GetPlayer(res http.ResponseWriter, req *http.Request) {
+func (controller *PlayerController) GetPlayerScore(res http.ResponseWriter, req *http.Request) {
 
-	playerId, _ := strconv.Atoi(chi.URLParam(req, "id"))
-	player := controller.PlayerService.FindById(playerId)
-	playerVM := controller.PlayerHelper.BuildPlayerVM(player)
+	player1Name := chi.URLParam(req, "player1")
+	player2Name := chi.URLParam(req, "player2")
 
-	json.NewEncoder(res).Encode(playerVM)
+	scores, err := controller.PlayerService.GetScores(player1Name, player2Name)
+	if err != nil {
+		//Handle error
+	}
+
+	response := controller.PlayerHelper.BuildScoresVM(scores)
+
+	json.NewEncoder(res).Encode(response)
 }
 
 func (controller *PlayerController) GetPlayerMessage(res http.ResponseWriter, req *http.Request) {

controllers/PlayerController_test.go

@@ -20,7 +20,7 @@ import (
 
 // TestSomething is an example of how to use our test object to
 // make assertions about some target code we are testing.
-func TestGetScore(t *testing.T) {
+func TestPlayerScore(t *testing.T) {
 
 	player := models.PlayerModel{}
 	player.Id = 101
@@ -31,25 +31,24 @@ func TestGetScore(t *testing.T) {
 	playerService := new(mocks.IPlayerService)
 
 	// setup expectations
-	playerService.On("FindById", 101).Return(player)
+	playerService.On("GetScores", "Rafael", "Serena").Return("Forty-Fifteen", nil)
 
 	playerController := PlayerController{}
 	playerController.PlayerService = playerService
 
 	// call the code we are testing
-	req := httptest.NewRequest("GET", "http://localhost:8080/getPlayer/101", nil)
+	req := httptest.NewRequest("GET", "http://localhost:8080/getScore/Rafael/vs/Serena", nil)
 	w := httptest.NewRecorder()
 
 	r := chi.NewRouter()
-	r.HandleFunc("/getPlayer/{id}", playerController.GetPlayer)
+	r.HandleFunc("/getScore/{player1}/vs/{player2}", playerController.GetPlayerScore)
 
 	r.ServeHTTP(w, req)
 
-	expectedResult := viewmodels.PlayerVM{}
-	expectedResult.Name = "Rafael"
-	expectedResult.Score = 3
+	expectedResult := viewmodels.ScoresVM{}
+	expectedResult.Score = "Forty-Fifteen"
 
-	actualResult := viewmodels.PlayerVM{}
+	actualResult := viewmodels.ScoresVM{}
 
 	json.NewDecoder(w.Body).Decode(&actualResult)
 

helpers/PlayerHelper.go

@@ -1,17 +1,15 @@
 package helpers
 
 import (
-	"github.com/irahardianto/service-pattern-go/models"
 	"github.com/irahardianto/service-pattern-go/viewmodels"
 )
 
 type PlayerHelper struct{}
 
-func (helper *PlayerHelper) BuildPlayerVM(model models.PlayerModel) viewmodels.PlayerVM {
+func (helper *PlayerHelper) BuildScoresVM(scores string) viewmodels.ScoresVM {
 
-	playerVM := viewmodels.PlayerVM{}
-	playerVM.Name = model.Name
-	playerVM.Score = model.Score
+	scoresVM := viewmodels.ScoresVM{}
+	scoresVM.Score = scores
 
-	return playerVM
+	return scoresVM
 }

interfaces/IPlayerRepository.go

@@ -5,10 +5,6 @@ import (
 )
 
 type IPlayerRepository interface {
-	GetAllPlayers() []models.PlayerModel
-	GetPlayerById(id int) models.PlayerModel
-	CreatePlayer(player models.PlayerModel) (bool, error)
-	UpdatePlayer(id int, player models.PlayerModel) (bool, error)
-	DeletePlayer(id int) (bool, error)
+	GetPlayerByName(name string) (models.PlayerModel, error)
 	GetPlayerMessageFromAPI() models.MessageModel
 }

interfaces/IPlayerService.go

@@ -5,6 +5,6 @@ import (
 )
 
 type IPlayerService interface {
-	FindById(playerId int) models.PlayerModel
+	GetScores(player1Name string, player2Name string) (string, error)
 	GetPlayerMessage() models.MessageModel
 }

repositories/PlayerRepository.go

@@ -3,6 +3,7 @@ package repositories
 import (
 	"encoding/json"
 
+	"github.com/afex/hystrix-go/hystrix"
 	"github.com/irahardianto/service-pattern-go/helpers"
 	"github.com/irahardianto/service-pattern-go/infrastructures"
 	"github.com/irahardianto/service-pattern-go/models"
@@ -15,41 +16,26 @@ type PlayerRepository struct {
 	SafeAPICall helpers.SafeAPICall
 }
 
-// func InitGormDB(conn *gorm.DB) *GormPlayerRepository {
-//
-// 	dbHandler := new(GormPlayerRepository)
-// 	dbHandler.db = conn
-//
-// 	return dbHandler
-// }
+func (repository *PlayerRepository) GetPlayerByName(name string) (models.PlayerModel, error) {
 
-func (repository *PlayerRepository) GetAllPlayers() []models.PlayerModel {
-	//not implemented yet
-	return nil
-}
-
-func (repository *PlayerRepository) GetPlayerById(id int) models.PlayerModel {
 	conn := repository.Db.GetDB()
-	player := models.PlayerModel{}
-	//conn.db.First(&player, id)
-	conn.First(&player, id)
-
-	return player
-}
-
-func (repository *PlayerRepository) CreatePlayer(player models.PlayerModel) (bool, error) {
-	//not implemented yet
-	return false, nil
-}
-
-func (repository *PlayerRepository) UpdatePlayer(id int, player models.PlayerModel) (bool, error) {
-	//not implemented yet
-	return false, nil
-}
 
-func (repository *PlayerRepository) DeletePlayer(id int) (bool, error) {
-	//not implemented yet
-	return false, nil
+	output := make(chan models.PlayerModel, 1)
+	errors := hystrix.Go("get_player_by_name", func() error {
+
+		player := models.PlayerModel{}
+		conn.First(&player, "Name = ?", name)
+		output <- player
+		return nil
+	}, nil)
+
+	select {
+	case out := <-output:
+		return out, nil
+	case err := <-errors:
+		println(err)
+		return models.PlayerModel{}, err
+	}
 }
 
 func (repository *PlayerRepository) GetPlayerMessageFromAPI() models.MessageModel {

router.go

@@ -17,7 +17,7 @@ func (router *router) InitRouter() *chi.Mux {
 	playerController := ServiceContainer().InjectPlayerController()
 
 	r := chi.NewRouter()
-	r.HandleFunc("/getPlayer/{id}", playerController.GetPlayer)
+	r.HandleFunc("/getScore/{player1}/vs/{player2}", playerController.GetPlayerScore)
 	r.HandleFunc("/getMessage", playerController.GetPlayerMessage)
 
 	return r