From 2676b0972801325cdea2368af3787db7034bcc91 Mon Sep 17 00:00:00 2001
From: Jeffrey Duroyon <jeffrey.duroyon@gmail.com>
Date: Thu, 4 Nov 2021 02:04:19 +0100
Subject: [PATCH] fix(router): change route declaration

---
 ginserver/router.go         | 33 ++++++++++++++-------------------
 internal/account/service.go |  2 ++
 2 files changed, 16 insertions(+), 19 deletions(-)

diff --git a/ginserver/router.go b/ginserver/router.go
index 96e97e8..0c81f33 100644
--- a/ginserver/router.go
+++ b/ginserver/router.go
@@ -22,7 +22,7 @@ func NewRouter(config *handler.Config) *gin.Engine {
 	router.HandleMethodNotAllowed = true
 
 	router.Use(cors.New(cors.Config{
-		AllowOrigins:     []string{"*"},
+		AllowOrigins:     []string{"http://localhost:8080/", "http://localhost:8080"},
 		AllowMethods:     []string{"*"},
 		AllowHeaders:     []string{"*"},
 		ExposeHeaders:    []string{"*"},
@@ -44,33 +44,28 @@ func NewRouter(config *handler.Config) *gin.Engine {
 	public.Handle(http.MethodGet, "/_health", hc.GetHealth)
 
 	userRoute := public.Group("/users")
-	userRoute.Handle("LOGIN", "", uh.ConnectUser)
+	userRoute.Handle("GET", "", uh.ConnectUser)
 	userRoute.Handle(http.MethodPost, "", uh.CreateUser)
 
 	securedUserRoute := userRoute.Group("")
 	//TODO add secure auth
 	securedUserRoute.Handle(http.MethodGet, "/:userId", uh.GetUser)
-	// end: user routes
 
-	securedAccountRoute := securedUserRoute.Group("/:userId/accounts")
 	//account route
-	securedAccountRoute.Handle(http.MethodGet, "/", ah.GetAllAccountOfUser)
-	securedAccountRoute.Handle(http.MethodPost, "/:accountId", ah.CreateAccountOfUser)
-	securedAccountRoute.Handle(http.MethodDelete, "/:accountId", ah.DeleteAccountOfUser)
-	securedAccountRoute.Handle(http.MethodGet, "/", ah.GetSpecificAccountOfUser)
+	securedUserRoute.Handle(http.MethodGet, "/:userId/accounts", ah.GetAllAccountOfUser)
+	securedUserRoute.Handle(http.MethodPost, "/:userId/accounts/:accountId", ah.CreateAccountOfUser)
+	securedUserRoute.Handle(http.MethodDelete, "/:userId/accounts/:accountId", ah.DeleteAccountOfUser)
+	securedUserRoute.Handle(http.MethodGet, "/:userId/accounts/:accountId", ah.GetSpecificAccountOfUser)
 
-	securedSharedAccountRoute := securedUserRoute.Group("/:userId/sharedaccounts")
 	//shared route
-	securedSharedAccountRoute.Handle(http.MethodPost, "/:accountId", sah.ShareAnAccount)
-	securedSharedAccountRoute.Handle(http.MethodDelete, "/:accountId", sah.DeleteSharedAccount)
-	securedSharedAccountRoute.Handle(http.MethodGet, "/", sah.GetAllSharedAccountOfUser)
-	securedSharedAccountRoute.Handle(http.MethodGet, "/:sharedAccountId", sah.GetSpecificSharedAccountOfUser)
+	securedUserRoute.Handle(http.MethodPost, "/:userId/sharedaccounts/:accountId", sah.ShareAnAccount)
+	securedUserRoute.Handle(http.MethodDelete, "/:userId/sharedaccounts/:accountId", sah.DeleteSharedAccount)
+	securedUserRoute.Handle(http.MethodGet, "/:userId/sharedaccounts", sah.GetAllSharedAccountOfUser)
+	securedUserRoute.Handle(http.MethodGet, "/:userId/sharedaccounts/:sharedAccountId", sah.GetSpecificSharedAccountOfUser)
 
-	securedExpenseRoute := securedUserRoute.Group("/:userId/accounts/:accountId/expenses")
-	//expense route
-	securedExpenseRoute.Handle(http.MethodPost, "/", eh.CreateAnExpense)
-	securedExpenseRoute.Handle(http.MethodDelete, "/:expenseId", eh.DeleteExpense)
-	securedExpenseRoute.Handle(http.MethodGet, "/", eh.GetAllExpenses)
-	securedExpenseRoute.Handle(http.MethodGet, "/:expenseId", eh.GetAnExpenses)
+	securedUserRoute.Handle(http.MethodPost, "/:userId/accounts/:accountId/expenses", eh.CreateAnExpense)
+	securedUserRoute.Handle(http.MethodDelete, "/:userId/accounts/:accountId/expenses/:expenseId", eh.DeleteExpense)
+	securedUserRoute.Handle(http.MethodGet, "/:userId/accounts/:accountId/expenses", eh.GetAllExpenses)
+	securedUserRoute.Handle(http.MethodGet, "/:userId/accounts/:accountId/expenses/:expenseId", eh.GetAnExpenses)
 	return router
 }
diff --git a/internal/account/service.go b/internal/account/service.go
index 95cf938..f3e204f 100644
--- a/internal/account/service.go
+++ b/internal/account/service.go
@@ -3,6 +3,7 @@ package account
 import (
 	"nos-comptes/internal/storage/dao"
 	"nos-comptes/internal/storage/model"
+	"nos-comptes/internal/utils"
 )
 
 type Service struct {
@@ -11,6 +12,7 @@ type Service struct {
 
 func (s *Service) GetAllAccountOfUser(userId string) ([]*Account, error) {
 	accounts, err := s.db.GetAllAccountOfUser(userId)
+	utils.GetLogger().Warn(err)
 	if e, ok := err.(*dao.Error); ok {
 		switch {
 		case e.Type == dao.ErrTypeNotFound: