wip

add b asic endpoint
debut ajout compte joint
2022-10-20 10:36:29 +02:00 · 2022-05-20 00:52:07 +02:00 · 2022-05-13 01:38:03 +02:00 · 2021-11-30 01:46:51 +01:00 · 2021-11-26 01:51:13 +01:00 · 2021-11-24 01:07:19 +01:00
45 changed files with 1310 additions and 391 deletions
--- a/.DS_Store
+++ b/.DS_Store
--- a/.gitignore
+++ b/.gitignore
@@ -12,6 +12,6 @@
 *.out
 .idea/
-nos-comptes*
+budget*
 vendor/
--- a/4
+++ b/4
@@ -19,8 +19,8 @@ RUN apk --no-cache add ca-certificates
 WORKDIR /app
-COPY --from=builder /go/bin/noscomptes .
+COPY --from=builder /go/bin/budgets .
 EXPOSE 8080
-ENTRYPOINT ["/app/noscomptes"]
+ENTRYPOINT ["/app/budgets"]
 CMD ["serve", "--logformat", "json", "--loglevel", "debug"]
--- a/15
+++ b/15
@@ -6,9 +6,9 @@ PREFIX?=$(shell pwd)
 VERSION := 1.0
 # Setup name variables for the package/tool
-NAME := nos-comptes
+NAME := budget
-BIN_NAME := noscomptes
+BIN_NAME := budgets
-PKG := github.com/kratisto/nos-comptes
+PKG := github.com/kratisto/budget
 DOCKER_IMAGE_NAME := $(NAME)
 # GO env vars
@@ -43,12 +43,11 @@ local-format: ## format locally all files
 	gofmt -s -l -w .
 .PHONY: build
-build: sources-image ## Build the docker image with application binary
+build: ## Build the docker image with application binary
 	@echo "+ $@"
 	docker build --no-cache \
-				 -f containers/Dockerfile \
+				 -f Dockerfile \
-				 --build-arg SOURCES_IMAGE=$(NAME)-sources:$(VERSION) \
+				 -t $(NAME):$(VERSION) .
 				 -t poketools:$(VERSION) .
 GIT_CREDENTIALS?=$(shell cat ~/.git-credentials 2> /dev/null)
 .PHONY: sources-image
@@ -78,7 +77,7 @@ local-launch-golang: ## Build the server and run it
 		kill $$PID || true
 	$(MAKE) $(BUILD_GOLANG_CMD)
 	DB_PORT=`docker-compose -p $(DOCKER_IMAGE_NAME)-uuid -f containers/docker-compose.local.yml port database 5432  | cut -f2 -d':'`; \
-		$(LAUNCH_GOLANG_CMD) serve --port 8081 --loglevel debug  --logformat text --dbconnectionuri "postgresql://postgres:postgres@localhost:$$DB_PORT/nos_comptes?sslmode=disable"
+		$(LAUNCH_GOLANG_CMD) serve --port 8081 --loglevel debug  --logformat text --dbconnectionuri "postgresql://postgres:postgres@localhost:$$DB_PORT/budget?sslmode=disable"
 .PHONY: local-run
 local-run: local-run-dependencies local-run-golang ## Run the server with its dependencies
