merge router and server to api package

Author: belito3

Makefile

@@ -28,4 +28,7 @@ docker_run:
 server:
 	go run main.go
 
-.PHONY: postgres createdb dropdb migrateup migratedown build test docker_build docker_run server
+mock:
+	mockgen -package mockdb -destination app/repository/mock/store.go github.com/belito3/go-web-api/app/repository/impl IStore
+
+.PHONY: postgres createdb dropdb migrateup migratedown build test docker_build docker_run server mock

README.md

@@ -43,6 +43,7 @@
   which mockgen
   --> /home/$USER/go/bin/mockgen
   ```
+  - Gen mock code: `make mock`
 
 ### References
 1. [simplebank](https://github.com/techschool/simplebank)

app/api/account.go

@@ -1,4 +1,4 @@
-package service
+package api
 
 import (
 	"fmt"
@@ -8,20 +8,20 @@ import (
 	"net/http"
 )
 
-type AccountService struct {
+type Account struct {
 	store 	impl.IStore
 }
 
-func NewAccountService(store impl.IStore) *AccountService {
-	return &AccountService{store: store}
+func NewAccount(store impl.IStore) *Account {
+	return &Account{store: store}
 }
 
 type createAccountRequest struct {
 	Owner 		string	`json:"owner" binding:"required"`
 	Currency 	string	`json:"currency" binding:"required,oneof=USD EUR"`
 }
 
-func (s *AccountService) CreateAccount(c *gin.Context) {
+func (s *Account) createAccount(c *gin.Context) {
 	// Add account
 	ctx := c.Request.Context()
 	var req createAccountRequest
@@ -53,7 +53,7 @@ type getAccountRequest struct {
 	ID int64 `uri:"id" binding:"required,min=1"`
 }
 
-func (s *AccountService) GetAccount(c *gin.Context) {
+func (s *Account) getAccount(c *gin.Context) {
 	ctx := c.Request.Context()
 	var req getAccountRequest
 	if err := c.ShouldBindUri(&req); err != nil {

app/api/account_test.go

@@ -0,0 +1,63 @@
+package api
+
+import (
+	"fmt"
+	"net/http"
+	"net/http/httptest"
+	"testing"
+
+	mockdb "github.com/belito3/go-web-api/app/repository/mock"
+
+	"github.com/belito3/go-web-api/app/config"
+	"github.com/belito3/go-web-api/app/repository/impl"
+	"github.com/belito3/go-web-api/app/util"
+	"github.com/golang/mock/gomock"
+	"github.com/stretchr/testify/require"
+	"go.uber.org/dig"
+)
+
+func TestGetAccountAPI(t *testing.T) {
+	account := randomAccount()
+
+	ctrl := gomock.NewController(t)
+	defer ctrl.Finish()
+
+	store := mockdb.NewMockIStore(ctrl)
+	// build stubs
+	store.EXPECT().
+		GetAccount(gomock.Any(), gomock.Eq(account.ID)).
+		Times(1).
+		Return(account, nil)
+
+	// Build container
+	container := dig.New()
+	conf := config.AppConfiguration{}
+	//// Inject store to container
+	_ = container.Provide(func() impl.IStore {
+		return store
+	})
+
+	// start test server and send request
+	server := NewServer(conf, container)
+	// Inject api to container
+	_ = server.InitGinEngine()
+
+	recorder := httptest.NewRecorder()
+
+	url := fmt.Sprintf("/api/v1/account/%d", account.ID)
+	request, err := http.NewRequest(http.MethodGet, url, nil)
+	require.NoError(t, err)
+
+	server.router.ServeHTTP(recorder, request)
+	// check response
+	require.Equal(t, http.StatusOK, recorder.Code)
+}
+
+func randomAccount() impl.Account {
+	return impl.Account{
+		ID:       util.RandomInt(1, 1000),
+		Owner:    util.RandomOwner(),
+		Balance:  util.RandomMoney(),
+		Currency: util.RandomCurrency(),
+	}
+}

app/api/authen.go

@@ -1,4 +1,4 @@
-package service
+package api
 
 import (
 	"github.com/belito3/go-web-api/pkg/logger"

app/api/dig.go

@@ -1,10 +1,6 @@
-package service
+package api
 
-import (
-	"go.uber.org/dig"
-)
-
-func Inject(container *dig.Container) error {
-	_ = container.Provide(NewAccountService)
-	return nil
+func (s *Server) injectAPIHandle() error {
+	err := s.container.Provide(NewAccount)
+	return err
 }

app/api/main_test.go

@@ -0,0 +1,3 @@
+package api
+
+

app/service/service.go app/api/response.go

@@ -1,8 +1,6 @@
-package service
+package api
 
-import (
-	"github.com/gin-gonic/gin"
-)
+import "github.com/gin-gonic/gin"
 
 /*
 error
@@ -13,7 +11,6 @@ error
 }
 */
 
-
 /*
 success
 {
@@ -27,13 +24,12 @@ success
 }
 */
 
-
 type ResultSuccess struct {
-	OK bool `json:"ok"`
+	OK     bool                   `json:"ok"`
 	Result map[string]interface{} `json:"result"`
 }
 
-func ResponseSuccess(c *gin.Context, statusCode int, result map[string]interface{}){
+func responseSuccess(c *gin.Context, statusCode int, result map[string]interface{}) {
 	rs := ResultSuccess{
 		OK:     true,
 		Result: result,
@@ -42,12 +38,10 @@ func ResponseSuccess(c *gin.Context, statusCode int, result map[string]interface
 }
 
 // responseError
-func ResponseError(c *gin.Context, statusCode int, description string){
+func responseError(c *gin.Context, statusCode int, description string) {
 	c.JSON(statusCode, gin.H{
-		"ok": false,
-		"error": statusCode,
+		"ok":          false,
+		"error":       statusCode,
 		"description": description,
 	})
 }
-
-

app/api/s_router.go

@@ -0,0 +1,21 @@
+package api
+
+// ApplyRoutes applies router to gin Router
+func (s *Server) applyRoutes() error {
+	return s.container.Invoke(func(
+		sAccount *Account,
+	) error {
+		g := s.router.Group("/api/")
+		v1 := g.Group("/v1")
+		{
+			v1.POST("/signin", Signin)
+			//v1.Use(api.TokenAuthMiddleware())
+			account := v1.Group("/account")
+			{
+				account.POST("/add", sAccount.createAccount)
+				account.GET("/:id", sAccount.getAccount)
+			}
+		}
+		return nil
+	})
+}

app/route/router.go app/api/s_server.go

@@ -1,4 +1,4 @@
-package route
+package api
 
 import (
 	"github.com/belito3/go-web-api/app/config"
@@ -7,13 +7,23 @@ import (
 	"go.uber.org/dig"
 )
 
-func InitGinEngine(container *dig.Container, conf config.AppConfiguration) *gin.Engine {
-	gin.SetMode(conf.RunMode)
+// Server service HTTP requests for our banking service
+type Server struct {
+	conf 		config.AppConfiguration
+	container 	*dig.Container
+	router 		*gin.Engine
+}
+
+func NewServer(conf config.AppConfiguration, container *dig.Container) *Server {
+	return &Server{conf: conf, container: container}
+}
+
+func (s *Server) InitGinEngine() *gin.Engine {
+	gin.SetMode(s.conf.RunMode)
 
 	//app := gin.Default()
 	app := gin.New()
 
-
 	// Add a logger middleware, which:
 	//   - Logs all requests, like a combined access and error log.
 	//   - Logs to stderr.
@@ -23,10 +33,10 @@ func InitGinEngine(container *dig.Container, conf config.AppConfiguration) *gin.
 	app.NoRoute(middleware.NoRouteHandler())
 
 	// rate_limit per client
-	app.Use(middleware.CRateLimiterMiddleware(conf))
+	app.Use(middleware.CRateLimiterMiddleware(s.conf))
 
 	// rate_limit per app
-	app.Use(middleware.ARateLimiterMiddleware(conf))
+	app.Use(middleware.ARateLimiterMiddleware(s.conf))
 
 	app.GET("/", func(c *gin.Context) {
 		c.JSON(200, gin.H{
@@ -36,14 +46,25 @@ func InitGinEngine(container *dig.Container, conf config.AppConfiguration) *gin.
 
 	// CORS
 	app.Use(middleware.CORSMiddleware())
-
+	s.router = app
 
 	// Router register
-	_ = ApplyRoutes(app, container)
+	err := s.injectAPIHandle()
+	handleError(err)
+
+	err = s.applyRoutes()
+	handleError(err)
 
 	// Swagger:
 
 	// Website:
-
 	return app
-}
+}
+
+func handleError(err error) {
+	if err != nil {
+		panic(err)
+	}
+}
+
+