diff --git a/cmd/root.go b/cmd/root.go index d8f3ae5..679ec20 100755 --- a/cmd/root.go +++ b/cmd/root.go @@ -1,12 +1,13 @@ package cmd import ( - "budget/ginserver" - "budget/handler" - "budget/internal/utils" "fmt" "os" + "gitea.frenchtouch.duckdns.org/kratisto/budget-backend/ginserver" + "gitea.frenchtouch.duckdns.org/kratisto/budget-backend/handler" + "gitea.frenchtouch.duckdns.org/kratisto/budget-backend/internal/utils" + "github.com/sirupsen/logrus" "github.com/spf13/cobra" "github.com/spf13/viper" diff --git a/ginserver/logger.go b/ginserver/logger.go index 05eb232..9cd695a 100755 --- a/ginserver/logger.go +++ b/ginserver/logger.go @@ -1,10 +1,11 @@ package ginserver import ( - "budget/internal/utils" "math/rand" "time" + "gitea.frenchtouch.duckdns.org/kratisto/budget-backend/internal/utils" + "github.com/gin-gonic/gin" ) diff --git a/ginserver/router.go b/ginserver/router.go index d5f240c..bf0a6cf 100644 --- a/ginserver/router.go +++ b/ginserver/router.go @@ -1,16 +1,17 @@ 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" "time" + "gitea.frenchtouch.duckdns.org/kratisto/budget-backend/handler" + "gitea.frenchtouch.duckdns.org/kratisto/budget-backend/internal/account" + "gitea.frenchtouch.duckdns.org/kratisto/budget-backend/internal/expense" + "gitea.frenchtouch.duckdns.org/kratisto/budget-backend/internal/jointaccount" + "gitea.frenchtouch.duckdns.org/kratisto/budget-backend/internal/storage/dao/postgresql" + "gitea.frenchtouch.duckdns.org/kratisto/budget-backend/internal/user" + "gitea.frenchtouch.duckdns.org/kratisto/budget-backend/middleware" + "github.com/gin-gonic/gin" "github.com/gin-contrib/cors" diff --git a/go.mod b/go.mod index a27bcdc..c7cfb35 100644 --- a/go.mod +++ b/go.mod @@ -1,6 +1,6 @@ -module budget +module budget-backend -go 1.17 +go 1.24 require ( github.com/gin-contrib/cors v1.3.1 diff --git a/go.sum b/go.sum index 0bdf5ee..3d39b5d 100644 --- a/go.sum +++ b/go.sum @@ -316,7 +316,6 @@ github.com/stretchr/testify v1.7.0 h1:nwc3DEeHmmLAfoZucVR881uASk0Mfjw8xYJ99tb5Cc 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/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= diff --git a/handler/handler.go b/handler/handler.go index 13ae472..f92f7c9 100755 --- a/handler/handler.go +++ b/handler/handler.go @@ -1,12 +1,13 @@ package handler import ( - "budget/internal/storage/validators" - "budget/internal/utils" "net/http" "reflect" "strings" + "gitea.frenchtouch.duckdns.org/kratisto/budget-backend/internal/storage/validators" + "gitea.frenchtouch.duckdns.org/kratisto/budget-backend/internal/utils" + "github.com/gin-gonic/gin" "gopkg.in/go-playground/validator.v9" ) diff --git a/internal/account/database.go b/internal/account/database.go index c448613..8cc0f50 100644 --- a/internal/account/database.go +++ b/internal/account/database.go @@ -1,11 +1,12 @@ package account import ( - "budget/internal/storage/dao" - "budget/internal/storage/dao/postgresql" - "budget/internal/utils" "fmt" + "gitea.frenchtouch.duckdns.org/kratisto/budget-backend/internal/storage/dao" + "gitea.frenchtouch.duckdns.org/kratisto/budget-backend/internal/storage/dao/postgresql" + "gitea.frenchtouch.duckdns.org/kratisto/budget-backend/internal/utils" + "github.com/lib/pq" ) diff --git a/internal/account/handler.go b/internal/account/handler.go index 9b77ea1..dda4b77 100644 --- a/internal/account/handler.go +++ b/internal/account/handler.go @@ -1,14 +1,15 @@ package account import ( - "budget/handler" - "budget/internal/storage/dao/postgresql" - "budget/internal/storage/model" - "budget/internal/storage/validators" - "budget/internal/user" - "budget/internal/utils" "net/http" + "gitea.frenchtouch.duckdns.org/kratisto/budget-backend/handler" + "gitea.frenchtouch.duckdns.org/kratisto/budget-backend/internal/storage/dao/postgresql" + "gitea.frenchtouch.duckdns.org/kratisto/budget-backend/internal/storage/model" + "gitea.frenchtouch.duckdns.org/kratisto/budget-backend/internal/storage/validators" + "gitea.frenchtouch.duckdns.org/kratisto/budget-backend/internal/user" + "gitea.frenchtouch.duckdns.org/kratisto/budget-backend/internal/utils" + "github.com/gin-gonic/gin" ) diff --git a/internal/account/service.go b/internal/account/service.go index 3f814c4..a035929 100644 --- a/internal/account/service.go +++ b/internal/account/service.go @@ -1,8 +1,8 @@ package account import ( - "budget/internal/storage/dao" - "budget/internal/storage/model" + "gitea.frenchtouch.duckdns.org/kratisto/budget-backend/internal/storage/dao" + "gitea.frenchtouch.duckdns.org/kratisto/budget-backend/internal/storage/model" ) type Service struct { diff --git a/internal/expense/database.go b/internal/expense/database.go index f14b6dd..1469983 100644 --- a/internal/expense/database.go +++ b/internal/expense/database.go @@ -1,8 +1,8 @@ package expense import ( - "budget/internal/storage/dao/postgresql" - "budget/internal/utils" + "gitea.frenchtouch.duckdns.org/kratisto/budget-backend/internal/storage/dao/postgresql" + "gitea.frenchtouch.duckdns.org/kratisto/budget-backend/internal/utils" "github.com/lib/pq" ) diff --git a/internal/expense/handler.go b/internal/expense/handler.go index 55a1324..84dec83 100644 --- a/internal/expense/handler.go +++ b/internal/expense/handler.go @@ -1,16 +1,17 @@ package expense import ( - "budget/handler" - "budget/internal/account" - "budget/internal/storage/dao/postgresql" - "budget/internal/storage/model" - "budget/internal/storage/validators" - "budget/internal/utils" "encoding/csv" "net/http" "time" + "gitea.frenchtouch.duckdns.org/kratisto/budget-backend/handler" + "gitea.frenchtouch.duckdns.org/kratisto/budget-backend/internal/account" + "gitea.frenchtouch.duckdns.org/kratisto/budget-backend/internal/storage/dao/postgresql" + "gitea.frenchtouch.duckdns.org/kratisto/budget-backend/internal/storage/model" + "gitea.frenchtouch.duckdns.org/kratisto/budget-backend/internal/storage/validators" + "gitea.frenchtouch.duckdns.org/kratisto/budget-backend/internal/utils" + "github.com/gin-gonic/gin" ) diff --git a/internal/expense/service.go b/internal/expense/service.go index e1b9bc3..b5fe00d 100644 --- a/internal/expense/service.go +++ b/internal/expense/service.go @@ -1,13 +1,14 @@ package expense import ( - "budget/internal/account" - "budget/internal/storage/dao" - "budget/internal/storage/model" - "budget/internal/utils" "strconv" "strings" "time" + + "gitea.frenchtouch.duckdns.org/kratisto/budget-backend/internal/account" + "gitea.frenchtouch.duckdns.org/kratisto/budget-backend/internal/storage/dao" + "gitea.frenchtouch.duckdns.org/kratisto/budget-backend/internal/storage/model" + "gitea.frenchtouch.duckdns.org/kratisto/budget-backend/internal/utils" ) type Service struct { diff --git a/internal/jointaccount/database.go b/internal/jointaccount/database.go index 918fb0e..088029f 100644 --- a/internal/jointaccount/database.go +++ b/internal/jointaccount/database.go @@ -1,11 +1,12 @@ package jointaccount import ( - "budget/internal/storage/dao" - "budget/internal/storage/dao/postgresql" - "budget/internal/utils" "fmt" + "gitea.frenchtouch.duckdns.org/kratisto/budget-backend/internal/storage/dao" + "gitea.frenchtouch.duckdns.org/kratisto/budget-backend/internal/storage/dao/postgresql" + "gitea.frenchtouch.duckdns.org/kratisto/budget-backend/internal/utils" + "github.com/lib/pq" ) diff --git a/internal/jointaccount/handler.go b/internal/jointaccount/handler.go index 1002c84..3b4cd65 100644 --- a/internal/jointaccount/handler.go +++ b/internal/jointaccount/handler.go @@ -1,14 +1,15 @@ 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" + "gitea.frenchtouch.duckdns.org/kratisto/budget-backend/handler" + "gitea.frenchtouch.duckdns.org/kratisto/budget-backend/internal/storage/dao/postgresql" + "gitea.frenchtouch.duckdns.org/kratisto/budget-backend/internal/storage/model" + "gitea.frenchtouch.duckdns.org/kratisto/budget-backend/internal/storage/validators" + "gitea.frenchtouch.duckdns.org/kratisto/budget-backend/internal/user" + "gitea.frenchtouch.duckdns.org/kratisto/budget-backend/internal/utils" + "github.com/gin-gonic/gin" ) diff --git a/internal/jointaccount/service.go b/internal/jointaccount/service.go index e2738c3..932b8ac 100644 --- a/internal/jointaccount/service.go +++ b/internal/jointaccount/service.go @@ -1,8 +1,8 @@ package jointaccount import ( - "budget/internal/storage/dao" - "budget/internal/storage/model" + "gitea.frenchtouch.duckdns.org/kratisto/budget-backend/internal/storage/dao" + "gitea.frenchtouch.duckdns.org/kratisto/budget-backend/internal/storage/model" ) type Service struct { diff --git a/internal/jointexpense/database.go b/internal/jointexpense/database.go index 773ff8c..3352aee 100644 --- a/internal/jointexpense/database.go +++ b/internal/jointexpense/database.go @@ -1,8 +1,8 @@ package jointexpense import ( - "budget/internal/storage/dao/postgresql" - "budget/internal/utils" + "gitea.frenchtouch.duckdns.org/kratisto/budget-backend/internal/storage/dao/postgresql" + "gitea.frenchtouch.duckdns.org/kratisto/budget-backend/internal/utils" "github.com/lib/pq" ) diff --git a/internal/jointexpense/handler.go b/internal/jointexpense/handler.go index 4adfa31..c990e77 100644 --- a/internal/jointexpense/handler.go +++ b/internal/jointexpense/handler.go @@ -1,16 +1,17 @@ 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" + "gitea.frenchtouch.duckdns.org/kratisto/budget-backend/handler" + "gitea.frenchtouch.duckdns.org/kratisto/budget-backend/internal/jointaccount" + "gitea.frenchtouch.duckdns.org/kratisto/budget-backend/internal/storage/dao/postgresql" + "gitea.frenchtouch.duckdns.org/kratisto/budget-backend/internal/storage/model" + "gitea.frenchtouch.duckdns.org/kratisto/budget-backend/internal/storage/validators" + "gitea.frenchtouch.duckdns.org/kratisto/budget-backend/internal/utils" + "github.com/gin-gonic/gin" ) diff --git a/internal/jointexpense/service.go b/internal/jointexpense/service.go index 8df0f58..a948952 100644 --- a/internal/jointexpense/service.go +++ b/internal/jointexpense/service.go @@ -1,13 +1,14 @@ package jointexpense import ( - "budget/internal/jointaccount" - "budget/internal/storage/dao" - "budget/internal/storage/model" - "budget/internal/utils" "strconv" "strings" "time" + + "gitea.frenchtouch.duckdns.org/kratisto/budget-backend/internal/jointaccount" + "gitea.frenchtouch.duckdns.org/kratisto/budget-backend/internal/storage/dao" + "gitea.frenchtouch.duckdns.org/kratisto/budget-backend/internal/storage/model" + "gitea.frenchtouch.duckdns.org/kratisto/budget-backend/internal/utils" ) type Service struct { diff --git a/internal/shared-account/database.go b/internal/shared-account/database.go index cc9db77..6c682e1 100644 --- a/internal/shared-account/database.go +++ b/internal/shared-account/database.go @@ -1,6 +1,6 @@ package sharedaccount -import "budget/internal/storage/dao/postgresql" +import "gitea.frenchtouch.duckdns.org/kratisto/budget-backend/internal/storage/dao/postgresql" type Database struct { *postgresql.DatabasePostgreSQL diff --git a/internal/shared-account/handler.go b/internal/shared-account/handler.go index 340a548..28001a4 100644 --- a/internal/shared-account/handler.go +++ b/internal/shared-account/handler.go @@ -1,8 +1,8 @@ package sharedaccount import ( - "budget/handler" - "budget/internal/storage/dao/postgresql" + "gitea.frenchtouch.duckdns.org/kratisto/budget-backend/handler" + "gitea.frenchtouch.duckdns.org/kratisto/budget-backend/internal/storage/dao/postgresql" "github.com/gin-gonic/gin" ) diff --git a/internal/storage/dao/postgresql/database_postgresql.go b/internal/storage/dao/postgresql/database_postgresql.go index 6a8020c..b7688b9 100755 --- a/internal/storage/dao/postgresql/database_postgresql.go +++ b/internal/storage/dao/postgresql/database_postgresql.go @@ -1,11 +1,12 @@ package postgresql import ( - "budget/internal/storage/dao" - "budget/internal/utils" "database/sql" "fmt" + "gitea.frenchtouch.duckdns.org/kratisto/budget-backend/internal/storage/dao" + "gitea.frenchtouch.duckdns.org/kratisto/budget-backend/internal/utils" + "github.com/lib/pq" ) diff --git a/internal/storage/validators/error.go b/internal/storage/validators/error.go index e78070e..b0a4d8a 100755 --- a/internal/storage/validators/error.go +++ b/internal/storage/validators/error.go @@ -1,12 +1,13 @@ package validators import ( - "budget/internal/storage/model" - "budget/internal/utils" "fmt" "regexp" "strings" + "gitea.frenchtouch.duckdns.org/kratisto/budget-backend/internal/storage/model" + "gitea.frenchtouch.duckdns.org/kratisto/budget-backend/internal/utils" + "gopkg.in/go-playground/validator.v9" ) diff --git a/internal/user/database.go b/internal/user/database.go index a47f4a8..be28e27 100755 --- a/internal/user/database.go +++ b/internal/user/database.go @@ -1,10 +1,11 @@ package user import ( - "budget/internal/storage/dao" - "budget/internal/storage/dao/postgresql" "database/sql" + "gitea.frenchtouch.duckdns.org/kratisto/budget-backend/internal/storage/dao" + "gitea.frenchtouch.duckdns.org/kratisto/budget-backend/internal/storage/dao/postgresql" + "github.com/lib/pq" ) diff --git a/internal/user/handler.go b/internal/user/handler.go index 620c217..d5d2b34 100755 --- a/internal/user/handler.go +++ b/internal/user/handler.go @@ -1,13 +1,14 @@ package user import ( - "budget/handler" - "budget/internal/storage/dao/postgresql" - "budget/internal/storage/model" - "budget/internal/utils" "net/http" "strings" + "gitea.frenchtouch.duckdns.org/kratisto/budget-backend/handler" + "gitea.frenchtouch.duckdns.org/kratisto/budget-backend/internal/storage/dao/postgresql" + "gitea.frenchtouch.duckdns.org/kratisto/budget-backend/internal/storage/model" + "gitea.frenchtouch.duckdns.org/kratisto/budget-backend/internal/utils" + "github.com/gin-gonic/gin" "google.golang.org/api/oauth2/v2" ) diff --git a/internal/user/service.go b/internal/user/service.go index eb3c96a..b871115 100644 --- a/internal/user/service.go +++ b/internal/user/service.go @@ -1,8 +1,8 @@ package user import ( - "budget/internal/storage/dao" - "budget/internal/storage/model" + "gitea.frenchtouch.duckdns.org/kratisto/budget-backend/internal/storage/dao" + "gitea.frenchtouch.duckdns.org/kratisto/budget-backend/internal/storage/model" ) type Service struct { diff --git a/internal/utils/responses.go b/internal/utils/responses.go index 93253e7..4dfee02 100755 --- a/internal/utils/responses.go +++ b/internal/utils/responses.go @@ -1,9 +1,10 @@ package utils import ( - "budget/internal/storage/model" "encoding/json" "net/http" + + "gitea.frenchtouch.duckdns.org/kratisto/budget-backend/internal/storage/model" ) func JSON(w http.ResponseWriter, status int, data interface{}) { diff --git a/main.go b/main.go index a0f3025..d572ab5 100644 --- a/main.go +++ b/main.go @@ -1,9 +1,10 @@ package main import ( - "budget/cmd" "math/rand" "time" + + "gitea.frenchtouch.duckdns.org/kratisto/budget-backend/cmd" ) func init() { diff --git a/middleware/oauth_token.go b/middleware/oauth_token.go index f0755ca..2030c5f 100644 --- a/middleware/oauth_token.go +++ b/middleware/oauth_token.go @@ -1,12 +1,13 @@ package middleware import ( - "budget/internal/storage/model" - "budget/internal/utils" "fmt" "net/http" "strings" + "gitea.frenchtouch.duckdns.org/kratisto/budget-backend/internal/storage/model" + "gitea.frenchtouch.duckdns.org/kratisto/budget-backend/internal/utils" + "github.com/gin-gonic/gin" "google.golang.org/api/oauth2/v1" ) diff --git a/middleware/validator.go b/middleware/validator.go index e2a28e3..db77852 100644 --- a/middleware/validator.go +++ b/middleware/validator.go @@ -1,14 +1,14 @@ 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" + "gitea.frenchtouch.duckdns.org/kratisto/budget-backend/handler" + "gitea.frenchtouch.duckdns.org/kratisto/budget-backend/internal/account" + "gitea.frenchtouch.duckdns.org/kratisto/budget-backend/internal/jointaccount" + "gitea.frenchtouch.duckdns.org/kratisto/budget-backend/internal/storage/dao/postgresql" + "gitea.frenchtouch.duckdns.org/kratisto/budget-backend/internal/storage/model" + "gitea.frenchtouch.duckdns.org/kratisto/budget-backend/internal/storage/validators" + "gitea.frenchtouch.duckdns.org/kratisto/budget-backend/internal/user" + "gitea.frenchtouch.duckdns.org/kratisto/budget-backend/internal/utils" "github.com/gin-gonic/gin" )