--- a/README.md
+++ b/README.md
@@ -1 +1 @@
-# nos-comptes
+# budget
--- a/cmd/root.go
+++ b/cmd/root.go
@@ -1,10 +1,10 @@
 package cmd
 import (
 	"budget/ginserver"
 	"budget/handler"
 	"budget/internal/utils"
 	"fmt"
 	"nos-comptes/ginserver"
 	"nos-comptes/handler"
 	"nos-comptes/internal/utils"
 	"os"
 	"github.com/sirupsen/logrus"
@@ -34,8 +34,8 @@ var (
 )
 var rootCmd = &cobra.Command{
-	Use:   "nos-comptes",
+	Use:   "budget",
-	Short: "nos-comptes",
+	Short: "budget",
 	Run: func(cmd *cobra.Command, args []string) {
 		utils.InitLogger(config.LogLevel, config.LogFormat)
 		logrus.
@@ -46,7 +46,6 @@ var rootCmd = &cobra.Command{
 			WithField(parameterPort, config.Port).
 			WithField(parameterDBConnectionURI, config.DBConnectionURI).
 			Warn("Configuration")
 		router := ginserver.NewRouter(config)
 		router.Run(fmt.Sprintf(":%d", config.Port))
 	},
--- a/containers/docker-compose.local.yml
+++ b/containers/docker-compose.local.yml
@@ -4,8 +4,8 @@ services:
  database:
    image: postgres:10-alpine
    environment:
-      - POSTGRES_DB=nos_comptes
+      - POSTGRES_DB=budget
-      - POSTGRES_PASSWORD=nos_comptes
+      - POSTGRES_PASSWORD=budget
      - POSTGRES_HOST_AUTH_METHOD=trust
    ports:
      - "5432"
@@ -23,10 +23,10 @@ services:
    links:
      - database
    environment:
-      - LIQUIBASE_DATABASE=nos_comptes
+      - LIQUIBASE_DATABASE=budget
      - LIQUIBASE_HOST=database
-      - LIQUIBASE_USERNAME=nos_comptes
+      - LIQUIBASE_USERNAME=budget
-      - LIQUIBASE_PASSWORD=nos_comptes
+      - LIQUIBASE_PASSWORD=budget
      - LIQUIBASE_CHANGELOG=/changelogs/changelog-master.xml
      - LIQUIBASE_URL=jdbc:postgresql://database:5432/postgres
    volumes:
--- a/ginserver/logger.go
+++ b/ginserver/logger.go
@@ -1,8 +1,8 @@
 package ginserver
 import (
 	"budget/internal/utils"
 	"math/rand"
 	utils2 "nos-comptes/internal/utils"
 	"time"
 	"github.com/gin-gonic/gin"
@@ -37,16 +37,16 @@ func randStringBytesMaskImprSrc(n int) string {
 func GetLoggerMiddleware() gin.HandlerFunc {
 	return func(c *gin.Context) {
-		correlationID := c.Request.Header.Get(utils2.HeaderNameCorrelationID)
+		correlationID := c.Request.Header.Get(utils.HeaderNameCorrelationID)
 		if correlationID == "" {
 			correlationID = randStringBytesMaskImprSrc(30)
-			c.Writer.Header().Set(utils2.HeaderNameCorrelationID, correlationID)
+			c.Writer.Header().Set(utils.HeaderNameCorrelationID, correlationID)
 		}
-		logger := utils2.GetLogger()
+		logger := utils.GetLogger()
-		logEntry := logger.WithField(utils2.HeaderNameCorrelationID, correlationID)
+		logEntry := logger.WithField(utils.HeaderNameCorrelationID, correlationID)
-		c.Set(utils2.ContextKeyLogger, logEntry)
+		c.Set(utils.ContextKeyLogger, logEntry)
 	}
 }
@@ -54,7 +54,7 @@ func GetHTTPLoggerMiddleware() gin.HandlerFunc {
 	return func(c *gin.Context) {
 		start := time.Now()
-		utils2.GetLoggerFromCtx(c).
+		utils.GetLoggerFromCtx(c).
 			WithField("method", c.Request.Method).
 			WithField("url", c.Request.RequestURI).
 			WithField("from", c.ClientIP()).
@@ -63,7 +63,7 @@ func GetHTTPLoggerMiddleware() gin.HandlerFunc {
 		c.Next()
 		d := time.Since(start)
-		utils2.GetLoggerFromCtx(c).
+		utils.GetLoggerFromCtx(c).
 			WithField("status", c.Writer.Status()).
 			WithField("duration", d.String()).
 			Info("end handling HTTP request")
--- a/ginserver/router.go
+++ b/ginserver/router.go
@@ -1,14 +1,14 @@
 package ginserver
 import (
 	"budget/handler"
 	"budget/internal/account"
 	"budget/internal/expense"
 	"budget/internal/jointaccount"
 	"budget/internal/storage/dao/postgresql"
 	"budget/internal/user"
 	"budget/middleware"
 	"net/http"
 	"nos-comptes/handler"
 	"nos-comptes/internal/account"
 	"nos-comptes/internal/expense"
 	sharedaccount "nos-comptes/internal/shared-account"
 	"nos-comptes/internal/storage/dao/postgresql"
 	"nos-comptes/internal/user"
 	"nos-comptes/middleware"
 	"time"
 	"github.com/gin-gonic/gin"
@@ -38,9 +38,9 @@ func NewRouter(config *handler.Config) *gin.Engine {
 	hc := handler.NewContext()
 	uh := user.NewHandler(hc, db)
 	ah := account.NewHandler(hc, db)
-	sah := sharedaccount.NewHandler(hc, db)
+	jah := jointaccount.NewHandler(hc, db)
 	eh := expense.NewHandler(hc, db)
-
+	mv := middleware.NewValidator(hc, db)
 	public := router.Group("/")
 	public.Handle(http.MethodGet, "/_health", hc.GetHealth)
@@ -48,26 +48,40 @@ func NewRouter(config *handler.Config) *gin.Engine {
 	userRoute.Handle("GET", "", uh.ConnectUser)
 	userRoute.Handle(http.MethodPost, "", uh.CreateUser)
-	securedUserRoute := userRoute.Group("")
+	securedUserRoute := userRoute.Group("/")
 	securedUserRoute.Use(middleware.ValidateOAuthToken)
 	//TODO add secure auth
 	securedUserRoute.Handle(http.MethodGet, "/:userId", uh.GetUser)
 	securedMatchingToken := securedUserRoute.Group("/:userId")
 	securedMatchingToken.Use(mv.HasValidUserId)
 	securedMatchingToken.Use(mv.UserdIdMatchOAuthToken)
 	//account route
-	securedUserRoute.Handle(http.MethodGet, "/:userId/accounts", ah.GetAllAccountOfUser)
+	securedMatchingToken.Handle(http.MethodGet, "/accounts", ah.GetAllAccountOfUser)
-	securedUserRoute.Handle(http.MethodPost, "/:userId/accounts", ah.CreateAccountOfUser)
+	securedMatchingToken.Handle(http.MethodPost, "/accounts", ah.CreateAccountOfUser)
 	securedUserRoute.Handle(http.MethodDelete, "/:userId/accounts/:accountId", ah.DeleteAccountOfUser)
 	securedUserRoute.Handle(http.MethodGet, "/:userId/accounts/:accountId", ah.GetSpecificAccountOfUser)
-	//shared route
+	securedValidAccount := securedMatchingToken.Group("/accounts/:accountId")
-	securedUserRoute.Handle(http.MethodPost, "/:userId/sharedaccounts/:accountId", sah.ShareAnAccount)
+	securedValidAccount.Use(mv.HasValidAccountId)
-	securedUserRoute.Handle(http.MethodDelete, "/:userId/sharedaccounts/:accountId", sah.DeleteSharedAccount)
+	securedValidAccount.Use(mv.AccountExists)
-	securedUserRoute.Handle(http.MethodGet, "/:userId/sharedaccounts", sah.GetAllSharedAccountOfUser)
+	securedValidAccount.Handle(http.MethodDelete, "", ah.DeleteAccountOfUser)
-	securedUserRoute.Handle(http.MethodGet, "/:userId/sharedaccounts/:sharedAccountId", sah.GetSpecificSharedAccountOfUser)
+	securedValidAccount.Handle(http.MethodGet, "", ah.GetSpecificAccountOfUser)
 	securedValidAccount.Handle(http.MethodPost, "/expenses", eh.CreateAnExpense)
 	securedValidAccount.Handle(http.MethodGet, "/expenses", eh.GetAllExpenses)
-	securedUserRoute.Handle(http.MethodPost, "/:userId/accounts/:accountId/expenses", eh.CreateAnExpense)
+	securedExistingExpenses := securedValidAccount.Group("/expenses/:expenseId")
-	securedUserRoute.Handle(http.MethodDelete, "/:userId/accounts/:accountId/expenses/:expenseId", eh.DeleteExpense)
+	securedExistingExpenses.Handle(http.MethodGet, "", eh.GetAnExpenses)
-	securedUserRoute.Handle(http.MethodGet, "/:userId/accounts/:accountId/expenses", eh.GetAllExpenses)
+	securedExistingExpenses.Handle(http.MethodDelete, "", eh.DeleteExpense)
-	securedUserRoute.Handle(http.MethodGet, "/:userId/accounts/:accountId/expenses/:expenseId", eh.GetAnExpenses)
+
 	//account route
 	securedMatchingToken.Handle(http.MethodGet, "/jointaccounts", jah.GetAllJointaccountOfUser)
 	securedMatchingToken.Handle(http.MethodPost, "/jointaccounts", jah.CreateJointaccountOfUser)
 	securedValidJointAccount := securedMatchingToken.Group("/jointaccounts/:jointaccountId")
 	securedValidJointAccount.Use(mv.HasValidJointAccountId)
 	securedValidJointAccount.Use(mv.JointAccountExists)
 	securedValidJointAccount.Handle(http.MethodDelete, "", jah.DeleteJointaccountOfUser)
 	securedValidJointAccount.Handle(http.MethodGet, "", jah.GetSpecificJointaccountOfUser)
 	securedValidJointAccount.Handle(http.MethodPost, "/expenses", eh.CreateAnExpense)
 	securedValidJointAccount.Handle(http.MethodGet, "/expenses", eh.GetAllExpenses)
 	return router
 }
--- a/go.mod
+++ b/go.mod
@@ -1,4 +1,4 @@
-module nos-comptes
+module budget
 go 1.17
--- a/go.sum
+++ b/go.sum
@@ -1,6 +1,5 @@
 cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw=
 cloud.google.com/go v0.34.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw=
 cloud.google.com/go v0.38.0 h1:ROfEUZz+Gh5pa62DJWXSaonyu3StP6EA6lPEXPI6mCo=
 cloud.google.com/go v0.38.0/go.mod h1:990N+gfupTy94rShfmMCWGDn0LpTmnzTp2qbd1dvSRU=
 cloud.google.com/go v0.44.1/go.mod h1:iSa0KzasP4Uvy3f1mN/7PiObzGgflwredwwASm/v6AU=
 cloud.google.com/go v0.44.2/go.mod h1:60680Gw3Yr4ikxnPRS/oxxkBccT6SA1yMk63TGekxKY=
@@ -10,9 +9,7 @@ cloud.google.com/go v0.50.0/go.mod h1:r9sluTvynVuxRIOHXQEHMFffphuXHOMZMycpNR5e6T
 cloud.google.com/go v0.52.0/go.mod h1:pXajvRH/6o3+F9jDHZWQ5PbGhn+o8w9qiu/CffaVdO4=
 cloud.google.com/go v0.53.0/go.mod h1:fp/UouUEsRkN6ryDKNW/Upv/JBKnv6WDthjR6+vze6M=
 cloud.google.com/go v0.54.0/go.mod h1:1rq2OEkV3YMf6n/9ZvGWI3GWw0VoqH/1x2nd8Is/bPc=
 cloud.google.com/go v0.56.0 h1:WRz29PgAsVEyPSDHyk+0fpEkwEFyfhHn+JbksT6gIL4=
 cloud.google.com/go v0.56.0/go.mod h1:jr7tqZxxKOVYizybht9+26Z/gUq7tiRzu+ACVAMbKVk=
 cloud.google.com/go v0.57.0 h1:EpMNVUorLiZIELdMZbCYX/ByTFCdoYopYAGxaGVz9ms=
 cloud.google.com/go v0.57.0/go.mod h1:oXiQ6Rzq3RAkkY7N6t3TcE6jE+CIBBbA36lwQ1JyzZs=
 cloud.google.com/go v0.62.0/go.mod h1:jmCYTdRCQuc1PHIIJ/maLInMho30T/Y0M4hTdTShOYc=
 cloud.google.com/go v0.65.0/go.mod h1:O5N8zS7uWy9vkA9vayVHs65eM1ubvY4h553ofrNHObY=
@@ -49,24 +46,15 @@ cloud.google.com/go/storage v1.6.0/go.mod h1:N7U0C8pVQ/+NIKOBQyamJIeKQKkZ+mxpohl
 cloud.google.com/go/storage v1.8.0/go.mod h1:Wv1Oy7z6Yz3DshWRJFhqM/UCfaWIRTdp0RXyy7KQOVs=
 cloud.google.com/go/storage v1.10.0/go.mod h1:FLPqc6j+Ki4BU591ie1oL6qBQGu2Bl/tZ9ullr3+Kg0=
 dmitri.shuralyov.com/gpu/mtl v0.0.0-20190408044501-666a987793e9/go.mod h1:H6x//7gZCb22OMCxBHrMx7a5I7Hp++hsVxbQ4BYO7hU=
 github.com/BurntSushi/toml v0.3.1 h1:WXkYYl6Yr3qBf1K79EBnL4mak0OimBfB0XUf9Vl28OQ=
 github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=
 github.com/BurntSushi/xgb v0.0.0-20160522181843-27f122750802/go.mod h1:IVnqGOEym/WlBOVXweHU+Q+/VP0lqqI8lqeDx9IjBqo=
 github.com/OneOfOne/xxhash v1.2.2/go.mod h1:HSdplMjZKSmBqAxg5vPj2TmRDmfkzw+cTzAElWljhcU=
 github.com/alecthomas/template v0.0.0-20160405071501-a0175ee3bccc/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc=
 github.com/alecthomas/units v0.0.0-20151022065526-2efee857e7cf/go.mod h1:ybxpYRFXyAe+OPACYpWeL0wqObRcbAqCMya13uyzqw0=
 github.com/allegro/bigcache v1.2.1 h1:hg1sY1raCwic3Vnsvje6TT7/pnZba83LeFck5NrFKSc=
 github.com/allegro/bigcache v1.2.1/go.mod h1:Cb/ax3seSYIx7SuZdm2G2xzfwmv3TPSk2ucNfQESPXM=
 github.com/antihax/optional v1.0.0/go.mod h1:uupD/76wgC+ih3iEmQUL+0Ugr19nfwCT1kdvxnR2qWY=
 github.com/armon/circbuf v0.0.0-20150827004946-bbbad097214e/go.mod h1:3U/XgcO3hCbHZ8TKRvWD2dDTCfh9M9ya+I9JpbB7O8o=
 github.com/armon/consul-api v0.0.0-20180202201655-eb2c6b5be1b6/go.mod h1:grANhF5doyWs3UAsr3K4I6qtAmlQcZDesFNEHPZAzj8=
 github.com/armon/go-metrics v0.0.0-20180917152333-f0300d1749da/go.mod h1:Q73ZrmVTwzkszR9V5SSuryQ31EELlFMUz1kKyl939pY=
 github.com/armon/go-radix v0.0.0-20180808171621-7fddfc383310/go.mod h1:ufUuZ+zHj4x4TnLV4JWEpy2hxWSpsRywHrMgIH9cCH8=
 github.com/armon/go-radix v1.0.0/go.mod h1:ufUuZ+zHj4x4TnLV4JWEpy2hxWSpsRywHrMgIH9cCH8=
 github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973/go.mod h1:Dwedo/Wpr24TaqPxmxbtue+5NUziq4I4S80YR8gNf3Q=
 github.com/beorn7/perks v1.0.0/go.mod h1:KWe93zE9D1o94FZ5RNwFwVgaQK1VOXiVxmqh+CedLV8=
 github.com/bgentry/speakeasy v0.1.0/go.mod h1:+zsyZBPWlz7T6j88CTgSN5bM796AkVf0kBD4zp0CCIs=
 github.com/bketelsen/crypt v0.0.3-0.20200106085610-5cbc8cc4026c/go.mod h1:MKsuJmJgSg28kpZDP6UIiPt0e0Oz0kqKNGyRaWEPv84=
 github.com/bketelsen/crypt v0.0.4/go.mod h1:aI6NrJ0pMGgvZKL1iVgXLnfIFJtfV+bKCoqOes/6LfM=
 github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU=
 github.com/cespare/xxhash v1.1.0/go.mod h1:XrSqR1VqqWfGrhpAt58auRo0WTKS1nRRg3ghfAqPWnc=
@@ -78,20 +66,12 @@ github.com/cncf/udpa/go v0.0.0-20191209042840-269d4d468f6f/go.mod h1:M8M6+tZqaGX
 github.com/cncf/udpa/go v0.0.0-20200629203442-efcf912fb354/go.mod h1:WmhPx2Nbnhtbo57+VJT5O0JRkEi1Wbu0z5j0R8u5Hbk=
 github.com/cncf/udpa/go v0.0.0-20201120205902-5459f2c99403/go.mod h1:WmhPx2Nbnhtbo57+VJT5O0JRkEi1Wbu0z5j0R8u5Hbk=
 github.com/cncf/xds/go v0.0.0-20210312221358-fbca930ec8ed/go.mod h1:eXthEFrGJvWHgFFCl3hGmgk+/aYT6PnTQLykKQRLhEs=
 github.com/coreos/bbolt v1.3.2/go.mod h1:iRUV2dpdMOn7Bo10OQBFzIJO9kkE559Wcmn+qkEiiKk=
 github.com/coreos/etcd v3.3.10+incompatible/go.mod h1:uF7uidLiAD3TWHmW31ZFd/JWoc32PjwdhPthX9715RE=
 github.com/coreos/etcd v3.3.13+incompatible/go.mod h1:uF7uidLiAD3TWHmW31ZFd/JWoc32PjwdhPthX9715RE=
 github.com/coreos/go-semver v0.2.0/go.mod h1:nnelYz7RCh+5ahJtPPxZlU+153eP4D4r3EedlOD2RNk=
 github.com/coreos/go-semver v0.3.0/go.mod h1:nnelYz7RCh+5ahJtPPxZlU+153eP4D4r3EedlOD2RNk=
 github.com/coreos/go-systemd v0.0.0-20190321100706-95778dfbb74e/go.mod h1:F5haX7vjVVG0kc13fIWeqUViNPyEJxv/OmvnBo0Yme4=
 github.com/coreos/go-systemd/v22 v22.3.2/go.mod h1:Y58oyj3AT4RCenI/lSvhwexgC+NSVTIJ3seZv2GcEnc=
 github.com/coreos/pkg v0.0.0-20180928190104-399ea9e2e55f/go.mod h1:E3G3o1h8I7cfcXa63jLwjI0eiQQMgzzUDFVpN/nH/eA=
 github.com/cpuguy83/go-md2man/v2 v2.0.0/go.mod h1:maD7wRr/U5Z6m/iR4s+kqSMx2CaBsrgA7czyZG/E6dU=
 github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
 github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/dgrijalva/jwt-go v3.2.0+incompatible/go.mod h1:E3ru+11k8xSBh+hMPgOLZmtrrCbhqsmaPHjLKYnJCaQ=
 github.com/dgryski/go-sip13 v0.0.0-20181026042036-e10d5fee7954/go.mod h1:vAd38F8PWV+bWy6jNmig1y/TA+kYO4g3RSRF0IAv0no=
 github.com/envoyproxy/go-control-plane v0.9.0/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4=
 github.com/envoyproxy/go-control-plane v0.9.1-0.20191026205805-5f8ba28d4473/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4=
 github.com/envoyproxy/go-control-plane v0.9.4/go.mod h1:6rpuAdCZL397s3pYoYcLgu1mIlRU8Am5FuJP05cCM98=
@@ -102,9 +82,6 @@ github.com/envoyproxy/go-control-plane v0.9.9-0.20210512163311-63b5d3c536b0/go.m
 github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c=
 github.com/fatih/color v1.7.0/go.mod h1:Zm6kSWBoL9eyXnKyktHP6abPY2pDugNf5KwzbycvMj4=
 github.com/fatih/color v1.9.0/go.mod h1:eQcE1qtQxscV5RaZvpXrrb8Drkc3/DdQ+uUYCNjL+zU=
 github.com/fsnotify/fsnotify v1.4.7 h1:IXs+QLmnXW2CcXuY+8Mzv/fWEsPGWxqefPtCP5CnV9I=
 github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo=
 github.com/fsnotify/fsnotify v1.4.9 h1:hsms1Qyu0jgnwNXIxa+/V/PDsU6CfLf6CNO8H7IWoS4=
 github.com/fsnotify/fsnotify v1.4.9/go.mod h1:znqG4EE+3YCdAaPaxE2ZRY/06pZUdp0tY4IgpuI1SZQ=
 github.com/fsnotify/fsnotify v1.5.1 h1:mZcQUHVQUQWoPXXtuf9yuEXKudkV2sx1E06UadKWpgI=
 github.com/fsnotify/fsnotify v1.5.1/go.mod h1:T3375wBYaZdLLcVNkcVbzGHY7f1l/uK5T5Ai1i3InKU=
@@ -113,42 +90,25 @@ github.com/gin-contrib/cors v1.3.1 h1:doAsuITavI4IOcd0Y19U4B+O0dNWihRyX//nn4sEmg
 github.com/gin-contrib/cors v1.3.1/go.mod h1:jjEJ4268OPZUcU7k9Pm653S7lXUGcqMADzFA61xsmDk=
 github.com/gin-contrib/sse v0.1.0 h1:Y/yl/+YNO8GZSjAhjMsSuLt29uWRFHdHYUb5lYOV9qE=
 github.com/gin-contrib/sse v0.1.0/go.mod h1:RHrZQHXnP2xjPF+u1gW/2HnVO7nvIa9PG3Gm+fLHvGI=
 github.com/gin-gonic/gin v1.5.0 h1:fi+bqFAx/oLK54somfCtEZs9HeH1LHVoEPUgARpTqyc=
 github.com/gin-gonic/gin v1.5.0/go.mod h1:Nd6IXA8m5kNZdNEHMBd93KT+mdY3+bewLgRvmCsR2Do=
 github.com/gin-gonic/gin v1.6.3 h1:ahKqKTFpO5KTPHxWZjEdPScmYaGtLo8Y4DMHoEsnp14=
 github.com/gin-gonic/gin v1.6.3/go.mod h1:75u5sXoLsGZoRN5Sgbi1eraJ4GU3++wFwWzhwvtwp4M=
 github.com/gin-gonic/gin v1.7.4 h1:QmUZXrvJ9qZ3GfWvQ+2wnW/1ePrTEJqPKMYEU3lD/DM=
 github.com/gin-gonic/gin v1.7.4/go.mod h1:jD2toBW3GZUr5UMcdrwQA10I7RuaFOl/SGeDjXkfUtY=
 github.com/go-gl/glfw v0.0.0-20190409004039-e6da0acd62b1/go.mod h1:vR7hzQXu2zJy9AVAgeJqvqgH9Q5CA+iKCZ2gyEVpxRU=
 github.com/go-gl/glfw/v3.3/glfw v0.0.0-20191125211704-12ad95a8df72/go.mod h1:tQ2UAYgL5IevRw8kRxooKSPJfGvJ9fJQFa0TUsXzTg8=
 github.com/go-gl/glfw/v3.3/glfw v0.0.0-20200222043503-6f7a984d4dc4/go.mod h1:tQ2UAYgL5IevRw8kRxooKSPJfGvJ9fJQFa0TUsXzTg8=
 github.com/go-kit/kit v0.8.0/go.mod h1:xBxKIO96dXMWWy0MnWVtmwkA9/13aqxPnvrjFYMA2as=
 github.com/go-logfmt/logfmt v0.3.0/go.mod h1:Qt1PoO58o5twSAckw1HlFXLmHsOX5/0LbT9GBnD5lWE=
 github.com/go-logfmt/logfmt v0.4.0/go.mod h1:3RMwSq7FuexP4Kalkev3ejPJsZTpXXBr9+V4qmtdjCk=
 github.com/go-playground/assert/v2 v2.0.1 h1:MsBgLAaY856+nPRTKrp3/OZK38U/wa0CcBYNjji3q3A=
 github.com/go-playground/assert/v2 v2.0.1/go.mod h1:VDjEfimB/XKnb+ZQfWdccd7VUvScMdVu0Titje2rxJ4=
 github.com/go-playground/locales v0.12.1 h1:2FITxuFt/xuCNP1Acdhv62OzaCiviiE4kotfhkmOqEc=
 github.com/go-playground/locales v0.12.1/go.mod h1:IUMDtCfWo/w/mtMfIE/IG2K+Ey3ygWanZIBtBW0W2TM=
 github.com/go-playground/locales v0.13.0 h1:HyWk6mgj5qFqCT5fjGBuRArbVDfE4hi8+e8ceBS/t7Q=
 github.com/go-playground/locales v0.13.0/go.mod h1:taPMhCMXrRLJO55olJkUXHZBHCxTMfnGwq/HNwmWNS8=
 github.com/go-playground/universal-translator v0.16.0 h1:X++omBR/4cE2MNg91AoC3rmGrCjJ8eAeUP/K/EKx4DM=
 github.com/go-playground/universal-translator v0.16.0/go.mod h1:1AnU7NaIRDWWzGEKwgtJRd2xk99HeFyHw3yid4rvQIY=
 github.com/go-playground/universal-translator v0.17.0 h1:icxd5fm+REJzpZx7ZfpaD876Lmtgy7VtROAbHHXk8no=
 github.com/go-playground/universal-translator v0.17.0/go.mod h1:UkSxE5sNxxRwHyU+Scu5vgOQjsIJAF8j9muTVoKLVtA=
 github.com/go-playground/validator/v10 v10.2.0 h1:KgJ0snyC2R9VXYN2rneOtQcw5aHQB1Vv0sFl1UcHBOY=
 github.com/go-playground/validator/v10 v10.2.0/go.mod h1:uOYAAleCW8F/7oMFd6aG0GOhaH6EGOAJShg8Id5JGkI=
 github.com/go-playground/validator/v10 v10.3.0 h1:nZU+7q+yJoFmwvNgv/LnPUkwPal62+b2xXj0AU1Es7o=
 github.com/go-playground/validator/v10 v10.3.0/go.mod h1:uOYAAleCW8F/7oMFd6aG0GOhaH6EGOAJShg8Id5JGkI=
 github.com/go-playground/validator/v10 v10.4.1 h1:pH2c5ADXtd66mxoE0Zm9SUhxE20r7aM3F26W0hOn+GE=
 github.com/go-playground/validator/v10 v10.4.1/go.mod h1:nlOn6nFhuKACm19sB/8EGNn9GlaMV7XkbRSipzJ0Ii4=
 github.com/go-stack/stack v1.8.0/go.mod h1:v0f6uXyyMGvRgIKkXu+yp6POWl0qKG85gN/melR3HDY=
 github.com/godbus/dbus/v5 v5.0.4/go.mod h1:xhWf0FNVPg57R7Z0UbKHbJfkEywrmjJnf7w5xrFpKfA=
 github.com/gogo/protobuf v1.1.1/go.mod h1:r8qH/GZQm5c6nD/R0oafs1akxWv10x8SbQlK7atdtwQ=
 github.com/gogo/protobuf v1.2.1/go.mod h1:hp+jE20tsWTFYpLwKvXlhS1hjn+gTNwPg2I6zVXpSg4=
 github.com/gogo/protobuf v1.3.2/go.mod h1:P1XiOD3dCwIKUDQYPy72D8LYyHL2YPYrpS2s69NZV8Q=
 github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b h1:VKtxabqXZkF25pY9ekfRL6a582T4P37/31XEstQ5p58=
 github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q=
 github.com/golang/groupcache v0.0.0-20190129154638-5b532d6fd5ef/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc=
 github.com/golang/groupcache v0.0.0-20190702054246-869f871628b6/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc=
 github.com/golang/groupcache v0.0.0-20191227052852-215e87163ea7/go.mod h1:cIg4eruTrX1D+g88fzRXU5OdNfaM+9IcxsU14FzY7Hc=
 github.com/golang/groupcache v0.0.0-20200121045136-8c9f03a8e57e h1:1r7pUrabqp18hOBcwBwiTsbnFeTZHV9eER/QT5JVZxY=
@@ -164,11 +124,9 @@ github.com/golang/mock v1.5.0/go.mod h1:CWnOUgYIOo4TcNZ0wHX3YZCqsaM1I1Jvs6v3mP3K
 github.com/golang/mock v1.6.0/go.mod h1:p6yTPP+5HYm5mzsMV8JkE6ZKdX+/wYM6Hr+LicevLPs=
 github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
 github.com/golang/protobuf v1.3.1/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
 github.com/golang/protobuf v1.3.2 h1:6nsPYzhq5kReh6QImI3k5qWzO4PEbvbIW2cwSfR/6xs=
 github.com/golang/protobuf v1.3.2/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
 github.com/golang/protobuf v1.3.3/go.mod h1:vzj43D7+SQXF/4pzW/hwtAqwc6iTitCiVSaWz5lYuqw=
 github.com/golang/protobuf v1.3.4/go.mod h1:vzj43D7+SQXF/4pzW/hwtAqwc6iTitCiVSaWz5lYuqw=
 github.com/golang/protobuf v1.3.5 h1:F768QJ1E9tib+q5Sc8MkdJi1RxLTbRcTf8LJV56aRls=
 github.com/golang/protobuf v1.3.5/go.mod h1:6O5/vntMXwX2lRkT1hjjk0nAC1IDOTvTlVgjlRvqsdk=
 github.com/golang/protobuf v1.4.0-rc.1/go.mod h1:ceaxUfeHdC40wWswd/P6IGgMaK3YpKi5j83Wpe3EHw8=
 github.com/golang/protobuf v1.4.0-rc.1.0.20200221234624-67d41d38c208/go.mod h1:xKAWHe0F5eneWXFV3EuXVDTCmh+JuBKY0li0aMyXATA=
@@ -176,7 +134,6 @@ github.com/golang/protobuf v1.4.0-rc.2/go.mod h1:LlEzMj4AhA7rCAGe4KMBDvJI+AwstrU
 github.com/golang/protobuf v1.4.0-rc.4.0.20200313231945-b860323f09d0/go.mod h1:WU3c8KckQ9AFe+yFwt9sWVRKCVIyN9cPHBJSNnbL67w=
 github.com/golang/protobuf v1.4.0/go.mod h1:jodUvKwWbYaEsadDk5Fwe5c77LiNKVO9IDvqG2KuDX0=
 github.com/golang/protobuf v1.4.1/go.mod h1:U8fpvMrcmy5pZrNK1lt4xCsGvpyWQ/VVv6QDs8UjoX8=
 github.com/golang/protobuf v1.4.2 h1:+Z5KGCizgyZCbGh1KZqA0fcLLkwbsjIzS4aV2v7wJX0=
 github.com/golang/protobuf v1.4.2/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw735rRwI=
 github.com/golang/protobuf v1.4.3/go.mod h1:oDoupMAO8OvCJWAcko0GGGIgR6R6ocIYbsSw735rRwI=
 github.com/golang/protobuf v1.5.0/go.mod h1:FsONVRAS9T7sI+LIUmWTfcYkHO4aIWwzhcaSAoJOfIk=
@@ -187,10 +144,8 @@ github.com/golang/snappy v0.0.3/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEW
 github.com/google/btree v0.0.0-20180813153112-4030bb1f1f0c/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ=
 github.com/google/btree v1.0.0/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ=
 github.com/google/go-cmp v0.2.0/go.mod h1:oXzfMopK8JAjlY9xF4vHSVASa0yLyX7SntLO5aqRK0M=
 github.com/google/go-cmp v0.3.0 h1:crn/baboCvb5fXaQ0IJ1SGTsTVrWpDsCWC8EGETZijY=
 github.com/google/go-cmp v0.3.0/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU=
 github.com/google/go-cmp v0.3.1/go.mod h1:8QqcDgzrUqlUb/G2PQTWiueGozuR1884gddMywk6iLU=
 github.com/google/go-cmp v0.4.0 h1:xsAVV57WRhGj6kEIi8ReJzQlHHqcBYCElAvkovg3B/4=
 github.com/google/go-cmp v0.4.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
 github.com/google/go-cmp v0.4.1/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
 github.com/google/go-cmp v0.5.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
@@ -199,6 +154,7 @@ github.com/google/go-cmp v0.5.2/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/
 github.com/google/go-cmp v0.5.3/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
 github.com/google/go-cmp v0.5.4/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
 github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
 github.com/google/go-cmp v0.5.6 h1:BKbKCqvP6I+rmFHt06ZmyQtvB8xAkWdhFyr0ZUNZcxQ=
 github.com/google/go-cmp v0.5.6/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
 github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg=
 github.com/google/martian v2.1.0+incompatible/go.mod h1:9I4somxYTbIHy5NJKHRl3wXiIaQGbYVAs8BPL6v8lEs=
@@ -222,18 +178,11 @@ github.com/google/pprof v0.0.0-20210720184732-4bb14d4b1be1/go.mod h1:kpwsk12EmLe
 github.com/google/renameio v0.1.0/go.mod h1:KWCgfxg9yswjAJkECMjeO8J8rahYeXnNhOm40UhjYkI=
 github.com/google/uuid v1.1.2/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
 github.com/googleapis/gax-go/v2 v2.0.4/go.mod h1:0Wqv26UfaUD9n4G6kQubkQ+KchISgw+vpHVxEJEs9eg=
 github.com/googleapis/gax-go/v2 v2.0.5 h1:sjZBwGj9Jlw33ImPtvFviGYvseOtDM7hkSKB7+Tv3SM=
 github.com/googleapis/gax-go/v2 v2.0.5/go.mod h1:DWXyrwAJ9X0FpwwEdw+IPEYBICEFu5mhpdKc/us6bOk=
 github.com/googleapis/gax-go/v2 v2.1.0/go.mod h1:Q3nei7sK6ybPYH7twZdmQpAd1MKb7pfu6SK+H1/DsU0=
 github.com/googleapis/gax-go/v2 v2.1.1 h1:dp3bWCh+PPO1zjRRiCSczJav13sBvG4UhNyVTa1KqdU=
 github.com/googleapis/gax-go/v2 v2.1.1/go.mod h1:hddJymUZASv3XPyGkUpKj8pPO47Rmb0eJc8R6ouapiM=
 github.com/gopherjs/gopherjs v0.0.0-20181017120253-0766667cb4d1 h1:EGx4pi6eqNxGaHF6qqu48+N2wcFQ5qg5FXgOdqsJ5d8=
 github.com/gopherjs/gopherjs v0.0.0-20181017120253-0766667cb4d1/go.mod h1:wJfORRmW1u3UXTncJ5qlYoELFm8eSnnEO6hX4iZ3EWY=
 github.com/gorilla/websocket v1.4.0/go.mod h1:E7qHFY5m1UJ88s3WnNqhKjPHQ0heANvMoAMk2YaljkQ=
 github.com/gorilla/websocket v1.4.2/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE=
 github.com/grpc-ecosystem/go-grpc-middleware v1.0.0/go.mod h1:FiyG127CGDf3tlThmgyCl78X/SZQqEOJBCDaAfeWzPs=
 github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0/go.mod h1:8NvIoxWQoOIhqOTXgfV/d3M/q6VIi02HzZEHgUlZvzk=
 github.com/grpc-ecosystem/grpc-gateway v1.9.0/go.mod h1:vNeuVxBJEsws4ogUvrchl83t/GYV9WGTSLVdBhOQFDY=
 github.com/grpc-ecosystem/grpc-gateway v1.16.0/go.mod h1:BDjrQk3hbvj6Nolgz8mAMFbcEtjT1g+wF4CSlocrBnw=
 github.com/hashicorp/consul/api v1.1.0/go.mod h1:VmuI/Lkw1nC05EYQWNKwWGbkg+FbDBtguAZLlVdkD9Q=
 github.com/hashicorp/consul/api v1.10.1/go.mod h1:XjsvQN+RJGWI2TWy1/kqaE16HrR2J/FWgkYjdZQsX9M=
@@ -254,7 +203,6 @@ github.com/hashicorp/go-uuid v1.0.0/go.mod h1:6SBZvOh/SIDV7/2o3Jml5SYk/TvGqwFJ/b
 github.com/hashicorp/go-uuid v1.0.1/go.mod h1:6SBZvOh/SIDV7/2o3Jml5SYk/TvGqwFJ/bN7x4byOro=
 github.com/hashicorp/go.net v0.0.1/go.mod h1:hjKkEWcCURg++eb33jQU7oqQcI9XDCnUzHA0oac0k90=
 github.com/hashicorp/golang-lru v0.5.0/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8=
 github.com/hashicorp/golang-lru v0.5.1 h1:0hERBMJE1eitiLkihrMvRVBYAkpHzc/J3QdDN+dAcgU=
 github.com/hashicorp/golang-lru v0.5.1/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8=
 github.com/hashicorp/hcl v1.0.0 h1:0Anlzjpi4vEasTeNFn2mLJgTSwt0+6sfsiTG8qcWGx4=
 github.com/hashicorp/hcl v1.0.0/go.mod h1:E5yfLk+7swimpb2L/Alb/PJmXilQ/rhwaUYs4T20WEQ=
@@ -269,45 +217,27 @@ github.com/ianlancetaylor/demangle v0.0.0-20181102032728-5e5cf60278f6/go.mod h1:
 github.com/ianlancetaylor/demangle v0.0.0-20200824232613-28f6c0f3b639/go.mod h1:aSSvb/t6k1mPoxDqO4vJh6VOCGPwU4O0C2/Eqndh1Sc=
 github.com/inconshreveable/mousetrap v1.0.0 h1:Z8tu5sraLXCXIcARxBp/8cbvlwVa7Z1NHg9XEKhtSvM=
 github.com/inconshreveable/mousetrap v1.0.0/go.mod h1:PxqpIevigyE2G7u3NXJIT2ANytuPF1OarO4DADm73n8=
 github.com/jonboulle/clockwork v0.1.0/go.mod h1:Ii8DK3G1RaLaWxj9trq07+26W01tbo22gdxWY5EU2bo=
 github.com/json-iterator/go v1.1.6/go.mod h1:+SdeFBvtyEkXs7REEP0seUULqWtbJapLOCVDaaPEHmU=
 github.com/json-iterator/go v1.1.7 h1:KfgG9LzI+pYjr4xvmz/5H4FXjokeP+rlHLhv3iH62Fo=
 github.com/json-iterator/go v1.1.7/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4=
 github.com/json-iterator/go v1.1.9 h1:9yzud/Ht36ygwatGx56VwCZtlI/2AD15T1X2sjSuGns=
 github.com/json-iterator/go v1.1.9/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4=
 github.com/json-iterator/go v1.1.11 h1:uVUAXhF2To8cbw/3xN3pxj6kk7TYKs98NIrTqPlMWAQ=
 github.com/json-iterator/go v1.1.11/go.mod h1:KdQUCv79m/52Kvf8AW2vK1V8akMuk1QjK/uOdHXbAo4=
 github.com/jstemmer/go-junit-report v0.0.0-20190106144839-af01ea7f8024/go.mod h1:6v2b51hI/fHJwM22ozAgKL4VKDeJcHhJFhtBdhmNjmU=
 github.com/jstemmer/go-junit-report v0.9.1/go.mod h1:Brl9GWCQeLvo8nXZwPNNblvFj/XSXhF0NWZEnDohbsk=
 github.com/jtolds/gls v4.20.0+incompatible h1:xdiiI2gbIgH/gLH7ADydsJ1uDOEzR8yvV7C0MuV77Wo=
 github.com/jtolds/gls v4.20.0+incompatible/go.mod h1:QJZ7F/aHp+rZTRtaJ1ow/lLfFfVYBRgL+9YlvaHOwJU=
 github.com/julienschmidt/httprouter v1.2.0/go.mod h1:SYymIcj16QtmaHHD7aYtjjsJG7VTCxuUUipMqKk8s4w=
 github.com/kisielk/errcheck v1.1.0/go.mod h1:EZBBE59ingxPouuu3KfxchcWSUPOHkagtvWXihfKN4Q=
 github.com/kisielk/errcheck v1.5.0/go.mod h1:pFxgyoBC7bSaBwPgfKdkLd5X25qrDl4LWUI2bnpBCr8=
 github.com/kisielk/gotool v1.0.0/go.mod h1:XhKaO+MFFWcvkIS/tQcRk01m1F5IRFswLeQ+oQHNcck=
 github.com/konsorten/go-windows-terminal-sequences v1.0.1 h1:mweAR1A6xJ3oS2pRaGiHgQ4OO8tzTaLawm8vnODuwDk=
 github.com/konsorten/go-windows-terminal-sequences v1.0.1/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ=
 github.com/konsorten/go-windows-terminal-sequences v1.0.3 h1:CE8S1cTafDpPvMhIxNJKvHsGVBgn1xWYf1NbHQhywc8=
 github.com/konsorten/go-windows-terminal-sequences v1.0.3/go.mod h1:T0+1ngSBFLxvqU3pZ+m/2kptfBszLMUkC4ZK/EgS/cQ=
 github.com/kr/fs v0.1.0/go.mod h1:FFnZGqtBN9Gxj7eW1uZ42v5BccTP0vu6NEaFoC2HwRg=
 github.com/kr/logfmt v0.0.0-20140226030751-b84e30acd515/go.mod h1:+0opPa2QZZtGFBFZlji/RkVcI2GknAs/DXo4wKdlNEc=
 github.com/kr/pretty v0.1.0 h1:L/CwN0zerZDmRFUapSPitk6f+Q3+0za1rQkzVuMiMFI=
 github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo=
 github.com/kr/pretty v0.2.0 h1:s5hAObm+yFO5uHYt5dYjxi2rXrsnmRpJx4OYvIWUaQs=
 github.com/kr/pretty v0.2.0/go.mod h1:ipq/a2n7PKx3OHsz4KJII5eveXtPO4qwEXGdVfWzfnI=
 github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ=
 github.com/kr/text v0.1.0 h1:45sCR5RtlFHMR4UwH9sdQ5TC8v0qDQCHnXt+kaKSTVE=
 github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI=
 github.com/leodido/go-urn v1.1.0 h1:Sm1gr51B1kKyfD2BlRcLSiEkffoG96g6TPv6eRoEiB8=
 github.com/leodido/go-urn v1.1.0/go.mod h1:+cyI34gQWZcE1eQU7NVgKkkzdXDQHr1dBMtdAPozLkw=
 github.com/leodido/go-urn v1.2.0 h1:hpXL4XnriNwQ/ABnpepYM/1vCLWNDfUNts8dX3xTG6Y=
 github.com/leodido/go-urn v1.2.0/go.mod h1:+8+nEpDfqqsY+g338gtMEUOtuK+4dEMhiQEgxpxOKII=
 github.com/lib/pq v1.5.2 h1:yTSXVswvWUOQ3k1sd7vJfDrbSl8lKuscqFJRqjC0ifw=
 github.com/lib/pq v1.5.2/go.mod h1:5WUZQaWbwv1U+lTReE5YruASi9Al49XbQIvNi/34Woo=
 github.com/lib/pq v1.10.3 h1:v9QZf2Sn6AmjXtQeFpdoq/eaNtYP6IN+7lcrygsIAtg=
 github.com/lib/pq v1.10.3/go.mod h1:AlVN5x4E4T544tWzH6hKfbfQvm3HdbOxrmggDNAPY9o=
 github.com/magiconair/properties v1.8.0/go.mod h1:PppfXfuXeibc/6YijjN8zIbojt8czPbwD3XqdrwzmxQ=
 github.com/magiconair/properties v1.8.1 h1:ZC2Vc7/ZFkGmsVC9KvOjumD+G5lXy2RtTKyzRKO2BQ4=
 github.com/magiconair/properties v1.8.1/go.mod h1:PppfXfuXeibc/6YijjN8zIbojt8czPbwD3XqdrwzmxQ=
 github.com/magiconair/properties v1.8.5 h1:b6kJs+EmPFMYGkow9GiUyCyOvIwYetYJ3fSaWak/Gls=
 github.com/magiconair/properties v1.8.5/go.mod h1:y3VJvCyxH9uVvJTWEGAELF3aiYNyPKd5NZ3oSwXrF60=
 github.com/mattn/go-colorable v0.0.9/go.mod h1:9vuHe8Xs5qXnSaW/c/ABM9alt+Vo+STaOChaDxuIBZU=
@@ -315,13 +245,11 @@ github.com/mattn/go-colorable v0.1.4/go.mod h1:U0ppj6V5qS13XJ6of8GYAs25YV2eR4EVc
 github.com/mattn/go-colorable v0.1.6/go.mod h1:u6P/XSegPjTcexA+o6vUJrdnUu04hMope9wVRipJSqc=
 github.com/mattn/go-isatty v0.0.3/go.mod h1:M+lRXTBqGeGNdLjl/ufCoiOlB5xdOkqRJdNxMWT7Zi4=
 github.com/mattn/go-isatty v0.0.8/go.mod h1:Iq45c/XA43vh69/j3iqttzPXn0bhXyGjM0Hdxcsrc5s=
 github.com/mattn/go-isatty v0.0.9 h1:d5US/mDsogSGW37IV293h//ZFaeajb69h+EHFsv2xGg=
 github.com/mattn/go-isatty v0.0.9/go.mod h1:YNRxwqDuOph6SZLI9vUUz6OYw3QyUt7WiY2yME+cCiQ=
 github.com/mattn/go-isatty v0.0.10/go.mod h1:qgIWMr58cqv1PHHyhnkY9lrL7etaEgOFcMEpPG5Rm84=
 github.com/mattn/go-isatty v0.0.11/go.mod h1:PhnuNfih5lzO57/f3n+odYbM4JtupLOxQOAqxQCu2WE=
 github.com/mattn/go-isatty v0.0.12 h1:wuysRhFDzyxgEmMf5xjvJ2M9dZoWAXNNr5LSBS7uHXY=
 github.com/mattn/go-isatty v0.0.12/go.mod h1:cbi8OIDigv2wuxKPP5vlRcQ1OAZbq2CE4Kysco4FUpU=
 github.com/matttproud/golang_protobuf_extensions v1.0.1/go.mod h1:D8He9yQNgCq6Z5Ld7szi9bcBfOoFv/3dc6xSMkL2PC0=
 github.com/miekg/dns v1.0.14/go.mod h1:W1PPwlIAgtquWBMBEV9nkV9Cazfe8ScdGz/Lj7v3Nrg=
 github.com/miekg/dns v1.1.26/go.mod h1:bPDLeHnStXmXAq1m/Ch/hvfNHr14JKNPMBo3VZKjuso=
 github.com/mitchellh/cli v1.0.0/go.mod h1:hNIlj7HEI86fIcpObd7a0FcrxTWetlwJDGcceTlRvqc=
@@ -332,145 +260,86 @@ github.com/mitchellh/go-testing-interface v1.0.0/go.mod h1:kRemZodwjscx+RGhAo8eI
 github.com/mitchellh/gox v0.4.0/go.mod h1:Sd9lOJ0+aimLBi73mGofS1ycjY8lL3uZM3JPS42BGNg=
 github.com/mitchellh/iochan v1.0.0/go.mod h1:JwYml1nuB7xOzsp52dPpHFffvOCDupsG0QubkSMEySY=
 github.com/mitchellh/mapstructure v0.0.0-20160808181253-ca63d7c062ee/go.mod h1:FVVH3fgwuzCH5S8UJGiWEs2h04kUh9fWfEaFds41c1Y=
 github.com/mitchellh/mapstructure v1.1.2 h1:fmNYVwqnSfB9mZU6OS2O6GsXM+wcskZDuKQzvN1EDeE=
 github.com/mitchellh/mapstructure v1.1.2/go.mod h1:FVVH3fgwuzCH5S8UJGiWEs2h04kUh9fWfEaFds41c1Y=
 github.com/mitchellh/mapstructure v1.3.1 h1:cCBH2gTD2K0OtLlv/Y5H01VQCqmlDxz30kS5Y5bqfLA=
 github.com/mitchellh/mapstructure v1.3.1/go.mod h1:bFUtVrKA4DC2yAKiSyO/QUcy7e+RRV2QTWOzhPopBRo=
 github.com/mitchellh/mapstructure v1.4.1/go.mod h1:bFUtVrKA4DC2yAKiSyO/QUcy7e+RRV2QTWOzhPopBRo=
 github.com/mitchellh/mapstructure v1.4.2 h1:6h7AQ0yhTcIsmFmnAwQls75jp2Gzs4iB8W7pjMO+rqo=
 github.com/mitchellh/mapstructure v1.4.2/go.mod h1:bFUtVrKA4DC2yAKiSyO/QUcy7e+RRV2QTWOzhPopBRo=
 github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421 h1:ZqeYNhU3OHLH3mGKHDcjJRFFRrJa6eAM5H+CtDdOsPc=
 github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q=
 github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd h1:TRLaZ9cD/w8PVh93nsPXa1VrQ6jlwL5oN8l14QlcNfg=
 github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q=
 github.com/modern-go/reflect2 v0.0.0-20180701023420-4b7aa43c6742 h1:Esafd1046DLDQ0W1YjYsBW+p8U2u7vzgW2SQVmlNazg=
 github.com/modern-go/reflect2 v0.0.0-20180701023420-4b7aa43c6742/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0=
 github.com/modern-go/reflect2 v1.0.1 h1:9f412s+6RmYXLWZSEzVVgPGK7C2PphHj5RJrvfx9AWI=
 github.com/modern-go/reflect2 v1.0.1/go.mod h1:bx2lNnkwVCuqBIxFjflWJWanXIb3RllmbCylyMrvgv0=
 github.com/mwitkow/go-conntrack v0.0.0-20161129095857-cc309e4a2223/go.mod h1:qRWi+5nqEBWmkhHvq77mSJWrCKwh8bxhgT7d/eI7P4U=
 github.com/oklog/ulid v1.3.1/go.mod h1:CirwcVhetQ6Lv90oh/F+FBtV6XMibvdAFo93nm5qn4U=
 github.com/pascaldekloe/goe v0.0.0-20180627143212-57f6aae5913c/go.mod h1:lzWF7FIEvWOWxwDKqyGYQf6ZUaNfKdP144TG7ZOy1lc=
 github.com/pelletier/go-toml v1.2.0 h1:T5zMGML61Wp+FlcbWjRDT7yAxhJNAiPPLOFECq181zc=
 github.com/pelletier/go-toml v1.2.0/go.mod h1:5z9KED0ma1S8pY6P1sdut58dfprrGBbd/94hg7ilaic=
 github.com/pelletier/go-toml v1.8.0 h1:Keo9qb7iRJs2voHvunFtuuYFsbWeOBh8/P9v/kVMFtw=
 github.com/pelletier/go-toml v1.8.0/go.mod h1:D6yutnOGMveHEPV7VQOuvI/gXY61bv+9bAOTRnLElKs=
 github.com/pelletier/go-toml v1.9.3/go.mod h1:u1nR/EPcESfeI/szUZKdtJ0xRNbUoANCkoOuaOx1Y+c=
 github.com/pelletier/go-toml v1.9.4 h1:tjENF6MfZAg8e4ZmZTeWaWiT2vXtsoO6+iuOjFhECwM=
 github.com/pelletier/go-toml v1.9.4/go.mod h1:u1nR/EPcESfeI/szUZKdtJ0xRNbUoANCkoOuaOx1Y+c=
 github.com/pkg/errors v0.8.0/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
 github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
 github.com/pkg/sftp v1.10.1/go.mod h1:lYOWFsE0bwd1+KfKJaKeuokY15vzFx25BLbzYYoAxZI=
 github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
 github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
 github.com/posener/complete v1.1.1/go.mod h1:em0nMJCgc9GFtwrmVmEMR/ZL6WyhyjMBndrE9hABlRI=
 github.com/posener/complete v1.2.3/go.mod h1:WZIdtGGp+qx0sLrYKtIRAruyNpv6hFCicSgv7Sy7s/s=
 github.com/prometheus/client_golang v0.9.1/go.mod h1:7SWBe2y4D6OKWSNQJUaRYU/AaXPKyh/dDVn+NZz0KFw=
 github.com/prometheus/client_golang v0.9.3/go.mod h1:/TN21ttK/J9q6uSwhBd54HahCDft0ttaMvbicHlPoso=
 github.com/prometheus/client_model v0.0.0-20180712105110-5c3871d89910/go.mod h1:MbSGuTsp3dbXC40dX6PRTWyKYBIrTGTE9sqQNg2J8bo=
 github.com/prometheus/client_model v0.0.0-20190129233127-fd36f4220a90/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA=
 github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA=
 github.com/prometheus/common v0.0.0-20181113130724-41aa239b4cce/go.mod h1:daVV7qP5qjZbuso7PdcryaAu0sAZbrN9i7WWcTMWvro=
 github.com/prometheus/common v0.4.0/go.mod h1:TNfzLD0ON7rHzMJeJkieUDPYmFC7Snx/y86RQel1bk4=
 github.com/prometheus/procfs v0.0.0-20181005140218-185b4288413d/go.mod h1:c3At6R/oaqEKCNdg8wHV1ftS6bRYblBhIjjI8uT2IGk=
 github.com/prometheus/procfs v0.0.0-20190507164030-5867b95ac084/go.mod h1:TjEm7ze935MbeOT/UhFTIMYKhuLP4wbCsTZCD3I8kEA=
 github.com/prometheus/tsdb v0.7.1/go.mod h1:qhTCs0VvXwvX/y3TZrWD7rabWM+ijKTux40TwIPHuXU=
 github.com/rogpeppe/fastuuid v0.0.0-20150106093220-6724a57986af/go.mod h1:XWv6SoW27p1b0cqNHllgS5HIMJraePCO15w5zCzIWYg=
 github.com/rogpeppe/fastuuid v1.2.0/go.mod h1:jVj6XXZzXRy/MSR5jhDC/2q6DgLz+nrA6LYCDYWNEvQ=
 github.com/rogpeppe/go-internal v1.3.0/go.mod h1:M8bDsm7K2OlrFYOpmOWEs/qY81heoFRclV5y23lUDJ4=
 github.com/russross/blackfriday/v2 v2.0.1/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM=
 github.com/ryanuber/columnize v0.0.0-20160712163229-9b3edd62028f/go.mod h1:sm1tb6uqfes/u+d4ooFouqFdy9/2g9QGwK3SQygK0Ts=
 github.com/sagikazarmark/crypt v0.1.0/go.mod h1:B/mN0msZuINBtQ1zZLEQcegFJJf9vnYIR88KRMEuODE=
 github.com/satori/go.uuid v1.2.0 h1:0uYX9dsZ2yD7q2RtLRtPSdGDWzjeM3TbMJP9utgA0ww=
 github.com/satori/go.uuid v1.2.0/go.mod h1:dA0hQrYB0VpLJoorglMZABFdXlWrHn1NEOzdhQKdks0=
 github.com/sean-/seed v0.0.0-20170313163322-e2103e2c3529/go.mod h1:DxrIzT+xaE7yg65j358z/aeFdxmN0P9QXhEzd20vsDc=
 github.com/shurcooL/sanitized_anchor_name v1.0.0/go.mod h1:1NzhyTcUVG4SuEtjjoZeVRXNmyL/1OwPU0+IJeTBvfc=
 github.com/sirupsen/logrus v1.2.0/go.mod h1:LxeOpSwHxABJmUn/MG1IvRgCAasNZTLOkJPxbbu5VWo=
 github.com/sirupsen/logrus v1.6.0 h1:UBcNElsrwanuuMsnGSlYmtmgbb23qDR5dG+6X6Oo89I=
 github.com/sirupsen/logrus v1.6.0/go.mod h1:7uNnSEd1DgxDLC74fIahvMZmmYsHGZGEOFrfsX/uA88=
 github.com/sirupsen/logrus v1.8.1 h1:dJKuHgqk1NNQlqoA6BTlM1Wf9DOH3NBjQyu0h9+AZZE=
 github.com/sirupsen/logrus v1.8.1/go.mod h1:yWOB1SBYBC5VeMP7gHvWumXLIWorT60ONWic61uBYv0=
 github.com/smartystreets/assertions v0.0.0-20180927180507-b2de0cb4f26d h1:zE9ykElWQ6/NYmHa3jpm/yHnI4xSofP+UP6SpjHcSeM=
 github.com/smartystreets/assertions v0.0.0-20180927180507-b2de0cb4f26d/go.mod h1:OnSkiWE9lh6wB0YB77sQom3nweQdgAjqCqsofrRNTgc=
 github.com/smartystreets/goconvey v1.6.4 h1:fv0U8FUIMPNf1L9lnHLvLhgicrIVChEkdzIKYqbNC9s=
 github.com/smartystreets/goconvey v1.6.4/go.mod h1:syvi0/a8iFYH4r/RixwvyeAJjdLS9QV7WQ/tjFTllLA=
 github.com/soheilhy/cmux v0.1.4/go.mod h1:IM3LyeVVIOuxMH7sFAkER9+bJ4dT7Ms6E4xg4kGIyLM=
 github.com/spaolacci/murmur3 v0.0.0-20180118202830-f09979ecbc72/go.mod h1:JwIasOWyU6f++ZhiEuf87xNszmSA2myDM2Kzu9HwQUA=
 github.com/spf13/afero v1.1.2 h1:m8/z1t7/fwjysjQRYbP0RD+bUIF/8tJwPdEZsI83ACI=
 github.com/spf13/afero v1.1.2/go.mod h1:j4pytiNVoe2o6bmDsKpLACNPDBIoEAkihy7loJ1B0CQ=
 github.com/spf13/afero v1.2.2 h1:5jhuqJyZCZf2JRofRvN/nIFgIWNzPa3/Vz8mYylgbWc=
 github.com/spf13/afero v1.2.2/go.mod h1:9ZxEEn6pIJ8Rxe320qSDBk6AsU0r9pR7Q4OcevTdifk=
 github.com/spf13/afero v1.6.0 h1:xoax2sJ2DT8S8xA2paPFjDCScCNeWsg75VG0DLRreiY=
 github.com/spf13/afero v1.6.0/go.mod h1:Ai8FlHk4v/PARR026UzYexafAt9roJ7LcLMAmO6Z93I=
 github.com/spf13/cast v1.3.0 h1:oget//CVOEoFewqQxwr0Ej5yjygnqGkvggSE/gB35Q8=
 github.com/spf13/cast v1.3.0/go.mod h1:Qx5cxh0v+4UWYiBimWS+eyWzqEqokIECu5etghLkUJE=
 github.com/spf13/cast v1.3.1 h1:nFm6S0SMdyzrzcmThSipiEubIDy8WEXKNZ0UOgiRpng=
 github.com/spf13/cast v1.3.1/go.mod h1:Qx5cxh0v+4UWYiBimWS+eyWzqEqokIECu5etghLkUJE=
 github.com/spf13/cast v1.4.1 h1:s0hze+J0196ZfEMTs80N7UlFt0BDuQ7Q+JDnHiMWKdA=
 github.com/spf13/cast v1.4.1/go.mod h1:Qx5cxh0v+4UWYiBimWS+eyWzqEqokIECu5etghLkUJE=
 github.com/spf13/cobra v1.0.0 h1:6m/oheQuQ13N9ks4hubMG6BnvwOeaJrqSPLahSnczz8=
 github.com/spf13/cobra v1.0.0/go.mod h1:/6GTrnGXV9HjY+aR4k0oJ5tcvakLuG6EuKReYlHNrgE=
 github.com/spf13/cobra v1.2.1 h1:+KmjbUw1hriSNMF55oPrkZcb27aECyrj8V2ytv7kWDw=
 github.com/spf13/cobra v1.2.1/go.mod h1:ExllRjgxM/piMAM+3tAZvg8fsklGAf3tPfi+i8t68Nk=
 github.com/spf13/jwalterweatherman v1.0.0 h1:XHEdyB+EcvlqZamSM4ZOMGlc93t6AcsBEu9Gc1vn7yk=
 github.com/spf13/jwalterweatherman v1.0.0/go.mod h1:cQK4TGJAtQXfYWX+Ddv3mKDzgVb68N+wFjFa4jdeBTo=
 github.com/spf13/jwalterweatherman v1.1.0 h1:ue6voC5bR5F8YxI5S67j9i582FU4Qvo2bmqnqMYADFk=
 github.com/spf13/jwalterweatherman v1.1.0/go.mod h1:aNWZUN0dPAAO/Ljvb5BEdw96iTZ0EXowPYD95IqWIGo=
 github.com/spf13/pflag v1.0.3 h1:zPAT6CGy6wXeQ7NtTnaTerfKOsV6V6F8agHXFiazDkg=
 github.com/spf13/pflag v1.0.3/go.mod h1:DYY7MBk1bdzusC3SYhjObp+wFpr4gzcvqqNjLnInEg4=
 github.com/spf13/pflag v1.0.5 h1:iy+VFUOCP1a+8yFto/drg2CJ5u0yRoB7fZw3DKv/JXA=
 github.com/spf13/pflag v1.0.5/go.mod h1:McXfInJRrz4CZXVZOBLb0bTZqETkiAhM9Iw0y3An2Bg=
 github.com/spf13/viper v1.4.0/go.mod h1:PTJ7Z/lr49W6bUbkmS1V3by4uWynFiR9p7+dSq/yZzE=
 github.com/spf13/viper v1.7.0 h1:xVKxvI7ouOI5I+U9s2eeiUfMaWBVoXA3AWskkrqK0VM=
 github.com/spf13/viper v1.7.0/go.mod h1:8WkrPz2fc9jxqZNCJI/76HCieCp4Q8HaLFoCha5qpdg=
 github.com/spf13/viper v1.8.1/go.mod h1:o0Pch8wJ9BVSWGQMbra6iw0oQ5oktSIBaujf1rJH9Ns=
 github.com/spf13/viper v1.9.0 h1:yR6EXjTp0y0cLN8OZg1CRZmOBdI88UcGkhgyJhu6nZk=
 github.com/spf13/viper v1.9.0/go.mod h1:+i6ajR7OX2XaiBkrcZJFK21htRk7eDeLg7+O6bhUPP4=
 github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
 github.com/stretchr/objx v0.1.1/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
 github.com/stretchr/testify v1.2.2/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs=
 github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI=
 github.com/stretchr/testify v1.4.0 h1:2E4SXV/wtOkTonXsotYi4li6zVWxYlZuYNCXe9XRJyk=
 github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4=
 github.com/stretchr/testify v1.5.1/go.mod h1:5W2xD1RspED5o8YsWQXVCued0rvSQ+mT+I5cxcmMvtA=
 github.com/stretchr/testify v1.6.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
 github.com/stretchr/testify v1.7.0 h1:nwc3DEeHmmLAfoZucVR881uASk0Mfjw8xYJ99tb5CcY=
 github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
 github.com/subosito/gotenv v1.2.0 h1:Slr1R9HxAlEKefgq5jn9U+DnETlIUa6HfgEzj0g5d7s=
 github.com/subosito/gotenv v1.2.0/go.mod h1:N0PQaV/YGNqwC0u51sEeR/aUtSLEXKX9iv69rRypqCw=
 github.com/tmc/grpc-websocket-proxy v0.0.0-20190109142713-0ad062ec5ee5/go.mod h1:ncp9v5uamzpCO7NfCPTXjqaC+bZgJeR0sMTm6dMHP7U=
 github.com/ugorji/go v1.1.4/go.mod h1:uQMGLiO92mf5W77hV/PUCpI3pbzQx3CRekS0kk+RGrc=
 github.com/ugorji/go v1.1.7 h1:/68gy2h+1mWMrwZFeD1kQialdSzAb432dtpeJ42ovdo=
 github.com/ugorji/go v1.1.7/go.mod h1:kZn38zHttfInRq0xu/PH0az30d+z6vm202qpg1oXVMw=
 github.com/ugorji/go/codec v1.1.7 h1:2SvQaVZ1ouYrrKKwoSk2pzd4A9evlKJb9oTL+OaLUSs=
 github.com/ugorji/go/codec v1.1.7/go.mod h1:Ax+UKWsSmolVDwsd+7N3ZtXu+yMGCf907BLYF3GoBXY=
 github.com/xiang90/probing v0.0.0-20190116061207-43a291ad63a2/go.mod h1:UETIi67q53MR2AWcXfiuqkDkRtnGDLqkBTpCHuJHxtU=
 github.com/xordataexchange/crypt v0.0.3-0.20170626215501-b2862e3d0a77/go.mod h1:aYKd//L2LvnjZzWKhF00oedf4jCCReLcmhLdhm1A27Q=
 github.com/yuin/goldmark v1.1.25/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
 github.com/yuin/goldmark v1.1.27/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
 github.com/yuin/goldmark v1.1.32/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
 github.com/yuin/goldmark v1.2.1/go.mod h1:3hX8gzYuyVAZsxl0MRgGTJEmQBFcNTphYh9decYSb74=
 github.com/yuin/goldmark v1.3.5/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k=
 go.etcd.io/bbolt v1.3.2/go.mod h1:IbVyRI1SCnLcuJnV2u8VeU0CEYM7e686BmAb1XKL+uU=
 go.etcd.io/etcd/api/v3 v3.5.0/go.mod h1:cbVKeC6lCfl7j/8jBhAK6aIYO9XOjdptoxU/nLQcPvs=
 go.etcd.io/etcd/client/pkg/v3 v3.5.0/go.mod h1:IJHfcCEKxYu1Os13ZdwCwIUTUVGYTSAM3YSwc9/Ac1g=
 go.etcd.io/etcd/client/v2 v2.305.0/go.mod h1:h9puh54ZTgAKtEbut2oe9P4L/oqKCVB6xsXlzd7alYQ=
 go.opencensus.io v0.21.0 h1:mU6zScU4U1YAFPHEHYk+3JC4SY7JxgkqS10ZOSyksNg=
 go.opencensus.io v0.21.0/go.mod h1:mSImk1erAIZhrmZN+AvHh14ztQfjbGwt4TtuofqLduU=
 go.opencensus.io v0.22.0/go.mod h1:+kGneAE2xo2IficOXnaByMWTGM9T73dGwxeWcUqIpI8=
 go.opencensus.io v0.22.2/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw=
 go.opencensus.io v0.22.3 h1:8sGtKOrtQqkN1bp2AtX+misvLIlOmsEsNd+9NIcPEm8=
 go.opencensus.io v0.22.3/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw=
 go.opencensus.io v0.22.4/go.mod h1:yxeiOL68Rb0Xd1ddK5vPZ/oVn4vY4Ynel7k9FzqtOIw=
 go.opencensus.io v0.22.5/go.mod h1:5pWMHQbX5EPX2/62yrJeAkowc+lfs/XD7Uxpq3pI6kk=
 go.opencensus.io v0.23.0 h1:gqCw0LfLxScz8irSi8exQc7fyQ0fKQU/qnC/X8+V/1M=
 go.opencensus.io v0.23.0/go.mod h1:XItmlyltB5F7CS4xOC1DcqMoFqwtC6OG2xF7mCv7P7E=
 go.opentelemetry.io/proto/otlp v0.7.0/go.mod h1:PqfVotwruBrMGOCsRd/89rSnXhoiJIqeYNgFYFoEGnI=
 go.uber.org/atomic v1.4.0/go.mod h1:gD2HeocX3+yG+ygLZcrzQJaqmWj9AIm7n08wl/qW/PE=
 go.uber.org/atomic v1.7.0/go.mod h1:fEN4uk6kAWBTFdckzkM89CLk9XfWZrxpCo0nPH17wJc=
 go.uber.org/multierr v1.1.0/go.mod h1:wR5kodmAFQ0UK8QlbwjlSNy0Z68gJhDJUG5sjR94q/0=
 go.uber.org/multierr v1.6.0/go.mod h1:cdWPpRnG4AhwMwsgIHip0KRBQjJy5kYEpYjJxpXp9iU=
 go.uber.org/zap v1.10.0/go.mod h1:vwi/ZaCAaUcBkycHslxD9B2zi4UTXhF60s6SWpuDF0Q=
 go.uber.org/zap v1.17.0/go.mod h1:MXVU+bhUf/A7Xi2HNOnopQOrmycQ5Ih87HtOu4q5SSo=
 golang.org/x/crypto v0.0.0-20180904163835-0709b304e793/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4=
 golang.org/x/crypto v0.0.0-20181029021203-45a5f77698d3/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4=
 golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
 golang.org/x/crypto v0.0.0-20190510104115-cbcb75029529/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
@@ -519,17 +388,13 @@ golang.org/x/mod v0.4.2/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
 golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
 golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
 golang.org/x/net v0.0.0-20181023162649-9b4f9f5ad519/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
 golang.org/x/net v0.0.0-20181114220301-adae6a3d119a/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
 golang.org/x/net v0.0.0-20181201002055-351d144fa1fc/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
 golang.org/x/net v0.0.0-20181220203305-927f97764cc3/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
 golang.org/x/net v0.0.0-20190108225652-1e06a53dbb7e/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
 golang.org/x/net v0.0.0-20190213061140-3a22650c66bd/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
 golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
 golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
 golang.org/x/net v0.0.0-20190501004415-9ce7a6920f09/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
 golang.org/x/net v0.0.0-20190503192946-f4e77d36d62c/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
 golang.org/x/net v0.0.0-20190522155817-f3200d17e092 h1:4QSRKanuywn15aTZvI/mIDEgPQpswuFndXpOj3rKEco=
 golang.org/x/net v0.0.0-20190522155817-f3200d17e092/go.mod h1:HSz+uSET+XFnRR8LxR5pz3Of3rY3CfYBVs4xY44aLks=
 golang.org/x/net v0.0.0-20190603091049-60506f45cf65/go.mod h1:HSz+uSET+XFnRR8LxR5pz3Of3rY3CfYBVs4xY44aLks=
 golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
 golang.org/x/net v0.0.0-20190628185345-da137c7871d7/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
@@ -541,12 +406,10 @@ golang.org/x/net v0.0.0-20200202094626-16171245cfb2/go.mod h1:z5CRVTTTmAJ677TzLL
 golang.org/x/net v0.0.0-20200222125558-5a598a2470a0/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
 golang.org/x/net v0.0.0-20200226121028-0de0cce0169b/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
 golang.org/x/net v0.0.0-20200301022130-244492dfa37a/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
 golang.org/x/net v0.0.0-20200324143707-d3edc9973b7e h1:3G+cUijn7XD+S4eJFddp53Pv7+slrESplyjG25HgL+k=
 golang.org/x/net v0.0.0-20200324143707-d3edc9973b7e/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A=
 golang.org/x/net v0.0.0-20200501053045-e0ff5e5a1de5/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A=
 golang.org/x/net v0.0.0-20200506145744-7e3656a0809f/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A=
 golang.org/x/net v0.0.0-20200513185701-a91f0712d120/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A=
 golang.org/x/net v0.0.0-20200520182314-0ba52f642ac2 h1:eDrdRpKgkcCqKZQwyZRyeFZgfqt37SL7Kv3tok06cKE=
 golang.org/x/net v0.0.0-20200520182314-0ba52f642ac2/go.mod h1:qpuaurCH72eLCgpAm/N6yyVIVM9cpaDIP3A8BGJEC5A=
 golang.org/x/net v0.0.0-20200625001655-4c5254603344/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA=
 golang.org/x/net v0.0.0-20200707034311-ab3426394381/go.mod h1:/O7V0waA8r7cgGh81Ro3o1hOxt32SMVPicZroKQ2sZA=
@@ -563,10 +426,8 @@ golang.org/x/net v0.0.0-20210503060351-7fd8e65b6420 h1:a8jGStKg0XqKDlKqjLrXn0ioF
 golang.org/x/net v0.0.0-20210503060351-7fd8e65b6420/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
 golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
 golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
 golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45 h1:SVwTIAaPC2U/AvvLNZ2a7OVsmBpC8L5BlwK1whH3hm0=
 golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
 golang.org/x/oauth2 v0.0.0-20191202225959-858c2ad4c8b6/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
 golang.org/x/oauth2 v0.0.0-20200107190931-bf48bf16ab8d h1:TzXSXBo42m9gQenoE3b9BGiEpg5IG2JkU5FkPIawgtw=
 golang.org/x/oauth2 v0.0.0-20200107190931-bf48bf16ab8d/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
 golang.org/x/oauth2 v0.0.0-20200902213428-5d25da1a8d43/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A=
 golang.org/x/oauth2 v0.0.0-20201109201403-9fd604954f58/go.mod h1:KelEdhl1UZF7XfJ4dDtk6s++YSgaE7mD/BuKKDLBl4A=
@@ -594,22 +455,16 @@ golang.org/x/sync v0.0.0-20201207232520-09787c993a3a/go.mod h1:RxMgew5VJxzue5/jJ
 golang.org/x/sync v0.0.0-20210220032951-036812b2e83c/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sys v0.0.0-20180823144017-11551d06cbcc/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20180905080454-ebe1bf3edb33/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20181026203630-95b1ffbd15a5/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20181107165924-66b7b1311ac8/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20181116152217-5ac8a444bdc5/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20190222072716-a9d3bda3a223/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20190312061237-fead79001313/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20190422165155-953cdadca894 h1:Cz4ceDQGXuKRnVBDTS23GTn/pU5OE2C0WrNTOYK1Uuc=
 golang.org/x/sys v0.0.0-20190422165155-953cdadca894/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20190502145724-3ef323f4f1fd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20190507160741-ecd444e8653b/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20190606165138-5da285871e9c/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20190624142023-c5567b49c5d0/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20190726091711-fc99dfbffb4e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20190813064441-fde4db37ae7a h1:aYOabOQFp6Vj6W1F80affTUvO9UxmJRx8K0gsfABByQ=
 golang.org/x/sys v0.0.0-20190813064441-fde4db37ae7a/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20190922100055-0a153f010e69/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20190924154521-2837fb4f24fe/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
@@ -628,12 +483,10 @@ golang.org/x/sys v0.0.0-20200212091648-12a6c2dcc1e4/go.mod h1:h1NjWce9XRLGQEsW7w
 golang.org/x/sys v0.0.0-20200223170610-d5e6a3e2c0ae/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20200302150141-5c8b2ff67527/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20200323222414-85ca7c5b95cd/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20200331124033-c3d80250170d h1:nc5K6ox/4lTFbMVSL9WRR81ixkcwXThoiF6yf+R9scA=
 golang.org/x/sys v0.0.0-20200331124033-c3d80250170d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20200501052902-10377860bb8e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20200511232937-7e40ca221e25/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20200515095857-1151b9dac4a9/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20200523222454-059865788121 h1:rITEj+UZHYC927n8GT97eC3zrpzXdb/voyeOuVKS46o=
 golang.org/x/sys v0.0.0-20200523222454-059865788121/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20200803210538-64077c9b5642/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20200905004654-be1d3432aa8f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
@@ -662,10 +515,8 @@ golang.org/x/sys v0.0.0-20211007075335-d3039528d8ac h1:oN6lz7iLW/YC7un8pq+9bOLyX
 golang.org/x/sys v0.0.0-20211007075335-d3039528d8ac/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
 golang.org/x/text v0.0.0-20170915032832-14c0d48ead0c/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
 golang.org/x/text v0.3.0 h1:g61tztE5qeGQ89tm6NTjjM9VPIm088od1l6aSorWRWg=
 golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
 golang.org/x/text v0.3.1-0.20180807135948-17ff2d5776d2/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
 golang.org/x/text v0.3.2 h1:tW2bmiBqwgJj/UpqtC8EpXEZVYOwU0yG4iWbprSVAcs=
 golang.org/x/text v0.3.2/go.mod h1:bEr9sfX3Q8Zfm5fL9x+3itogRgK3+ptLWKqgva+5dAk=
 golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
 golang.org/x/text v0.3.4/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
@@ -675,7 +526,6 @@ golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
 golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
 golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
 golang.org/x/time v0.0.0-20191024005414-555d28b269f0/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
 golang.org/x/tools v0.0.0-20180221164845-07fd8470d635/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
 golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
 golang.org/x/tools v0.0.0-20190114222345-bf090417da8b/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
 golang.org/x/tools v0.0.0-20190226205152-f727befe758c/go.mod h1:9Yl7xja0Znq3iFh3HoIrodX9oNMXvdceNzlUR8zjMvY=
@@ -734,8 +584,8 @@ golang.org/x/tools v0.1.4/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk=
 golang.org/x/tools v0.1.5/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk=
 golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543 h1:E7g+9GITq07hpfrRu66IVDexMakfv52eLZ2CXBWiKr4=
 golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 h1:go1bK/D/BFZV2I8cIQd1NKEZ+0owSTG1fDTci4IqFcE=
 golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 google.golang.org/api v0.4.0/go.mod h1:8k5glujaEP+g9n7WNsDg8QP6cUVNI86fCNMcbazEtwE=
 google.golang.org/api v0.7.0/go.mod h1:WtwebWUNSVBH/HAw79HIFXZNqEvBhG+Ra+ax0hx3E3M=
@@ -743,7 +593,6 @@ google.golang.org/api v0.8.0/go.mod h1:o4eAsZoiT+ibD93RtjEohWalFOjRDx6CVaqeizhEn
 google.golang.org/api v0.9.0/go.mod h1:o4eAsZoiT+ibD93RtjEohWalFOjRDx6CVaqeizhEnKg=
 google.golang.org/api v0.13.0/go.mod h1:iLdEw5Ide6rF15KTC1Kkl0iskquN2gFfn9o9XIsbkAI=
 google.golang.org/api v0.14.0/go.mod h1:iLdEw5Ide6rF15KTC1Kkl0iskquN2gFfn9o9XIsbkAI=
 google.golang.org/api v0.15.0 h1:yzlyyDW/J0w8yNFJIhiAJy4kq74S+1DOLdawELNxFMA=
 google.golang.org/api v0.15.0/go.mod h1:iLdEw5Ide6rF15KTC1Kkl0iskquN2gFfn9o9XIsbkAI=
 google.golang.org/api v0.17.0/go.mod h1:BwFmGc8tA3vsd7r/7kR8DY7iEEGSU04BFxCo5jP/sfE=
 google.golang.org/api v0.18.0/go.mod h1:BwFmGc8tA3vsd7r/7kR8DY7iEEGSU04BFxCo5jP/sfE=
@@ -751,8 +600,6 @@ google.golang.org/api v0.19.0/go.mod h1:BwFmGc8tA3vsd7r/7kR8DY7iEEGSU04BFxCo5jP/
 google.golang.org/api v0.20.0/go.mod h1:BwFmGc8tA3vsd7r/7kR8DY7iEEGSU04BFxCo5jP/sfE=
 google.golang.org/api v0.22.0/go.mod h1:BwFmGc8tA3vsd7r/7kR8DY7iEEGSU04BFxCo5jP/sfE=
 google.golang.org/api v0.24.0/go.mod h1:lIXQywCXRcnZPGlsd8NbLnOjtAoL6em04bJ9+z0MncE=
 google.golang.org/api v0.25.0 h1:LodzhlzZEUfhXzNUMIfVlf9Gr6Ua5MMtoFWh7+f47qA=
 google.golang.org/api v0.25.0/go.mod h1:lIXQywCXRcnZPGlsd8NbLnOjtAoL6em04bJ9+z0MncE=
 google.golang.org/api v0.28.0/go.mod h1:lIXQywCXRcnZPGlsd8NbLnOjtAoL6em04bJ9+z0MncE=
 google.golang.org/api v0.29.0/go.mod h1:Lcubydp8VUV7KeIHD9z2Bys/sm/vGKnG1UHuDBSrHWM=
 google.golang.org/api v0.30.0/go.mod h1:QGmEvQ87FHZNiUVJkT14jQNYJ4ZJjdRF23ZXz5138Fc=
@@ -774,12 +621,9 @@ google.golang.org/api v0.59.0 h1:fPfFO7gttlXYo2ALuD3HxJzh8vaF++4youI0BkFL6GE=
 google.golang.org/api v0.59.0/go.mod h1:sT2boj7M9YJxZzgeZqXogmhfmRWDtPzT31xkieUbuZU=
 google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM=
 google.golang.org/appengine v1.4.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4=
 google.golang.org/appengine v1.5.0 h1:KxkO13IPW4Lslp2bz+KHP2E3gtFlrIGNThxkZQ3g+4c=
 google.golang.org/appengine v1.5.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4=
 google.golang.org/appengine v1.6.1/go.mod h1:i06prIuMbXzDqacNJfV5OdTW448YApPu5ww/cMBSeb0=
 google.golang.org/appengine v1.6.5 h1:tycE03LOZYQNhDpS27tcQdAzLCVMaj7QT2SXxebnpCM=
 google.golang.org/appengine v1.6.5/go.mod h1:8WjMMxjGQR8xUklV/ARdw2HLXBOI7O7uCIDZVag1xfc=
 google.golang.org/appengine v1.6.6 h1:lMO5rYAqUxkmaj76jAkRUvt5JZgFymx/+Q5Mzfivuhc=
 google.golang.org/appengine v1.6.6/go.mod h1:8WjMMxjGQR8xUklV/ARdw2HLXBOI7O7uCIDZVag1xfc=
 google.golang.org/appengine v1.6.7 h1:FZR1q0exgwxzPzp/aF+VccGrSfxfPpkBqjIIEq3ru6c=
 google.golang.org/appengine v1.6.7/go.mod h1:8WjMMxjGQR8xUklV/ARdw2HLXBOI7O7uCIDZVag1xfc=
@@ -787,7 +631,6 @@ google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod h1:JiN7NxoA
 google.golang.org/genproto v0.0.0-20190307195333-5fe7a883aa19/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE=
 google.golang.org/genproto v0.0.0-20190418145605-e7d98fc518a7/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE=
 google.golang.org/genproto v0.0.0-20190425155659-357c62f0e4bb/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE=
 google.golang.org/genproto v0.0.0-20190502173448-54afdca5d873 h1:nfPFGzJkUDX6uBmpN/pSw7MbOAWegH5QDQuoXFHedLg=
 google.golang.org/genproto v0.0.0-20190502173448-54afdca5d873/go.mod h1:VzzqZJRnGkLBvHegQrXjBqPurQTc5/KpmUdxsrq26oE=
 google.golang.org/genproto v0.0.0-20190801165951-fa694d86fc64/go.mod h1:DMBHOl98Agz4BDEuKkezgsaosCRResVns1a3J2ZsMNc=
 google.golang.org/genproto v0.0.0-20190819201941-24fa4b261c55/go.mod h1:DMBHOl98Agz4BDEuKkezgsaosCRResVns1a3J2ZsMNc=
@@ -804,13 +647,11 @@ google.golang.org/genproto v0.0.0-20200224152610-e50cd9704f63/go.mod h1:55QSHmfG
 google.golang.org/genproto v0.0.0-20200228133532-8c2c7df3a383/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c=
 google.golang.org/genproto v0.0.0-20200305110556-506484158171/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c=
 google.golang.org/genproto v0.0.0-20200312145019-da6875a35672/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c=
 google.golang.org/genproto v0.0.0-20200331122359-1ee6d9798940 h1:MRHtG0U6SnaUb+s+LhNE1qt1FQ1wlhqr5E4usBKC0uA=
 google.golang.org/genproto v0.0.0-20200331122359-1ee6d9798940/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c=
 google.golang.org/genproto v0.0.0-20200430143042-b979b6f78d84/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c=
 google.golang.org/genproto v0.0.0-20200511104702-f5ebc3bea380/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c=
 google.golang.org/genproto v0.0.0-20200513103714-09dca8ec2884/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c=
 google.golang.org/genproto v0.0.0-20200515170657-fc4c6c6a6587/go.mod h1:YsZOwe1myG/8QRHRsmBRE1LrgQY60beZKjly0O1fX9U=
 google.golang.org/genproto v0.0.0-20200526211855-cb27e3aa2013 h1:+kGHl1aib/qcwaRi1CbqBZ1rk19r85MNUf8HaBghugY=
 google.golang.org/genproto v0.0.0-20200526211855-cb27e3aa2013/go.mod h1:NbSheEEYHJ7i3ixzK3sjbqSGDJWnxyFXZblF3eUsNvo=
 google.golang.org/genproto v0.0.0-20200618031413-b414f8b61790/go.mod h1:jDfRM7FcilCzHH/e9qn6dsT145K34l5v+OpcnNgKAAA=
 google.golang.org/genproto v0.0.0-20200729003335-053ba62fc06f/go.mod h1:FWY/as6DDZQgahTzZj3fqbO1CbirC29ZNUFHwi0/+no=
@@ -846,17 +687,13 @@ google.golang.org/genproto v0.0.0-20211008145708-270636b82663 h1:33YYJanAOLxgS7p
 google.golang.org/genproto v0.0.0-20211008145708-270636b82663/go.mod h1:5CzLGKJ67TSI2B9POpiiyGha0AjJvZIUgRMt1dSmuhc=
 google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c=
 google.golang.org/grpc v1.20.1/go.mod h1:10oTOabMzJvdu6/UiuZezV6QK5dSlG84ov/aaiqXj38=
 google.golang.org/grpc v1.21.0 h1:G+97AoqBnmZIT91cLG/EkCoK9NSelj64P8bOHHNmGn0=
 google.golang.org/grpc v1.21.0/go.mod h1:oYelfM1adQP15Ek0mdvEgi9Df8B9CZIaU1084ijfRaM=
 google.golang.org/grpc v1.21.1/go.mod h1:oYelfM1adQP15Ek0mdvEgi9Df8B9CZIaU1084ijfRaM=
 google.golang.org/grpc v1.23.0/go.mod h1:Y5yQAOtifL1yxbo5wqy6BxZv8vAUGQwXBOALyacEbxg=
 google.golang.org/grpc v1.25.1/go.mod h1:c3i+UQWmh7LiEpx4sFZnkU36qjEYZ0imhYfXVyQciAY=
 google.golang.org/grpc v1.26.0/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8abTk=
 google.golang.org/grpc v1.27.0/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8abTk=
 google.golang.org/grpc v1.27.1/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8abTk=
 google.golang.org/grpc v1.28.0 h1:bO/TA4OxCOummhSf10siHuG7vJOiwh7SpRpFZDkOgl4=
 google.golang.org/grpc v1.28.0/go.mod h1:rpkK4SK4GF4Ach/+MFLZUBavHOvF2JJB5uozKKal+60=
 google.golang.org/grpc v1.29.1 h1:EC2SB8S04d2r73uptxphDSUG+kTKVgjRPF+N3xpxRB4=
 google.golang.org/grpc v1.29.1/go.mod h1:itym6AZVZYACWQqET3MqgPpjcuV5QH3BxFS3IjizoKk=
 google.golang.org/grpc v1.30.0/go.mod h1:N36X2cJ7JwdamYAgDz+s+rVMFjt3numwzf/HckM8pak=
 google.golang.org/grpc v1.31.0/go.mod h1:N36X2cJ7JwdamYAgDz+s+rVMFjt3numwzf/HckM8pak=
@@ -881,21 +718,17 @@ google.golang.org/protobuf v0.0.0-20200228230310-ab0ca4ff8a60/go.mod h1:cfTl7dwQ
 google.golang.org/protobuf v1.20.1-0.20200309200217-e05f789c0967/go.mod h1:A+miEFZTKqfCUM6K7xSMQL9OKL/b6hQv+e19PK+JZNE=
 google.golang.org/protobuf v1.21.0/go.mod h1:47Nbq4nVaFHyn7ilMalzfO3qCViNmqZ2kzikPIcrTAo=
 google.golang.org/protobuf v1.22.0/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU=
 google.golang.org/protobuf v1.23.0 h1:4MY060fB1DLGMB/7MBTLnwQUY6+F09GEiz6SsrNqyzM=
 google.golang.org/protobuf v1.23.0/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU=
 google.golang.org/protobuf v1.23.1-0.20200526195155-81db48ad09cc h1:TnonUr8u3himcMY0vSh23jFOXA+cnucl1gB6EQTReBI=
 google.golang.org/protobuf v1.23.1-0.20200526195155-81db48ad09cc/go.mod h1:EGpADcykh3NcUnDUJcl1+ZksZNG86OlYog2l/sGQquU=
 google.golang.org/protobuf v1.24.0 h1:UhZDfRO8JRQru4/+LlLE0BRKGF8L+PICnvYZmx/fEGA=
 google.golang.org/protobuf v1.24.0/go.mod h1:r/3tXBNzIEhYS9I1OUVjXDlt8tc493IdKGjtUeSXeh4=
 google.golang.org/protobuf v1.25.0/go.mod h1:9JNX74DMeImyA3h4bdi1ymwjUzf21/xIlbajtzgsN7c=
 google.golang.org/protobuf v1.26.0-rc.1/go.mod h1:jlhhOSvTdKEhbULTjvd4ARK9grFBp09yW+WbY/TyQbw=
 google.golang.org/protobuf v1.26.0/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc=
 google.golang.org/protobuf v1.27.1 h1:SnqbnDw1V7RiZcXPx5MEeqPv2s79L9i7BJUlG/+RurQ=
 google.golang.org/protobuf v1.27.1/go.mod h1:9q0QmTI4eRPtz6boOQmLYwt+qCgq0jsYwAQnmE0givc=
 gopkg.in/alecthomas/kingpin.v2 v2.2.6/go.mod h1:FMv+mEhP44yOT+4EoQTLFTRgOQ1FBLkstjWtayDeSgw=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
 gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127 h1:qIbj1fsPNlZgppZ+VLlY7N33q108Sa+fhmuc+sWQYwY=
 gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
 gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15 h1:YR8cESwS4TdDjEe65xsg0ogRM/Nc3DYOhEAlW+xobZo=
 gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
 gopkg.in/errgo.v2 v2.1.0/go.mod h1:hNsd1EY+bozCKY1Ytp96fpM3vjJbqLJn88ws8XvfDNI=
 gopkg.in/go-playground/assert.v1 v1.2.1 h1:xoYuJVE7KT85PYWrN730RguIQO0ePzVRfFMXadIrXTM=
@@ -903,27 +736,16 @@ gopkg.in/go-playground/assert.v1 v1.2.1/go.mod h1:9RXL0bg/zibRAgZUYszZSwO/z8Y/a8
 gopkg.in/go-playground/validator.v9 v9.29.1/go.mod h1:+c9/zcJMFNgbLvly1L1V+PpxWdVbfP1avr/N00E2vyQ=
 gopkg.in/go-playground/validator.v9 v9.31.0 h1:bmXmP2RSNtFES+bn4uYuHT7iJFJv7Vj+an+ZQdDaD1M=
 gopkg.in/go-playground/validator.v9 v9.31.0/go.mod h1:+c9/zcJMFNgbLvly1L1V+PpxWdVbfP1avr/N00E2vyQ=
 gopkg.in/ini.v1 v1.51.0 h1:AQvPpx3LzTDM0AjnIRlVFwFFGC+npRopjZxLJj6gdno=
 gopkg.in/ini.v1 v1.51.0/go.mod h1:pNLf8WUiyNEtQjuu5G5vTm06TEv9tsIgeAvK8hOrP4k=
 gopkg.in/ini.v1 v1.56.0 h1:DPMeDvGTM54DXbPkVIZsp19fp/I2K7zwA/itHYHKo8Y=
 gopkg.in/ini.v1 v1.56.0/go.mod h1:pNLf8WUiyNEtQjuu5G5vTm06TEv9tsIgeAvK8hOrP4k=
 gopkg.in/ini.v1 v1.62.0/go.mod h1:pNLf8WUiyNEtQjuu5G5vTm06TEv9tsIgeAvK8hOrP4k=
 gopkg.in/ini.v1 v1.63.2 h1:tGK/CyBg7SMzb60vP1M03vNZ3VDu3wGQJwn7Sxi9r3c=
 gopkg.in/ini.v1 v1.63.2/go.mod h1:pNLf8WUiyNEtQjuu5G5vTm06TEv9tsIgeAvK8hOrP4k=
 gopkg.in/resty.v1 v1.12.0/go.mod h1:mDo4pnntr5jdWRML875a/NmxYqAlA73dVijT2AXvQQo=
 gopkg.in/yaml.v2 v2.0.0-20170812160011-eb3733d160e7/go.mod h1:JAlM8MvJe8wmxCU4Bli9HhUf9+ttbYbLASfIpnQbh74=
 gopkg.in/yaml.v2 v2.2.1/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
 gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
 gopkg.in/yaml.v2 v2.2.3/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
 gopkg.in/yaml.v2 v2.2.4 h1:/eiJrUcujPVeJ3xlSWaiNi3uSVmDGBK1pDHUHAnao1I=
 gopkg.in/yaml.v2 v2.2.4/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
 gopkg.in/yaml.v2 v2.2.8 h1:obN1ZagJSUGI0Ek/LBmuj4SNLPfIny3KsKFopxRdj10=
 gopkg.in/yaml.v2 v2.2.8/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
 gopkg.in/yaml.v2 v2.3.0 h1:clyUAQHOM3G0M3f5vQj7LuJrETvjVot3Z5el9nffUtU=
 gopkg.in/yaml.v2 v2.3.0/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=
 gopkg.in/yaml.v2 v2.4.0 h1:D8xgwECY7CYvx+Y2n4sBz93Jn9JRvxdiyyo8CTfuKaY=
 gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ=
 gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
 gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b h1:h8qDotaEPuJATrMmW04NCwg7v22aHH28wwpauUhK9Oo=
 gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
 honnef.co/go/tools v0.0.0-20190102054323-c2f93a96b099/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
 honnef.co/go/tools v0.0.0-20190106161140-3f1c8253044a/go.mod h1:rf3lG4BRIbNafJWhAfAdb/ePZxsR/4RtNHQocxwk9r4=
--- a/handler/handler.go
+++ b/handler/handler.go
@@ -1,9 +1,9 @@
 package handler
 import (
 	"budget/internal/storage/validators"
 	"budget/internal/utils"
 	"net/http"
 	"nos-comptes/internal/storage/validators"
 	"nos-comptes/internal/utils"
 	"reflect"
 	"strings"
--- a/internal/account/database.go
+++ b/internal/account/database.go
@@ -1,7 +1,10 @@
 package account
 import (
-	"nos-comptes/internal/storage/dao/postgresql"
+	"budget/internal/storage/dao"
 	"budget/internal/storage/dao/postgresql"
 	"budget/internal/utils"
 	"fmt"
 	"github.com/lib/pq"
 )
@@ -41,13 +44,22 @@ func (db *Database) GetAccountWithNameForUser(name string, id string) (*Account,
 		WHERE a.user_id = $1
 		AND a.name = $2
 	`
-	row := db.Session.QueryRow(q, id, name)
+	row, err := db.Session.Query(q, id, name)
-
+	if !row.Next() {
 		return nil, dao.NewDAOError(dao.ErrTypeNotFound, fmt.Errorf("No row found"))
 	}
 	a := Account{}
-	err := row.Scan(&a.ID, &a.UserId, &a.Name, &a.Provider, &a.CreatedAt, &a.UpdatedAt)
+	row.Scan(&a.ID, &a.UserId, &a.Name, &a.Provider, &a.CreatedAt, &a.UpdatedAt)
 	if row.Next() {
 		return nil, fmt.Errorf("Impossibru")
 	}
 	if errPq, ok := err.(*pq.Error); ok {
 		return nil, postgresql.HandlePgError(errPq)
 	}
 	if err != nil {
 		utils.GetLogger().Info(err)
 		return nil, err
 	}
 	return &a, nil
 }
@@ -70,6 +82,35 @@ func (db *Database) CreateAccount(account *Account) error {
 }
 func (db *Database) DeleteAccountOfAnUser(userId, accountId string) error {
 	query := `
 		DELETE FROM account
 		WHERE user_id = $1
 		AND id = $2;`
 	_, err := db.Session.Exec(query, userId, accountId)
 	return err
 }
 func (db *Database) GetASpecificAccountForUser(userId, accountId string) (*Account, error) {
 	q := `
 		SELECT a.id, a.user_id, a.name, a.provider, a.created_at, a.updated_at
 		FROM public.account a
 		WHERE a.user_id = $1
 		AND a.id = $2
 	`
 	row := db.Session.QueryRow(q, userId, accountId)
 	a := Account{}
 	err := row.Scan(&a.ID, &a.UserId, &a.Name, &a.Provider, &a.CreatedAt, &a.UpdatedAt)
 	if errPq, ok := err.(*pq.Error); ok {
 		return nil, postgresql.HandlePgError(errPq)
 	}
 	if err != nil {
 		utils.GetLogger().Info(err)
 		return nil, err
 	}
 	return &a, nil
 }
 func NewDatabase(db *postgresql.DatabasePostgreSQL) *Database {
 	return &Database{db}
 }
--- a/internal/account/handler.go
+++ b/internal/account/handler.go
@@ -1,15 +1,13 @@
 package account
 import (
-	"fmt"
+	"budget/handler"
 	"budget/internal/storage/dao/postgresql"
 	"budget/internal/storage/model"
 	"budget/internal/storage/validators"
 	"budget/internal/user"
 	"budget/internal/utils"
 	"net/http"
 	"nos-comptes/handler"
 	"nos-comptes/internal/storage/dao/postgresql"
 	"nos-comptes/internal/storage/model"
 	"nos-comptes/internal/storage/validators"
 	"nos-comptes/internal/user"
 	"nos-comptes/internal/utils"
 	utils2 "nos-comptes/internal/utils"
 	"github.com/gin-gonic/gin"
 )
@@ -23,22 +21,6 @@ type Context struct {
 func (c *Context) GetAllAccountOfUser(gc *gin.Context) {
 	userId := gc.Param("userId")
 	err := c.Validator.VarCtx(gc, userId, "uuid4")
 	if err != nil {
 		utils2.JSONError(gc.Writer, validators.NewDataValidationAPIError(err))
 		return
 	}
 	_, err = c.userService.GetUserById(userId)
 	if e, ok := err.(*model.APIError); ok {
 		utils.GetLoggerFromCtx(gc).WithError(err).WithField("type", e.Type).Error("error GetUser: get user error")
 		utils.JSONErrorWithMessage(gc.Writer, *e, e.Description)
 	} else if err != nil {
 		utils.GetLoggerFromCtx(gc).WithError(err).Error("error while get user")
 		utils.JSONError(gc.Writer, model.ErrInternalServer)
 		return
 	}
 	accounts, err := c.service.GetAllAccountOfUser(userId)
 	if e, ok := err.(*model.APIError); ok {
 		utils.GetLoggerFromCtx(gc).WithError(err).WithField("type", e.Type).Error("error GetAllAccounts: get accounts")
@@ -59,41 +41,23 @@ func (c *Context) GetAllAccountOfUser(gc *gin.Context) {
 func (c *Context) CreateAccountOfUser(gc *gin.Context) {
 	userId := gc.Param("userId")
 	err := c.Validator.VarCtx(gc, userId, "uuid4")
 	if err != nil {
 		utils2.JSONError(gc.Writer, validators.NewDataValidationAPIError(err))
 		return
 	}
 	_, err = c.userService.GetUserById(userId)
 	if e, ok := err.(*model.APIError); ok {
 		utils.GetLoggerFromCtx(gc).WithError(err).WithField("type", e.Type).Error("error GetUser: get user error")
 		utils.JSONErrorWithMessage(gc.Writer, *e, e.Description)
 	} else if err != nil {
 		utils.GetLoggerFromCtx(gc).WithError(err).Error("error while get user")
 		utils.JSONError(gc.Writer, model.ErrInternalServer)
 		return
 	}
 	var account Account
 	var accountEditable AccountEditable
 	if err := gc.BindJSON(&accountEditable); err != nil {
-		utils2.JSONError(gc.Writer, validators.NewDataValidationAPIError(err))
+		utils.JSONError(gc.Writer, validators.NewDataValidationAPIError(err))
 		return
 	}
 	account = Account{AccountEditable: accountEditable, UserId: userId}
 	utils.GetLogger().Warn(account)
 	utils.GetLogger().Warn(accountEditable.Name)
 	utils.GetLogger().Warn(accountEditable.Provider)
 	accountFound, err := c.service.GetAccountWithNameForUser(account.Name, userId)
 	utils.GetLogger().Warn(err)
 	utils.GetLogger().Warn(accountFound)
 	if e, ok := err.(*model.APIError); ok {
 		if e.Type != model.ErrNotFound.Type {
-			utils.GetLoggerFromCtx(gc).WithError(err).WithField("type", e.Type).Error("error GetUser: get user error")
+			utils.GetLoggerFromCtx(gc).WithError(err).WithField("type", e.Type).Error("error GetAccount: get account error")
 			utils.JSONErrorWithMessage(gc.Writer, *e, e.Description)
 			return
 		}
 	} else if err != nil {
-		utils.GetLoggerFromCtx(gc).WithError(err).Error("error while get user")
+		utils.GetLoggerFromCtx(gc).WithError(err).Error("error while get account")
 		utils.JSONError(gc.Writer, model.ErrInternalServer)
 		return
 	}
@@ -101,24 +65,31 @@ func (c *Context) CreateAccountOfUser(gc *gin.Context) {
 	if accountFound != nil {
 		utils.GetLoggerFromCtx(gc).WithError(&model.ErrAlreadyExists).WithField("type", model.ErrAlreadyExists.Type).Error("error CreateAccount: account already exists")
 		utils.JSONErrorWithMessage(gc.Writer, model.ErrAlreadyExists, "account already exists with the same Name")
 		return
 	}
 	account.UserId = userId
 	accountSaved, err := c.service.CreateAccount(account)
 	if err != nil {
-		fmt.Println(err)
+		utils.GetLogger().Info(err)
-		utils.JSONError(gc.Writer, model.ErrInternalServer)
+		utils.JSONErrorWithMessage(gc.Writer, model.ErrInternalServer, err.Error())
 		return
 	}
 	utils.JSON(gc.Writer, http.StatusCreated, accountSaved)
 	return
 }
-func (c *Context) DeleteAccountOfUser(context *gin.Context) {
+func (c *Context) DeleteAccountOfUser(gc *gin.Context) {
 	userId := gc.Param("userId")
 	accountId := gc.Param("accountId")
 	c.service.DeleteAccountOfUser(userId, accountId)
 }
-func (c *Context) GetSpecificAccountOfUser(context *gin.Context) {
+func (c *Context) GetSpecificAccountOfUser(gc *gin.Context) {
-
+	userId := gc.Param("userId")
 	accountId := gc.Param("accountId")
 	account, _ := c.service.GetASpecificAccountForUser(userId, accountId)
 	utils.JSON(gc.Writer, http.StatusOK, account)
 }
 func NewHandler(ctx *handler.Context, db *postgresql.DatabasePostgreSQL) *Context {
--- a/internal/account/service.go
+++ b/internal/account/service.go
@@ -1,9 +1,8 @@
 package account
 import (
-	"nos-comptes/internal/storage/dao"
+	"budget/internal/storage/dao"
-	"nos-comptes/internal/storage/model"
+	"budget/internal/storage/model"
 	"nos-comptes/internal/utils"
 )
 type Service struct {
@@ -31,7 +30,6 @@ func (s *Service) GetAllAccountOfUser(userId string) ([]*Account, error) {
 func (s *Service) GetAccountWithNameForUser(name string, id string) (*Account, error) {
 	account, err := s.db.GetAccountWithNameForUser(name, id)
 	utils.GetLogger().Warn(err)
 	if e, ok := err.(*dao.Error); ok {
 		switch {
 		case e.Type == dao.ErrTypeNotFound:
@@ -50,6 +48,15 @@ func (s *Service) CreateAccount(account Account) (*Account, error) {
 	return &account, err
 }
 func (s *Service) DeleteAccountOfUser(userId, accountId string) error {
 	return s.db.DeleteAccountOfAnUser(userId, accountId)
 }
 func (s *Service) GetASpecificAccountForUser(userId, accountId string) (*Account, error) {
 	return s.db.GetASpecificAccountForUser(userId, accountId)
 }
 func NewService(database *Database) *Service {
 	return &Service{db: database}
 }
--- a/internal/expense/database.go
+++ b/internal/expense/database.go
@@ -1,11 +1,86 @@
 package expense
-import "nos-comptes/internal/storage/dao/postgresql"
+import (
 	"budget/internal/storage/dao/postgresql"
 	"budget/internal/utils"
 	"github.com/lib/pq"
 )
 type Database struct {
 	*postgresql.DatabasePostgreSQL
 }
 func (db *Database) CreateExpense(expense *Expense) error {
 	q := `
 		INSERT INTO public.expense
 			(account_id, value, type_expense, expense_date, libelle)
 		VALUES
 			($1, $2, $3, $4, $5)
 		RETURNING id, created_at
 	`
 	err := db.Session.
 		QueryRow(q, expense.AccountId, expense.Value, expense.TypeExpense, expense.ExpenseDate, expense.Libelle).
 		Scan(&expense.ID, &expense.CreatedAt)
 	if err != nil {
 		utils.GetLogger().Info(err)
 	}
 	if errPq, ok := err.(*pq.Error); ok {
 		return postgresql.HandlePgError(errPq)
 	}
 	return err
 }
 func (db Database) GetExpensesOfAnAccountBetween(id, from, to string) ([]*Expense, error) {
 	q := `
 		SELECT a.id, a.account_id, a.value, a.type_expense, a.expense_date, a.created_at, a.updated_at, a.libelle
 		FROM public.expense a
 		WHERE a.account_id = $1
 		AND a.expense_date BETWEEN $2 and $3
 	`
 	rows, err := db.Session.Query(q, id, from, to)
 	if err != nil {
 		return nil, err
 	}
 	defer rows.Close()
 	es := make([]*Expense, 0)
 	for rows.Next() {
 		e := Expense{}
 		err := rows.Scan(&e.ID, &e.AccountId, &e.Value, &e.TypeExpense, &e.ExpenseDate, &e.CreatedAt, &e.UpdatedAt, &e.Libelle)
 		if err != nil {
 			return nil, err
 		}
 		es = append(es, &e)
 	}
 	return es, nil
 }
 func (db Database) GetAllExpensesOfAnAccount(id string) ([]*Expense, error) {
 	q := `
 		SELECT a.id, a.account_id, a.value, a.type_expense, a.expense_date, a.created_at, a.updated_at, a.libelle
 		FROM public.expense a
 		WHERE a.account_id = $1
 	`
 	rows, err := db.Session.Query(q, id)
 	if err != nil {
 		return nil, err
 	}
 	defer rows.Close()
 	es := make([]*Expense, 0)
 	for rows.Next() {
 		e := Expense{}
 		err := rows.Scan(&e.ID, &e.AccountId, &e.Value, &e.TypeExpense, &e.ExpenseDate, &e.CreatedAt, &e.UpdatedAt, &e.Libelle)
 		if err != nil {
 			return nil, err
 		}
 		es = append(es, &e)
 	}
 	return es, nil
 }
 func NewDatabase(db *postgresql.DatabasePostgreSQL) *Database {
 	return &Database{db}
 }
--- a/internal/expense/handler.go
+++ b/internal/expense/handler.go
@@ -1,8 +1,15 @@
 package expense
 import (
-	"nos-comptes/handler"
+	"budget/handler"
-	"nos-comptes/internal/storage/dao/postgresql"
+	"budget/internal/account"
 	"budget/internal/storage/dao/postgresql"
 	"budget/internal/storage/model"
 	"budget/internal/storage/validators"
 	"budget/internal/utils"
 	"encoding/csv"
 	"net/http"
 	"time"
 	"github.com/gin-gonic/gin"
 )
@@ -10,19 +17,107 @@ import (
 type Context struct {
 	service        *Service
 	db             *Database
 	accountService *account.Service
 	*handler.Context
 }
-func (c *Context) CreateAnExpense(context *gin.Context) {
+func (c *Context) ImportExpenseFromCSV(gc *gin.Context) {
 }
 func (c *Context) CreateAnExpense(gc *gin.Context) {
 	accountID := gc.Param("accountId")
 	userId := gc.Param("userId")
 	csvHeaderFile, err := gc.FormFile("attachment")
 	if err != nil {
 		utils.GetLogger().Info(err)
 		utils.JSONErrorWithMessage(gc.Writer, model.ErrInternalServer, err.Error())
 		return
 	}
 	if err == nil {
 		csvFile, err := csvHeaderFile.Open()
 		if err != nil {
 			utils.GetLogger().Info(err)
 			utils.JSONErrorWithMessage(gc.Writer, model.ErrInternalServer, err.Error())
 			return
 		}
 		csvr := csv.NewReader(csvFile)
 		csvr.FieldsPerRecord = -1
 		csvr.Comma = ';'
 		filedata, err := csvr.ReadAll()
 		account, err := c.accountService.GetASpecificAccountForUser(userId, accountID)
 		if err != nil {
 			utils.GetLogger().Info(err)
 			utils.JSONErrorWithMessage(gc.Writer, model.ErrInternalServer, err.Error())
 			return
 		}
 		err = c.service.ProcessCSVFile(filedata, account)
 		if err != nil {
 			utils.JSONErrorWithMessage(gc.Writer, model.ErrInternalServer, err.Error())
 			return
 		}
 		return
 	}
 	var expense Expense
 	var expenseEditable ExpenseEditable
 	if err := gc.BindJSON(&expenseEditable); err != nil {
 		utils.JSONError(gc.Writer, validators.NewDataValidationAPIError(err))
 		return
 	}
 	expense = Expense{ExpenseEditable: expenseEditable, AccountId: accountID}
 	err = c.service.CreateExpense(&expense)
 	if err != nil {
 		utils.GetLogger().Info(err)
 		utils.JSONErrorWithMessage(gc.Writer, model.ErrInternalServer, err.Error())
 		return
 	}
 	utils.JSON(gc.Writer, http.StatusCreated, expense)
 }
 func (c *Context) DeleteExpense(gc *gin.Context) {
 }
-func (c *Context) DeleteExpense(context *gin.Context) {
+func (c *Context) GetAllExpenses(gc *gin.Context) {
-
+	accountId := gc.Param("accountId")
 	from := gc.Query("from")
 	to := gc.Query("to")
 	var expenses []*Expense
 	var err error
 	if from != "" || to != "" {
 		if to == "" {
 			fromParsed, err := time.Parse("2006-01-02", from)
 			if err == nil {
 				to = time.Now().Format("2006-01-02")
 			} else {
 				to = fromParsed.AddDate(0, 1, 0).Format("2006-01-02")
 			}
 		}
 		if from == "" {
 			toParsed, err := time.Parse("2006-01-02", to)
 			if err == nil {
 				from = "1900-01-01"
 			} else {
 				from = toParsed.AddDate(0, -1, 0).Format("2006-01-02")
 			}
 		}
 		expenses, err = c.service.GetExpensesOfAnAccountBetween(accountId, from, to)
 	} else {
 		expenses, err = c.service.GetAllExpensesOfAnAccount(accountId)
 	}
 	if e, ok := err.(*model.APIError); ok {
 		utils.GetLoggerFromCtx(gc).WithError(err).WithField("type", e.Type).Error("error GetAllExpenses: get expenses")
 		utils.JSONErrorWithMessage(gc.Writer, *e, e.Description)
 	} else if err != nil {
 		utils.GetLoggerFromCtx(gc).WithError(err).Error("error while get expenses")
 		utils.JSONError(gc.Writer, model.ErrInternalServer)
 		return
 	}
-func (c *Context) GetAllExpenses(context *gin.Context) {
+	if len(expenses) == 0 {
-
+		utils.JSON(gc.Writer, http.StatusNoContent, nil)
 	} else {
 		utils.JSON(gc.Writer, http.StatusOK, expenses)
 	}
 }
 func (c *Context) GetAnExpenses(context *gin.Context) {
@@ -32,5 +127,6 @@ func (c *Context) GetAnExpenses(context *gin.Context) {
 func NewHandler(ctx *handler.Context, db *postgresql.DatabasePostgreSQL) *Context {
 	database := NewDatabase(db)
 	service := NewService(database)
-	return &Context{service: service, db: database, Context: ctx}
+	accountService := account.NewService(account.NewDatabase(db))
 	return &Context{service: service, db: database, accountService: accountService, Context: ctx}
 }
--- a/internal/expense/model.go
+++ b/internal/expense/model.go
@@ -1,4 +1,18 @@
 package expense
-type Account struct {
+import "time"
 type Expense struct {
 	ExpenseEditable
 	AccountId string `json:"accountId,omitempty"`
 }
 type ExpenseEditable struct {
 	ID          string     `json:"id,omitempty"`
 	Value       float32    `json:"value"`
 	Libelle     string     `json:"libelle"`
 	TypeExpense string     `json:"typeExpense"`
 	ExpenseDate time.Time  `json:"expenseDate,omitempty"`
 	CreatedAt   *time.Time `json:"createdAt,omitempty"`
 	UpdatedAt   *time.Time `json:"updatedAt,omitempty"`
 }
--- a/internal/expense/service.go
+++ b/internal/expense/service.go
@@ -1,9 +1,120 @@
 package expense
 import (
 	"budget/internal/account"
 	"budget/internal/storage/dao"
 	"budget/internal/storage/model"
 	"budget/internal/utils"
 	"strconv"
 	"strings"
 	"time"
 )
 type Service struct {
-	Db *Database
+	db *Database
 }
 func (s Service) GetExpensesOfAnAccountBetween(accountId, from, to string) ([]*Expense, error) {
 	expenses, err := s.db.GetExpensesOfAnAccountBetween(accountId, from, to)
 	utils.GetLogger().Info(err)
 	if e, ok := err.(*dao.Error); ok {
 		switch {
 		case e.Type == dao.ErrTypeNotFound:
 			return nil, &model.ErrNotFound
 		default:
 			return nil, &model.ErrInternalServer
 		}
 	} else if err != nil {
 		return nil, &model.ErrInternalServer
 	}
 	if expenses == nil {
 		return nil, &model.ErrNotFound
 	}
 	return expenses, nil
 }
 func (s Service) GetAllExpensesOfAnAccount(accountId string) ([]*Expense, error) {
 	expenses, err := s.db.GetAllExpensesOfAnAccount(accountId)
 	utils.GetLogger().Info(err)
 	if e, ok := err.(*dao.Error); ok {
 		switch {
 		case e.Type == dao.ErrTypeNotFound:
 			return nil, &model.ErrNotFound
 		default:
 			return nil, &model.ErrInternalServer
 		}
 	} else if err != nil {
 		return nil, &model.ErrInternalServer
 	}
 	if expenses == nil {
 		return nil, &model.ErrNotFound
 	}
 	return expenses, nil
 }
 func (s Service) CreateExpense(expense *Expense) error {
 	return s.db.CreateExpense(expense)
 }
 func (s Service) ProcessCSVFile(filedata [][]string, account *account.Account) error {
 	switch account.Provider {
 	case "caisse-epargne":
 		return s.processCaisseEpargne(filedata, account)
 	case "boursorama":
 		return s.processBoursorama(filedata, account)
 	case "bnp":
 		return s.processBnp(filedata, account)
 	default:
 		return nil
 	}
 }
 func (s Service) processCaisseEpargne(filedata [][]string, account *account.Account) error {
 	for _, val := range filedata[4:] {
 		expenseDate, err := time.Parse("02/01/06", val[0])
 		if err != nil {
 			utils.GetLogger().Info(err)
 			continue
 		}
 		amount := val[3]
 		typeExpense := "D"
 		if amount == "" {
 			amount = val[4]
 			typeExpense = "C"
 		}
 		amountParsed, err := strconv.ParseFloat(strings.Trim(strings.ReplaceAll(amount, ",", "."), "+"), 32)
 		if err != nil {
 			utils.GetLogger().Info(err)
 			continue
 		}
 		expense := &Expense{
 			ExpenseEditable: ExpenseEditable{
 				Value:       float32(amountParsed),
 				Libelle:     val[2],
 				TypeExpense: typeExpense,
 				ExpenseDate: expenseDate,
 			},
 			AccountId: account.ID,
 		}
 		s.CreateExpense(expense)
 		utils.GetLogger().Info(val)
 	}
 	return nil
 }
 func (s Service) processBoursorama(filedata [][]string, account *account.Account) error {
 	return nil
 }
 func (s Service) processBnp(filedata [][]string, account *account.Account) error {
 	return nil
 }
 func NewService(database *Database) *Service {
-	return &Service{Db: database}
+	return &Service{db: database}
 }
--- a/internal/jointaccount/database.go
+++ b/internal/jointaccount/database.go
@@ -0,0 +1,116 @@
 package jointaccount
 import (
 	"budget/internal/storage/dao"
 	"budget/internal/storage/dao/postgresql"
 	"budget/internal/utils"
 	"fmt"
 	"github.com/lib/pq"
 )
 type Database struct {
 	*postgresql.DatabasePostgreSQL
 }
 func (db *Database) GetAllJointaccountOfUser(id string) ([]*Jointaccount, error) {
 	q := `
 		SELECT a.id, a.user_id, a.name, a.provider, a.created_at, a.updated_at
 		FROM public.jointaccount a
 		WHERE a.user_id = $1
 	`
 	rows, err := db.Session.Query(q, id)
 	if err != nil {
 		return nil, err
 	}
 	defer rows.Close()
 	as := make([]*Jointaccount, 0)
 	for rows.Next() {
 		a := Jointaccount{}
 		err := rows.Scan(&a.ID, &a.UserId, &a.Name, &a.Provider, &a.CreatedAt, &a.UpdatedAt)
 		if err != nil {
 			return nil, err
 		}
 		as = append(as, &a)
 	}
 	return as, nil
 }
 func (db *Database) GetJointaccountWithNameForUser(name string, id string) (*Jointaccount, error) {
 	q := `
 		SELECT a.id, a.user_id, a.name, a.provider, a.created_at, a.updated_at
 		FROM public.jointaccount a
 		WHERE a.user_id = $1
 		AND a.name = $2
 	`
 	row, err := db.Session.Query(q, id, name)
 	if !row.Next() {
 		return nil, dao.NewDAOError(dao.ErrTypeNotFound, fmt.Errorf("No row found"))
 	}
 	a := Jointaccount{}
 	row.Scan(&a.ID, &a.UserId, &a.Name, &a.Provider, &a.CreatedAt, &a.UpdatedAt)
 	if row.Next() {
 		return nil, fmt.Errorf("Impossibru")
 	}
 	if errPq, ok := err.(*pq.Error); ok {
 		return nil, postgresql.HandlePgError(errPq)
 	}
 	if err != nil {
 		utils.GetLogger().Info(err)
 		return nil, err
 	}
 	return &a, nil
 }
 func (db *Database) CreateJointaccount(jointaccount *Jointaccount) error {
 	q := `
 		INSERT INTO public.jointaccount
 			(Name, Provider, user_id)
 		VALUES
 			($1, $2, $3)
 		RETURNING id, created_at
 	`
 	err := db.Session.
 		QueryRow(q, jointaccount.Name, jointaccount.Provider, jointaccount.UserId).
 		Scan(&jointaccount.ID, &jointaccount.CreatedAt)
 	if errPq, ok := err.(*pq.Error); ok {
 		return postgresql.HandlePgError(errPq)
 	}
 	return err
 }
 func (db *Database) DeleteJointaccountOfAnUser(userId, jointaccountId string) error {
 	query := `
 		DELETE FROM jointaccount
 		WHERE user_id = $1
 		AND id = $2;`
 	_, err := db.Session.Exec(query, userId, jointaccountId)
 	return err
 }
 func (db *Database) GetASpecificJointaccountForUser(userId, jointaccountId string) (*Jointaccount, error) {
 	q := `
 		SELECT a.id, a.user_id, a.name, a.provider, a.created_at, a.updated_at
 		FROM public.jointaccount a
 		WHERE a.user_id = $1
 		AND a.id = $2
 	`
 	row := db.Session.QueryRow(q, userId, jointaccountId)
 	a := Jointaccount{}
 	err := row.Scan(&a.ID, &a.UserId, &a.Name, &a.Provider, &a.CreatedAt, &a.UpdatedAt)
 	if errPq, ok := err.(*pq.Error); ok {
 		return nil, postgresql.HandlePgError(errPq)
 	}
 	if err != nil {
 		utils.GetLogger().Info(err)
 		return nil, err
 	}
 	return &a, nil
 }
 func NewDatabase(db *postgresql.DatabasePostgreSQL) *Database {
 	return &Database{db}
 }
--- a/internal/jointaccount/handler.go
+++ b/internal/jointaccount/handler.go
@@ -0,0 +1,100 @@
 package jointaccount
 import (
 	"budget/handler"
 	"budget/internal/storage/dao/postgresql"
 	"budget/internal/storage/model"
 	"budget/internal/storage/validators"
 	"budget/internal/user"
 	"budget/internal/utils"
 	"net/http"
 	"github.com/gin-gonic/gin"
 )
 type Context struct {
 	service     *Service
 	db          *Database
 	userService *user.Service
 	*handler.Context
 }
 func (c *Context) GetAllJointaccountOfUser(gc *gin.Context) {
 	userId := gc.Param("userId")
 	jointaccounts, err := c.service.GetAllJointaccountOfUser(userId)
 	if e, ok := err.(*model.APIError); ok {
 		utils.GetLoggerFromCtx(gc).WithError(err).WithField("type", e.Type).Error("error GetAllJointaccounts: get jointaccounts")
 		utils.JSONErrorWithMessage(gc.Writer, *e, e.Description)
 	} else if err != nil {
 		utils.GetLoggerFromCtx(gc).WithError(err).Error("error while get jointaccounts")
 		utils.JSONError(gc.Writer, model.ErrInternalServer)
 		return
 	}
 	if len(jointaccounts) == 0 {
 		utils.JSON(gc.Writer, http.StatusNoContent, nil)
 	} else {
 		utils.JSON(gc.Writer, http.StatusOK, jointaccounts)
 	}
 }
 func (c *Context) CreateJointaccountOfUser(gc *gin.Context) {
 	userId := gc.Param("userId")
 	var jointaccount Jointaccount
 	var jointaccountEditable JointaccountEditable
 	if err := gc.BindJSON(&jointaccountEditable); err != nil {
 		utils.JSONError(gc.Writer, validators.NewDataValidationAPIError(err))
 		return
 	}
 	jointaccount = Jointaccount{JointaccountEditable: jointaccountEditable, UserId: userId}
 	jointaccountFound, err := c.service.GetJointaccountWithNameForUser(jointaccount.Name, userId)
 	if e, ok := err.(*model.APIError); ok {
 		if e.Type != model.ErrNotFound.Type {
 			utils.GetLoggerFromCtx(gc).WithError(err).WithField("type", e.Type).Error("error GetJointaccount: get jointaccount error")
 			utils.JSONErrorWithMessage(gc.Writer, *e, e.Description)
 			return
 		}
 	} else if err != nil {
 		utils.GetLoggerFromCtx(gc).WithError(err).Error("error while get jointaccount")
 		utils.JSONError(gc.Writer, model.ErrInternalServer)
 		return
 	}
 	if jointaccountFound != nil {
 		utils.GetLoggerFromCtx(gc).WithError(&model.ErrAlreadyExists).WithField("type", model.ErrAlreadyExists.Type).Error("error CreateJointaccount: jointaccount already exists")
 		utils.JSONErrorWithMessage(gc.Writer, model.ErrAlreadyExists, "jointaccount already exists with the same Name")
 		return
 	}
 	jointaccount.UserId = userId
 	jointaccountSaved, err := c.service.CreateJointaccount(jointaccount)
 	if err != nil {
 		utils.GetLogger().Info(err)
 		utils.JSONErrorWithMessage(gc.Writer, model.ErrInternalServer, err.Error())
 		return
 	}
 	utils.JSON(gc.Writer, http.StatusCreated, jointaccountSaved)
 	return
 }
 func (c *Context) DeleteJointaccountOfUser(gc *gin.Context) {
 	userId := gc.Param("userId")
 	jointaccountId := gc.Param("jointaccountId")
 	c.service.DeleteJointaccountOfUser(userId, jointaccountId)
 }
 func (c *Context) GetSpecificJointaccountOfUser(gc *gin.Context) {
 	userId := gc.Param("userId")
 	jointaccountId := gc.Param("jointaccountId")
 	jointaccount, _ := c.service.GetASpecificJointaccountForUser(userId, jointaccountId)
 	utils.JSON(gc.Writer, http.StatusOK, jointaccount)
 }
 func NewHandler(ctx *handler.Context, db *postgresql.DatabasePostgreSQL) *Context {
 	database := NewDatabase(db)
 	service := NewService(database)
 	userService := user.NewService(user.NewDatabase(db))
 	return &Context{service: service, db: database, userService: userService, Context: ctx}
 }
--- a/internal/jointaccount/model.go
+++ b/internal/jointaccount/model.go
@@ -0,0 +1,16 @@
 package jointaccount
 import "time"
 type Jointaccount struct {
 	JointaccountEditable
 	UserId string `json:"userId,omitempty"`
 }
 type JointaccountEditable struct {
 	ID        string     `json:"id,omitempty"`
 	Name      string     `json:"name"`
 	Provider  string     `json:"provider"`
 	CreatedAt time.Time  `json:"createdAt,omitempty"`
 	UpdatedAt *time.Time `json:"updatedAt,omitempty"`
 }
--- a/internal/jointaccount/service.go
+++ b/internal/jointaccount/service.go
@@ -0,0 +1,62 @@
 package jointaccount
 import (
 	"budget/internal/storage/dao"
 	"budget/internal/storage/model"
 )
 type Service struct {
 	db *Database
 }
 func (s *Service) GetAllJointaccountOfUser(userId string) ([]*Jointaccount, error) {
 	jointaccounts, err := s.db.GetAllJointaccountOfUser(userId)
 	if e, ok := err.(*dao.Error); ok {
 		switch {
 		case e.Type == dao.ErrTypeNotFound:
 			return nil, &model.ErrNotFound
 		default:
 			return nil, &model.ErrInternalServer
 		}
 	} else if err != nil {
 		return nil, &model.ErrInternalServer
 	}
 	if jointaccounts == nil {
 		return nil, &model.ErrNotFound
 	}
 	return jointaccounts, nil
 }
 func (s *Service) GetJointaccountWithNameForUser(name string, id string) (*Jointaccount, error) {
 	jointaccount, err := s.db.GetJointaccountWithNameForUser(name, id)
 	if e, ok := err.(*dao.Error); ok {
 		switch {
 		case e.Type == dao.ErrTypeNotFound:
 			return nil, &model.ErrNotFound
 		default:
 			return nil, &model.ErrInternalServer
 		}
 	} else if err != nil {
 		return nil, &model.ErrInternalServer
 	}
 	return jointaccount, nil
 }
 func (s *Service) CreateJointaccount(jointaccount Jointaccount) (*Jointaccount, error) {
 	err := s.db.CreateJointaccount(&jointaccount)
 	return &jointaccount, err
 }
 func (s *Service) DeleteJointaccountOfUser(userId, jointaccountId string) error {
 	return s.db.DeleteJointaccountOfAnUser(userId, jointaccountId)
 }
 func (s *Service) GetASpecificJointaccountForUser(userId, jointaccountId string) (*Jointaccount, error) {
 	return s.db.GetASpecificJointaccountForUser(userId, jointaccountId)
 }
 func NewService(database *Database) *Service {
 	return &Service{db: database}
 }
--- a/internal/jointexpense/database.go
+++ b/internal/jointexpense/database.go
@@ -0,0 +1,86 @@
 package jointexpense
 import (
 	"budget/internal/storage/dao/postgresql"
 	"budget/internal/utils"
 	"github.com/lib/pq"
 )
 type Database struct {
 	*postgresql.DatabasePostgreSQL
 }
 func (db *Database) CreateJointexpense(jointexpense *Jointexpense) error {
 	q := `
 		INSERT INTO public.jointexpense
 			(jointaccount_id, value, type_jointexpense, jointexpense_date, libelle)
 		VALUES
 			($1, $2, $3, $4, $5)
 		RETURNING id, created_at
 	`
 	err := db.Session.
 		QueryRow(q, jointexpense.JointaccountId, jointexpense.Value, jointexpense.TypeJointexpense, jointexpense.JointexpenseDate, jointexpense.Libelle).
 		Scan(&jointexpense.ID, &jointexpense.CreatedAt)
 	if err != nil {
 		utils.GetLogger().Info(err)
 	}
 	if errPq, ok := err.(*pq.Error); ok {
 		return postgresql.HandlePgError(errPq)
 	}
 	return err
 }
 func (db Database) GetJointexpensesOfAnJointaccountBetween(id, from, to string) ([]*Jointexpense, error) {
 	q := `
 		SELECT a.id, a.jointaccount_id, a.value, a.type_jointexpense, a.jointexpense_date, a.created_at, a.updated_at, a.libelle
 		FROM public.jointexpense a
 		WHERE a.jointaccount_id = $1
 		AND a.jointexpense_date BETWEEN $2 and $3
 	`
 	rows, err := db.Session.Query(q, id, from, to)
 	if err != nil {
 		return nil, err
 	}
 	defer rows.Close()
 	es := make([]*Jointexpense, 0)
 	for rows.Next() {
 		e := Jointexpense{}
 		err := rows.Scan(&e.ID, &e.JointjointaccountId, &e.Value, &e.TypeJointexpense, &e.JointexpenseDate, &e.CreatedAt, &e.UpdatedAt, &e.Libelle)
 		if err != nil {
 			return nil, err
 		}
 		es = append(es, &e)
 	}
 	return es, nil
 }
 func (db Database) GetAllJointexpensesOfAnJointaccount(id string) ([]*Jointexpense, error) {
 	q := `
 		SELECT a.id, a.jointaccount_id, a.value, a.type_jointexpense, a.jointexpense_date, a.created_at, a.updated_at, a.libelle
 		FROM public.jointexpense a
 		WHERE a.jointaccount_id = $1
 	`
 	rows, err := db.Session.Query(q, id)
 	if err != nil {
 		return nil, err
 	}
 	defer rows.Close()
 	es := make([]*Jointexpense, 0)
 	for rows.Next() {
 		e := Jointexpense{}
 		err := rows.Scan(&e.ID, &e.JointaccountId, &e.Value, &e.TypeJointexpense, &e.JointexpenseDate, &e.CreatedAt, &e.UpdatedAt, &e.Libelle)
 		if err != nil {
 			return nil, err
 		}
 		es = append(es, &e)
 	}
 	return es, nil
 }
 func NewDatabase(db *postgresql.DatabasePostgreSQL) *Database {
 	return &Database{db}
 }
--- a/internal/jointexpense/handler.go
+++ b/internal/jointexpense/handler.go
@@ -0,0 +1,132 @@
 package jointexpense
 import (
 	"budget/handler"
 	"budget/internal/jointaccount"
 	"budget/internal/storage/dao/postgresql"
 	"budget/internal/storage/model"
 	"budget/internal/storage/validators"
 	"budget/internal/utils"
 	"encoding/csv"
 	"net/http"
 	"time"
 	"github.com/gin-gonic/gin"
 )
 type Context struct {
 	service             *Service
 	db                  *Database
 	jointaccountService *jointaccount.Service
 	*handler.Context
 }
 func (c *Context) ImportJointexpenseFromCSV(gc *gin.Context) {
 }
 func (c *Context) CreateAnJointexpense(gc *gin.Context) {
 	jointaccountID := gc.Param("jointaccountId")
 	userId := gc.Param("userId")
 	csvHeaderFile, err := gc.FormFile("attachment")
 	if err != nil {
 		utils.GetLogger().Info(err)
 		utils.JSONErrorWithMessage(gc.Writer, model.ErrInternalServer, err.Error())
 		return
 	}
 	if err == nil {
 		csvFile, err := csvHeaderFile.Open()
 		if err != nil {
 			utils.GetLogger().Info(err)
 			utils.JSONErrorWithMessage(gc.Writer, model.ErrInternalServer, err.Error())
 			return
 		}
 		csvr := csv.NewReader(csvFile)
 		csvr.FieldsPerRecord = -1
 		csvr.Comma = ';'
 		filedata, err := csvr.ReadAll()
 		jointaccount, err := c.jointaccountService.GetASpecificJointaccountForUser(userId, jointaccountID)
 		if err != nil {
 			utils.GetLogger().Info(err)
 			utils.JSONErrorWithMessage(gc.Writer, model.ErrInternalServer, err.Error())
 			return
 		}
 		err = c.service.ProcessCSVFile(filedata, jointaccount)
 		if err != nil {
 			utils.JSONErrorWithMessage(gc.Writer, model.ErrInternalServer, err.Error())
 			return
 		}
 		return
 	}
 	var jointexpense Jointexpense
 	var jointexpenseEditable JointexpenseEditable
 	if err := gc.BindJSON(&jointexpenseEditable); err != nil {
 		utils.JSONError(gc.Writer, validators.NewDataValidationAPIError(err))
 		return
 	}
 	jointexpense = Jointexpense{JointexpenseEditable: jointexpenseEditable, JointaccountId: jointaccountID}
 	err = c.service.CreateJointexpense(&jointexpense)
 	if err != nil {
 		utils.GetLogger().Info(err)
 		utils.JSONErrorWithMessage(gc.Writer, model.ErrInternalServer, err.Error())
 		return
 	}
 	utils.JSON(gc.Writer, http.StatusCreated, jointexpense)
 }
 func (c *Context) DeleteJointexpense(gc *gin.Context) {
 }
 func (c *Context) GetAllJointexpenses(gc *gin.Context) {
 	jointaccountId := gc.Param("jointaccountId")
 	from := gc.Query("from")
 	to := gc.Query("to")
 	var jointexpenses []*Jointexpense
 	var err error
 	if from != "" || to != "" {
 		if to == "" {
 			fromParsed, err := time.Parse("2006-01-02", from)
 			if err == nil {
 				to = time.Now().Format("2006-01-02")
 			} else {
 				to = fromParsed.AddDate(0, 1, 0).Format("2006-01-02")
 			}
 		}
 		if from == "" {
 			toParsed, err := time.Parse("2006-01-02", to)
 			if err == nil {
 				from = "1900-01-01"
 			} else {
 				from = toParsed.AddDate(0, -1, 0).Format("2006-01-02")
 			}
 		}
 		jointexpenses, err = c.service.GetJointexpensesOfAnJointaccountBetween(jointaccountId, from, to)
 	} else {
 		jointexpenses, err = c.service.GetAllJointexpensesOfAnJointaccount(jointaccountId)
 	}
 	if e, ok := err.(*model.APIError); ok {
 		utils.GetLoggerFromCtx(gc).WithError(err).WithField("type", e.Type).Error("error GetAllJointexpenses: get jointexpenses")
 		utils.JSONErrorWithMessage(gc.Writer, *e, e.Description)
 	} else if err != nil {
 		utils.GetLoggerFromCtx(gc).WithError(err).Error("error while get jointexpenses")
 		utils.JSONError(gc.Writer, model.ErrInternalServer)
 		return
 	}
 	if len(jointexpenses) == 0 {
 		utils.JSON(gc.Writer, http.StatusNoContent, nil)
 	} else {
 		utils.JSON(gc.Writer, http.StatusOK, jointexpenses)
 	}
 }
 func (c *Context) GetAnJointexpenses(context *gin.Context) {
 }
 func NewHandler(ctx *handler.Context, db *postgresql.DatabasePostgreSQL) *Context {
 	database := NewDatabase(db)
 	service := NewService(database)
 	jointaccountService := jointaccount.NewService(jointaccount.NewDatabase(db))
 	return &Context{service: service, db: database, jointaccountService: jointaccountService, Context: ctx}
 }
--- a/internal/jointexpense/model.go
+++ b/internal/jointexpense/model.go
@@ -0,0 +1,18 @@
 package jointexpense
 import "time"
 type Jointexpense struct {
 	JointexpenseEditable
 	JointaccountId string `json:"jointaccountId,omitempty"`
 }
 type JointexpenseEditable struct {
 	ID               string     `json:"id,omitempty"`
 	Value            float32    `json:"value"`
 	Libelle          string     `json:"libelle"`
 	TypeJointexpense string     `json:"typeJointexpense"`
 	JointexpenseDate time.Time  `json:"jointexpenseDate,omitempty"`
 	CreatedAt        *time.Time `json:"createdAt,omitempty"`
 	UpdatedAt        *time.Time `json:"updatedAt,omitempty"`
 }
--- a/internal/jointexpense/service.go
+++ b/internal/jointexpense/service.go
@@ -0,0 +1,120 @@
 package jointexpense
 import (
 	"budget/internal/jointaccount"
 	"budget/internal/storage/dao"
 	"budget/internal/storage/model"
 	"budget/internal/utils"
 	"strconv"
 	"strings"
 	"time"
 )
 type Service struct {
 	db *Database
 }
 func (s Service) GetJointexpensesOfAnJointaccountBetween(jointaccountId, from, to string) ([]*Jointexpense, error) {
 	jointexpenses, err := s.db.GetJointexpensesOfAnJointaccountBetween(jointaccountId, from, to)
 	utils.GetLogger().Info(err)
 	if e, ok := err.(*dao.Error); ok {
 		switch {
 		case e.Type == dao.ErrTypeNotFound:
 			return nil, &model.ErrNotFound
 		default:
 			return nil, &model.ErrInternalServer
 		}
 	} else if err != nil {
 		return nil, &model.ErrInternalServer
 	}
 	if jointexpenses == nil {
 		return nil, &model.ErrNotFound
 	}
 	return jointexpenses, nil
 }
 func (s Service) GetAllJointexpensesOfAnJointaccount(jointaccountId string) ([]*Jointexpense, error) {
 	jointexpenses, err := s.db.GetAllJointexpensesOfAnJointaccount(jointaccountId)
 	utils.GetLogger().Info(err)
 	if e, ok := err.(*dao.Error); ok {
 		switch {
 		case e.Type == dao.ErrTypeNotFound:
 			return nil, &model.ErrNotFound
 		default:
 			return nil, &model.ErrInternalServer
 		}
 	} else if err != nil {
 		return nil, &model.ErrInternalServer
 	}
 	if jointexpenses == nil {
 		return nil, &model.ErrNotFound
 	}
 	return jointexpenses, nil
 }
 func (s Service) CreateJointexpense(jointexpense *Jointexpense) error {
 	return s.db.CreateJointexpense(jointexpense)
 }
 func (s Service) ProcessCSVFile(filedata [][]string, jointaccount *jointaccount.Jointaccount) error {
 	switch jointaccount.Provider {
 	case "caisse-epargne":
 		return s.processCaisseEpargne(filedata, jointaccount)
 	case "boursorama":
 		return s.processBoursorama(filedata, jointaccount)
 	case "bnp":
 		return s.processBnp(filedata, jointaccount)
 	default:
 		return nil
 	}
 }
 func (s Service) processCaisseEpargne(filedata [][]string, jointaccount *jointaccount.Jointaccount) error {
 	for _, val := range filedata[4:] {
 		jointexpenseDate, err := time.Parse("02/01/06", val[0])
 		if err != nil {
 			utils.GetLogger().Info(err)
 			continue
 		}
 		amount := val[3]
 		typeJointexpense := "D"
 		if amount == "" {
 			amount = val[4]
 			typeJointexpense = "C"
 		}
 		amountParsed, err := strconv.ParseFloat(strings.Trim(strings.ReplaceAll(amount, ",", "."), "+"), 32)
 		if err != nil {
 			utils.GetLogger().Info(err)
 			continue
 		}
 		jointexpense := &Jointexpense{
 			JointexpenseEditable: JointexpenseEditable{
 				Value:            float32(amountParsed),
 				Libelle:          val[2],
 				TypeJointexpense: typeJointexpense,
 				JointexpenseDate: jointexpenseDate,
 			},
 			JointaccountId: jointaccount.ID,
 		}
 		s.CreateJointexpense(jointexpense)
 		utils.GetLogger().Info(val)
 	}
 	return nil
 }
 func (s Service) processBoursorama(filedata [][]string, jointaccount *jointaccount.Jointaccount) error {
 	return nil
 }
 func (s Service) processBnp(filedata [][]string, jointaccount *jointaccount.Jointaccount) error {
 	return nil
 }
 func NewService(database *Database) *Service {
 	return &Service{db: database}
 }
--- a/internal/shared-account/database.go
+++ b/internal/shared-account/database.go
@@ -1,6 +1,6 @@
 package sharedaccount
-import "nos-comptes/internal/storage/dao/postgresql"
+import "budget/internal/storage/dao/postgresql"
 type Database struct {
 	*postgresql.DatabasePostgreSQL
--- a/internal/shared-account/handler.go
+++ b/internal/shared-account/handler.go
@@ -1,8 +1,8 @@
 package sharedaccount
 import (
-	"nos-comptes/handler"
+	"budget/handler"
-	"nos-comptes/internal/storage/dao/postgresql"
+	"budget/internal/storage/dao/postgresql"
 	"github.com/gin-gonic/gin"
 )
--- a/internal/storage/dao/postgresql/database_postgresql.go
+++ b/internal/storage/dao/postgresql/database_postgresql.go
@@ -1,10 +1,10 @@
 package postgresql
 import (
 	"budget/internal/storage/dao"
 	"budget/internal/utils"
 	"database/sql"
 	"fmt"
 	"nos-comptes/internal/storage/dao"
 	"nos-comptes/internal/utils"
 	"github.com/lib/pq"
 )
--- a/internal/storage/validators/error.go
+++ b/internal/storage/validators/error.go
@@ -1,9 +1,9 @@
 package validators
 import (
 	"budget/internal/storage/model"
 	"budget/internal/utils"
 	"fmt"
 	"nos-comptes/internal/storage/model"
 	"nos-comptes/internal/utils"
 	"regexp"
 	"strings"
--- a/internal/user/database.go
+++ b/internal/user/database.go
@@ -1,9 +1,9 @@
 package user
 import (
 	"budget/internal/storage/dao"
 	"budget/internal/storage/dao/postgresql"
 	"database/sql"
 	"nos-comptes/internal/storage/dao"
 	"nos-comptes/internal/storage/dao/postgresql"
 	"github.com/lib/pq"
 )
--- a/internal/user/handler.go
+++ b/internal/user/handler.go
@@ -1,13 +1,11 @@
 package user
 import (
-	"fmt"
+	"budget/handler"
 	"budget/internal/storage/dao/postgresql"
 	"budget/internal/storage/model"
 	"budget/internal/utils"
 	"net/http"
 	"nos-comptes/handler"
 	"nos-comptes/internal/storage/dao/postgresql"
 	"nos-comptes/internal/storage/model"
 	"nos-comptes/internal/storage/validators"
 	"nos-comptes/internal/utils"
 	"strings"
 	"github.com/gin-gonic/gin"
@@ -46,7 +44,7 @@ func (hc *Context) ConnectUser(c *gin.Context) {
 	oauth2Service, err := oauth2.New(&http.Client{})
 	if oauth2Service == nil {
-		fmt.Println(err)
+		utils.GetLoggerFromCtx(c).WithError(err).Error(err)
 		utils.JSONError(c.Writer, model.ErrInternalServer)
 		return
 	}
@@ -54,18 +52,17 @@ func (hc *Context) ConnectUser(c *gin.Context) {
 	tokenInfoCall.IdToken(authorizationHeaderSplitted[1])
 	tokenInfo, err := tokenInfoCall.Do()
 	if err != nil {
-		utils.GetLogger().WithError(err).Error(err)
+		utils.GetLoggerFromCtx(c).WithError(err).Error(err)
 		utils.JSONError(c.Writer, model.ErrBadRequestFormat)
 		return
 	}
 	user, err := hc.service.GetUserFromGoogleID(tokenInfo.UserId)
 	if err != nil {
 		utils.GetLogger().WithError(err).Error(err)
 		if castedError, ok := err.(*model.APIError); ok {
 			if castedError.Type == model.ErrNotFound.Type {
 				user, err := hc.service.CreateUserFromGoogleToken(tokenInfo.UserId, tokenInfo.Email)
 				if err != nil {
-					fmt.Println(err)
+					utils.GetLoggerFromCtx(c).WithError(err).Error(err)
 					utils.JSONError(c.Writer, model.ErrInternalServer)
 					return
 				}
@@ -75,11 +72,10 @@ func (hc *Context) ConnectUser(c *gin.Context) {
 			utils.JSONError(c.Writer, *castedError)
 			return
 		}
 		utils.GetLoggerFromCtx(c).WithError(err).Error(err)
 		utils.JSONError(c.Writer, model.ErrInternalServer)
 		return
 	}
 	fmt.Println("Found the user " + user.Email)
 	fmt.Println("Return 200")
 	utils.JSON(c.Writer, 200, user)
 }
@@ -93,7 +89,7 @@ func (hc *Context) CreateUser(c *gin.Context) {
 	oauth2Service, err := oauth2.New(&http.Client{})
 	if oauth2Service == nil {
-		fmt.Println(err)
+		utils.GetLogger().WithError(err).Error(err)
 		utils.JSONError(c.Writer, model.ErrInternalServer)
 		return
 	}
@@ -112,7 +108,7 @@ func (hc *Context) CreateUser(c *gin.Context) {
 			if castedError.Type == model.ErrNotFound.Type {
 				user, err := hc.service.CreateUserFromGoogleToken(tokenInfo.UserId, tokenInfo.Email)
 				if err != nil {
-					fmt.Println(err)
+					utils.GetLogger().WithError(err).Error(err)
 					utils.JSONError(c.Writer, model.ErrInternalServer)
 					return
 				}
@@ -122,6 +118,7 @@ func (hc *Context) CreateUser(c *gin.Context) {
 			utils.JSONError(c.Writer, *castedError)
 			return
 		}
 		utils.GetLogger().Info(err)
 		utils.JSONError(c.Writer, model.ErrInternalServer)
 		return
 	}
@@ -130,27 +127,6 @@ func (hc *Context) CreateUser(c *gin.Context) {
 func (hc *Context) GetUser(c *gin.Context) {
 	userID := c.Param("userId")
-
+	user, _ := hc.service.GetUserById(userID)
 	err := hc.Validator.VarCtx(c, userID, "uuid4")
 	if err != nil {
 		utils.JSONError(c.Writer, validators.NewDataValidationAPIError(err))
 		return
 	}
 	user, err := hc.service.GetUserById(userID)
 	if e, ok := err.(*model.APIError); ok {
 		utils.GetLoggerFromCtx(c).WithError(err).WithField("type", e.Type).Error("error GetUser: get user error")
 		utils.JSONErrorWithMessage(c.Writer, *e, e.Description)
 	} else if err != nil {
 		utils.GetLoggerFromCtx(c).WithError(err).Error("error while get user")
 		utils.JSONError(c.Writer, model.ErrInternalServer)
 		return
 	}
 	if user == nil {
 		utils.JSONErrorWithMessage(c.Writer, model.ErrNotFound, "User not found")
 		return
 	}
 	utils.JSON(c.Writer, http.StatusOK, user)
 }
--- a/internal/user/service.go
+++ b/internal/user/service.go
@@ -1,9 +1,8 @@
 package user
 import (
-	"nos-comptes/internal/storage/dao"
+	"budget/internal/storage/dao"
-	"nos-comptes/internal/storage/model"
+	"budget/internal/storage/model"
 	"nos-comptes/internal/utils"
 )
 type Service struct {
@@ -17,7 +16,6 @@ func NewService(database *Database) *Service {
 func (s *Service) GetUserById(userId string) (*User, error) {
 	user, err := s.db.GetUsersByID(userId)
 	if e, ok := err.(*dao.Error); ok {
 		utils.GetLogger().Warn(err)
 		switch {
 		case e.Type == dao.ErrTypeNotFound:
 			return nil, &model.ErrNotFound
@@ -37,7 +35,6 @@ func (s *Service) GetUserById(userId string) (*User, error) {
 func (us *Service) GetUserFromGoogleID(googleUserID string) (*User, error) {
 	user, err := us.db.GetUsersByGoogleID(googleUserID)
 	if err != nil {
 		utils.GetLogger().Warn(err)
 		if castedError, ok := err.(*dao.Error); ok {
 			switch castedError.Type {
 			case dao.ErrTypeNotFound:
--- a/internal/utils/responses.go
+++ b/internal/utils/responses.go
@@ -1,9 +1,9 @@
 package utils
 import (
 	"budget/internal/storage/model"
 	"encoding/json"
 	"net/http"
 	"nos-comptes/internal/storage/model"
 )
 func JSON(w http.ResponseWriter, status int, data interface{}) {
--- a/liquibase/changelogs/changelog-master.xml
+++ b/liquibase/changelogs/changelog-master.xml
@@ -5,7 +5,7 @@
                   xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.5.xsd">
    <include file="prepare-database.sql" relativeToChangelogFile="true"/>
    <include file="changeset/create-user.xml" relativeToChangelogFile="true"/>
-    <include file="changeset/create-account.xml" relativeToChangelogFile="true"/>
+    <include file="changeset/create-budget.xml" relativeToChangelogFile="true"/>
-    <include file="changeset/create-shared-account.xml" relativeToChangelogFile="true"/>
+    <include file="changeset/create-category.xml" relativeToChangelogFile="true"/>
    <include file="changeset/create-expenses.xml" relativeToChangelogFile="true"/>
 </databaseChangeLog>
--- a/liquibase/changelogs/changeset/create-shared-account.xml
+++ b/liquibase/changelogs/changeset/create-shared-account.xml
@@ -3,20 +3,29 @@
 <databaseChangeLog xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
                   xmlns="http://www.liquibase.org/xml/ns/dbchangelog"
                   xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.5.xsd">
-    <changeSet id="add-shared-account-table" author="kratisto">
+    <changeSet id="add-budget-table" author="kratisto">
-        <createTable tableName="shared_account">
+        <createTable tableName="budget">
            <column name="id" type="uuid" defaultValueComputed="gen_random_uuid()">
                <constraints nullable="false" unique="true"/>
            </column>
-            <column name="shared_account" type="uuid">
+            <column name="name" type="text" >
                <constraints nullable="false"/>
            </column>
            <column name="created_at" type="timestamp">
                <constraints nullable="true"/>
            </column>
-            <column name="user_id" type="uuid" >
+            <column name="closed" type="boolean" defaultValueComputed="false">
                <constraints nullable="false"/>
            </column>
            <column name="duration_start" type="text" >
                <constraints nullable="false"/>
            </column>
            <column name="duration_end" type="text" >
                <constraints nullable="false"/>
            </column>
            <column name="created_at" type="timestamp" defaultValueComputed="now()">
                <constraints nullable="true"/>
            </column>
            <column name="updated_at" type="timestamp">
                <constraints nullable="true"/>
            </column>
        </createTable>
    </changeSet>
 </databaseChangeLog>
--- a/liquibase/changelogs/changeset/create-category.xml
+++ b/liquibase/changelogs/changeset/create-category.xml
@@ -3,20 +3,17 @@
 <databaseChangeLog xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
                   xmlns="http://www.liquibase.org/xml/ns/dbchangelog"
                   xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.5.xsd">
-    <changeSet id="add-account-table" author="kratisto">
+    <changeSet id="add-category-table" author="kratisto">
-        <createTable tableName="account">
+        <createTable tableName="category">
            <column name="id" type="uuid" defaultValueComputed="gen_random_uuid()">
                <constraints nullable="false" unique="true"/>
            </column>
            <column name="name" type="text" >
                <constraints nullable="true"/>
            </column>
-            <column name="provider" type="text">
+            <column name="budget" type="double" >
                <constraints nullable="true"/>
            </column>
            <column name="user_id" type="uuid" >
                <constraints nullable="false"/>
            </column>
            <column name="created_at" type="timestamp" defaultValueComputed="now()">
                <constraints nullable="true"/>
            </column>
--- a/liquibase/changelogs/changeset/create-expenses.xml
+++ b/liquibase/changelogs/changeset/create-expenses.xml
@@ -8,15 +8,15 @@
            <column name="id" type="uuid" defaultValueComputed="gen_random_uuid()">
                <constraints nullable="false" unique="true"/>
            </column>
-            <column name="account_id" type="uuid">
+            <column name="category_id" type="uuid">
                <constraints nullable="false"/>
            </column>
            <column name="libelle" type="text" >
                <constraints nullable="true"/>
            </column>
            <column name="value" type="number">
                <constraints nullable="false"/>
            </column>
            <column name="type_expense" type="char(1)">
                <constraints nullable="false"/>
            </column>
            <column name="expense_date" type="timestamp" defaultValueComputed="now()">
                <constraints nullable="true"/>
            </column>
--- a/liquibase/changelogs/changeset/create-user.xml
+++ b/liquibase/changelogs/changeset/create-user.xml
@@ -20,6 +20,9 @@
            <column name="email" type="text">
                <constraints nullable="false" unique="true"/>
            </column>
            <column name="nickname" type="text">
                <constraints nullable="false" unique="true"/>
            </column>
        </createTable>
    </changeSet>
 </databaseChangeLog>
--- a/liquibase/changelogs/liquibase.properties
+++ b/liquibase/changelogs/liquibase.properties
@@ -1,4 +1,4 @@
-url=jdbc:postgresql://database:5432/nos_comptes
+url=jdbc:postgresql://database:5432/budget
 username=postgres
 password=password
 changeLogFile=changelog-master.xml
--- a/liquibase/changelogs/prepare-database.sql
+++ b/liquibase/changelogs/prepare-database.sql
@@ -1,2 +1,2 @@
-CREATE SCHEMA IF NOT EXISTS nos_comptes;
+CREATE SCHEMA IF NOT EXISTS budget;
 CREATE EXTENSION IF NOT EXISTS pgcrypto;
--- a/main.go
+++ b/main.go
@@ -1,8 +1,8 @@
 package main
 import (
 	"budget/cmd"
 	"math/rand"
 	"nos-comptes/cmd"
 	"time"
 )
--- a/middleware/oauth_token.go
+++ b/middleware/oauth_token.go
@@ -1,10 +1,10 @@
 package middleware
 import (
 	"budget/internal/storage/model"
 	"budget/internal/utils"
 	"fmt"
 	"net/http"
 	"nos-comptes/internal/storage/model"
 	"nos-comptes/internal/utils"
 	"strings"
 	"github.com/gin-gonic/gin"
@@ -27,10 +27,11 @@ func ValidateOAuthToken(c *gin.Context) {
 	}
 	tokenInfoCall := oauth2Service.Tokeninfo()
 	tokenInfoCall.IdToken(authorizationHeaderSplitted[1])
-	_, err = tokenInfoCall.Do()
+	token, err := tokenInfoCall.Do()
 	if err != nil {
 		utils.GetLogger().WithError(err).Error(err)
 		utils.JSONError(c.Writer, model.ErrBadRequestFormat)
 		return
 	}
 	c.Set("googleUserId", token.UserId)
 }
--- a/middleware/validator.go
+++ b/middleware/validator.go
@@ -0,0 +1,137 @@
 package middleware
 import (
 	"budget/handler"
 	"budget/internal/account"
 	"budget/internal/jointaccount"
 	"budget/internal/storage/dao/postgresql"
 	"budget/internal/storage/model"
 	"budget/internal/storage/validators"
 	"budget/internal/user"
 	"budget/internal/utils"
 	"github.com/gin-gonic/gin"
 )
 type Validator struct {
 	jointaccountService *jointaccount.Service
 	accountService      *account.Service
 	userService         *user.Service
 	*handler.Context
 }
 func NewValidator(ctx *handler.Context, db *postgresql.DatabasePostgreSQL) *Validator {
 	return &Validator{accountService: account.NewService(account.NewDatabase(db)), userService: user.NewService(user.NewDatabase(db)), jointaccountService: jointaccount.NewService(jointaccount.NewDatabase(db)), Context: ctx}
 }
 func (v Validator) HasValidUserId(gc *gin.Context) {
 	userId := gc.Param("userId")
 	err := v.Validator.VarCtx(gc, userId, "uuid4")
 	if err != nil {
 		utils.JSONError(gc.Writer, validators.NewDataValidationAPIError(err))
 		return
 	}
 }
 func (v Validator) UserExists(gc *gin.Context) {
 	userId := gc.Param("userId")
 	user, err := v.userService.GetUserById(userId)
 	if e, ok := err.(*model.APIError); ok {
 		utils.GetLoggerFromCtx(gc).WithError(err).WithField("type", e.Type).Error("error GetUser: get user error")
 		utils.JSONErrorWithMessage(gc.Writer, *e, e.Description)
 	} else if err != nil {
 		utils.GetLoggerFromCtx(gc).WithError(err).Error("error while get user")
 		utils.JSONError(gc.Writer, model.ErrInternalServer)
 		return
 	}
 	if user == nil {
 		utils.JSONErrorWithMessage(gc.Writer, model.ErrNotFound, "User not found")
 		return
 	}
 }
 func (v Validator) UserdIdMatchOAuthToken(gc *gin.Context) {
 	userId := gc.Param("userId")
 	usrParam, err := v.userService.GetUserById(userId)
 	if e, ok := err.(*model.APIError); ok {
 		utils.GetLoggerFromCtx(gc).WithError(err).WithField("type", e.Type).Error("error GetUser: get user error")
 		utils.JSONErrorWithMessage(gc.Writer, *e, e.Description)
 	} else if err != nil {
 		utils.GetLoggerFromCtx(gc).WithError(err).Error("error while get user")
 		utils.JSONError(gc.Writer, model.ErrInternalServer)
 		return
 	}
 	googleUserId, exists := gc.Get("googleUserId")
 	if exists == false {
 		utils.GetLoggerFromCtx(gc).Error("error while getting google user id")
 		utils.JSONError(gc.Writer, model.ErrInternalServer)
 		return
 	}
 	usr, err := v.userService.GetUserFromGoogleID(googleUserId.(string))
 	if e, ok := err.(*model.APIError); ok {
 		utils.GetLogger().Info(err)
 		utils.GetLoggerFromCtx(gc).WithError(err).WithField("type", e.Type).Error("error GetUserFromGoogleID: get user from google user id")
 		utils.JSONErrorWithMessage(gc.Writer, *e, e.Description)
 		return
 	} else if err != nil {
 		utils.GetLoggerFromCtx(gc).WithError(err).Error("error while get user from google user id")
 		utils.JSONError(gc.Writer, model.ErrInternalServer)
 		return
 	}
 	if usr == nil || usr.ID != usrParam.ID {
 		utils.GetLoggerFromCtx(gc).WithError(err).Error("User in path doesn't match authenticated user")
 		utils.JSONError(gc.Writer, model.ErrBadRequestFormat)
 		return
 	}
 }
 func (v Validator) HasValidAccountId(gc *gin.Context) {
 	accountId := gc.Param("accountId")
 	err := v.Validator.VarCtx(gc, accountId, "uuid4")
 	if err != nil {
 		utils.JSONError(gc.Writer, validators.NewDataValidationAPIError(err))
 		return
 	}
 }
 func (v Validator) AccountExists(gc *gin.Context) {
 	userId := gc.Param("userId")
 	accountId := gc.Param("accountId")
 	_, err := v.accountService.GetASpecificAccountForUser(userId, accountId)
 	if e, ok := err.(*model.APIError); ok {
 		utils.GetLogger().Info(err)
 		utils.GetLoggerFromCtx(gc).WithError(err).WithField("type", e.Type).Error("error GetUserFromGoogleID: get user from google user id")
 		utils.JSONErrorWithMessage(gc.Writer, *e, e.Description)
 		return
 	} else if err != nil {
 		utils.GetLoggerFromCtx(gc).WithError(err).Error("error while get user from google user id")
 		utils.JSONError(gc.Writer, model.ErrInternalServer)
 		return
 	}
 }
 func (v Validator) HasValidJointAccountId(gc *gin.Context) {
 	accountId := gc.Param("jointaccountId")
 	err := v.Validator.VarCtx(gc, accountId, "uuid4")
 	if err != nil {
 		utils.JSONError(gc.Writer, validators.NewDataValidationAPIError(err))
 		return
 	}
 }
 func (v Validator) JointAccountExists(gc *gin.Context) {
 	userId := gc.Param("userId")
 	accountId := gc.Param("jointaccountId")
 	_, err := v.jointaccountService.GetASpecificJointaccountForUser(userId, accountId)
 	if e, ok := err.(*model.APIError); ok {
 		utils.GetLogger().Info(err)
 		utils.GetLoggerFromCtx(gc).WithError(err).WithField("type", e.Type).Error("error GetUserFromGoogleID: get user from google user id")
 		utils.JSONErrorWithMessage(gc.Writer, *e, e.Description)
 		return
 	} else if err != nil {
 		utils.GetLoggerFromCtx(gc).WithError(err).Error("error while get user from google user id")
 		utils.JSONError(gc.Writer, model.ErrInternalServer)
 		return
 	}
 }
Author	SHA1	Message	Date
Jeffrey Duroyon	79d9f55fdc	wip	2022-10-20 10:36:29 +02:00
Jeffrey Duroyon	c37d824191	add b asic endpoint	2022-05-20 00:52:07 +02:00
Jeffrey Duroyon	19a642b4d4	debut ajout compte joint	2022-05-13 01:38:03 +02:00
Jeffrey Duroyon	cc6aa27d5d	feat(expense): import expense	2021-11-30 01:46:51 +01:00
Jeffrey Duroyon	53b0b8c9a2	feat(expense): create and display expenses	2021-11-26 01:51:13 +01:00
Jeffrey Duroyon	82d86fb33f	feat(expense): starting expense handle	2021-11-24 01:07:19 +01:00
Jeffrey Duroyon	917c3a4318	refactor: now validate request with middleware	2021-11-24 00:53:56 +01:00
Jeffrey Duroyon	4035478c54	feat(account): get a specific account	2021-11-23 01:47:06 +01:00
Jeffrey Duroyon	e05bd1c743	wip	2021-11-17 23:44:20 +01:00
Jeffrey Duroyon	7bf8db8050	feat(accounts): improve account creation	2021-11-12 00:38:44 +01:00
`@@ -1,4 +1,4 @@`
	`module nos-comptes`	`module budget`

	`go 1.17`	`go 1.17`
`@@ -1,2 +1,2 @@`
	`CREATE SCHEMA IF NOT EXISTS nos_comptes;`	`CREATE SCHEMA IF NOT EXISTS budget;`
	`CREATE EXTENSION IF NOT EXISTS pgcrypto;`	`CREATE EXTENSION IF NOT EXISTS pgcrypto;`