Added more tests

Author: Aristat

README.md

@@ -272,6 +272,6 @@ Usage only `gin` package and oauth2 client/server mechanic
 
 # Testing
 ```
-export APP_WD=go_path to project_path/rsources or project_path/artifacts - needed for load templates
+export APP_WD=go_path to project_path/resources or project_path/artifacts - needed for load templates
 ➜  make test
 ```

app/auth/middleware.go

@@ -5,7 +5,7 @@ import (
 	"net/http"
 	"strings"
 
-	"github.com/aristat/golang-example-app/common"
+	"github.com/aristat/golang-example-app/app/common"
 
 	"github.com/aristat/golang-example-app/app/logger"
 

common/bcrypt.go app/common/bcrypt.gocommon/bcrypt.go renamed to app/common/bcrypt.go

@@ -8,8 +8,8 @@ import (
 
 	"github.com/aristat/golang-example-app/app/db/domain"
 
+	"github.com/aristat/golang-example-app/app/common"
 	"github.com/aristat/golang-example-app/app/grpc"
-	"github.com/aristat/golang-example-app/common"
 	"github.com/aristat/golang-example-app/generated/graphql"
 	"github.com/aristat/golang-example-app/generated/resources/proto/products"
 	"github.com/spf13/cast"

common/constants.go app/common/constants.gocommon/constants.go renamed to app/common/constants.go

@@ -6,9 +6,10 @@ import (
 	"log"
 	"net"
 	"os"
+	"strconv"
 	"testing"
 
-	"github.com/aristat/golang-example-app/common"
+	"github.com/aristat/golang-example-app/app/common"
 
 	"github.com/aristat/golang-example-app/generated/resources/proto/products"
 
@@ -23,16 +24,17 @@ import (
 
 var (
 	productServerHost = "localhost"
-	productServerPort = ":50051"
+	grpcPort          string
 )
 
 func TestMain(m *testing.M) {
-	lis, err := net.Listen("tcp", productServerPort)
+	lis, err := net.Listen("tcp", ":0")
 	if err != nil {
 		log.Fatalf(err.Error())
 	}
 	defer lis.Close()
 
+	grpcPort = ":" + strconv.Itoa(lis.Addr().(*net.TCPAddr).Port)
 	s := grpc.NewServer()
 	products.RegisterProductsServer(s, &resolver.ProductServerMock{})
 
@@ -52,7 +54,7 @@ func TestList(t *testing.T) {
 	ctx := context.Background()
 	opts = append(opts, grpc.WithInsecure())
 
-	pool, _ := grpc1.NewPool(ctx, common.SrvProducts, productServerHost+productServerPort, grpc1.ConnOptions(opts...))
+	pool, _ := grpc1.NewPool(ctx, common.SrvProducts, productServerHost+grpcPort, grpc1.ConnOptions(opts...))
 	grpc1.SetPool(pool, common.SrvProducts)
 
 	cfg, _, err := resolver.BuildTest()

common/graphql.go app/common/graphql.gocommon/graphql.go renamed to app/common/graphql.go

@@ -3,7 +3,7 @@ package resolver
 import (
 	"context"
 
-	"github.com/aristat/golang-example-app/common"
+	"github.com/aristat/golang-example-app/app/common"
 
 	graphql1 "github.com/aristat/golang-example-app/generated/graphql"
 	"github.com/spf13/cast"

common/jaeger.go app/common/jaeger.gocommon/jaeger.go renamed to app/common/jaeger.go

@@ -9,7 +9,7 @@ import (
 
 	"github.com/nats-io/stan.go"
 
-	"github.com/aristat/golang-example-app/common"
+	"github.com/aristat/golang-example-app/app/common"
 	"github.com/go-chi/chi"
 	"github.com/nats-io/nats.go"
 
@@ -32,13 +32,13 @@ func (router *Router) Run(chiRouter chi.Router) {
 	chiRouter.Get("/products_slowly", router.GetProductsSlowly)
 }
 
-func (service *Router) GetProductsGrpc(w http.ResponseWriter, r *http.Request) {
-	conn, d, err := grpc.GetConnGRPC(service.poolManager, common.SrvProducts)
+func (router *Router) GetProductsGrpc(w http.ResponseWriter, r *http.Request) {
+	conn, d, err := grpc.GetConnGRPC(router.poolManager, common.SrvProducts)
 	defer d()
 	defer r.Body.Close()
 
 	if err != nil {
-		service.logger.Printf("[ERROR] %s", err.Error())
+		router.logger.Printf("[ERROR] %s", err.Error())
 		http.Error(w, err.Error(), http.StatusInternalServerError)
 		return
 	}
@@ -60,20 +60,20 @@ func (service *Router) GetProductsGrpc(w http.ResponseWriter, r *http.Request) {
 	e.Encode(productOut)
 }
 
-func (service *Router) GetProductsNats(w http.ResponseWriter, r *http.Request) {
+func (router *Router) GetProductsNats(w http.ResponseWriter, r *http.Request) {
 	// Connect to NATS
-	nc, err := nats.Connect(service.cfg.NatsURL)
+	nc, err := nats.Connect(router.cfg.NatsURL)
 	if err != nil {
-		service.logger.Error(err.Error())
+		router.logger.Error(err.Error())
 	}
 	defer nc.Close()
 
 	sc, err := stan.Connect("test-cluster", "stan-pub", stan.NatsConn(nc))
 	message := "Hello"
-	service.logger.Printf("[NATS] send %s", message)
-	err = sc.Publish(service.cfg.Subject, []byte(message))
+	router.logger.Printf("[NATS] send %s", message)
+	err = sc.Publish(router.cfg.Subject, []byte(message))
 	if err != nil {
-		service.logger.Printf("[ERROR] %s", err.Error())
+		router.logger.Printf("[ERROR] %s", err.Error())
 	}
 
 	// Close connection
@@ -83,10 +83,10 @@ func (service *Router) GetProductsNats(w http.ResponseWriter, r *http.Request) {
 	e.Encode("")
 }
 
-func (service *Router) GetProductsSlowly(w http.ResponseWriter, r *http.Request) {
-	service.logger.Info("Start sleep")
+func (router *Router) GetProductsSlowly(w http.ResponseWriter, r *http.Request) {
+	router.logger.Info("Start sleep")
 	time.Sleep(time.Second * 10)
-	service.logger.Info("Stop sleep")
+	router.logger.Info("Stop sleep")
 	e := json.NewEncoder(w)
 	e.Encode("")
 }