Merge pull request #21 from dami-pie/infra/restruct

infra: modificações estruturais nas pastas

src/config/config.go

@@ -1,9 +1,10 @@
 package config
 
 import (
-	"github.com/joho/godotenv"
 	"log"
 	"os"
+
+	"github.com/joho/godotenv"
 )
 
 var (
@@ -16,7 +17,7 @@ var (
 	KeyFile            = ""
 )
 
-func init() {
+func LoadEnv() {
 	err := godotenv.Load(".env")
 
 	if err != nil {

src/controllers/auth.go

@@ -2,11 +2,12 @@ package controllers
 
 import (
 	"errors"
-	"github.com/dami-pie/napi/models"
-	"github.com/dami-pie/napi/src/auth"
-	"github.com/dami-pie/napi/src/responses"
 	"log"
 	"net/http"
+
+	"github.com/dami-pie/napi/models"
+	"github.com/dami-pie/napi/src/responses"
+	auth "github.com/dami-pie/napi/src/services"
 )
 
 func Login(res http.ResponseWriter, req *http.Request) {

src/middlewares/middlewares.go

@@ -1,10 +1,11 @@
 package middlewares
 
 import (
-	"github.com/dami-pie/napi/src/auth"
-	"github.com/dami-pie/napi/src/responses"
 	"log"
 	"net/http"
+
+	"github.com/dami-pie/napi/src/responses"
+	auth "github.com/dami-pie/napi/src/services"
 )
 
 // Escreve as informações da requisição no terminal

src/router/router.go

@@ -1,11 +1,24 @@
 package router
 
 import (
-	"github.com/dami-pie/napi/src/router/routes"
+	"github.com/dami-pie/napi/src/middlewares"
+	"github.com/dami-pie/napi/src/routes"
 	"github.com/gorilla/mux"
 )
 
-func AddRoutes() *mux.Router {
+// Configurar coloca todas as rotas dentro do router
+func ConfigRoutes() *mux.Router {
 	r := mux.NewRouter()
-	return routes.ConfigRoutes(r)
+	routes := routes.AuthRoutes
+
+	for _, route := range routes {
+		if route.RequerAutenticacao {
+			r.HandleFunc(route.URI, middlewares.Logger(middlewares.AuthenticateUser(route.Funcao))).Methods(route.Metodo)
+		} else {
+			r.HandleFunc(route.URI, middlewares.Logger(route.Funcao)).Methods(route.Metodo)
+		}
+
+	}
+
+	return r
 }

src/router/routes/auth.go → src/routes/auth.go

@@ -1,11 +1,12 @@
 package routes
 
 import (
-	"github.com/dami-pie/napi/src/controllers"
 	"net/http"
+
+	"github.com/dami-pie/napi/src/controllers"
 )
 
-var apiRoutes = []Route{
+var AuthRoutes = []Route{
 	{
 		URI:                "/authenticate",
 		Metodo:             http.MethodPost,

src/routes/routes_config.go

@@ -0,0 +1,10 @@
+package routes
+
+import "net/http"
+
+type Route struct {
+	URI                string
+	Metodo             string
+	Funcao             func(http.ResponseWriter, *http.Request)
+	RequerAutenticacao bool
+}

src/server/server.go

@@ -2,12 +2,13 @@ package server
 
 import (
 	"fmt"
+	"log"
+	"net/http"
+
 	"github.com/dami-pie/napi/src/config"
 	"github.com/dami-pie/napi/src/router"
 	"github.com/gorilla/handlers"
 	"github.com/gorilla/mux"
-	"log"
-	"net/http"
 )
 
 type Server struct {
@@ -16,9 +17,11 @@ type Server struct {
 }
 
 func NewServer() *Server {
+	config.LoadEnv()
+
 	return &Server{
 		port:   config.Port,
-		routes: router.AddRoutes(),
+		routes: router.ConfigRoutes(),
 	}
 }