diff --git a/database/database.go b/database/database.go index 5284c6f..e53ace6 100644 --- a/database/database.go +++ b/database/database.go @@ -1,81 +1,85 @@ -package database - -type DB struct { - Host string - User string - Password string - Name string - Port string -} - -func SetEnv(env map[string]string) DB { - var db DB - - db.Host = env["DB_HOST"] - db.User = env["DB_USER"] - db.Password = env["DB_PASSWORD"] - db.Name = env["DB_NAME"] - db.Port = env["DB_PORT"] - - return db -} - -func connect() { - -} - -func createTables() { - -} - -func updateTables() { - -} - -func NewAccount() { - -} - -func UpdateAccount() { - -} - -func DeleteAccount() { - -} - -func GetAccount() { - -} - -func NewTransaction() { - -} - -func UpdateTransaction() { - -} - -func DeleteTransaction() { - -} - -func GetTransactions() { - -} - -func NewUser() { - -} - -func UpdateUser() { - -} - -func DeleteUser() { - -} - -func GetUser() { - -} +package database + +type DB struct { + Host string + User string + Password string + Name string + Port string +} + +var database DB + +func SetEnv(env map[string]string) DB { + var db DB + + db.Host = env["DB_HOST"] + db.User = env["DB_USER"] + db.Password = env["DB_PASSWORD"] + db.Name = env["DB_NAME"] + db.Port = env["DB_PORT"] + + database = db + + return db +} + +func connect() { + +} + +func createTables() { + +} + +func updateTables() { + +} + +func NewAccount() { + +} + +func UpdateAccount() { + +} + +func DeleteAccount() { + +} + +func GetAccount() { + +} + +func NewTransaction() { + +} + +func UpdateTransaction() { + +} + +func DeleteTransaction() { + +} + +func GetTransactions() { + +} + +func NewUser() { + +} + +func UpdateUser() { + +} + +func DeleteUser() { + +} + +func GetUser() { + +} diff --git a/database/models.go b/database/models.go index 4a39c88..c4e9294 100644 --- a/database/models.go +++ b/database/models.go @@ -1,25 +1,25 @@ -package database - -import "time" - -type Account struct { - ID uint - Name string - Kind string -} - -type Transaction struct { - ID uint - Amount float32 - Debit bool - OffsetAccount uint - Account uint - Time time.Time - Description string -} - -type User struct { - ID uint - Name string - Password string -} +package database + +import "time" + +type Account struct { + ID uint + Name string + Kind string +} + +type Transaction struct { + ID uint + Amount float32 + Debit bool + OffsetAccount uint + Account uint + Time time.Time + Description string +} + +type User struct { + ID uint + Name string + Password string +} diff --git a/go.mod b/go.mod index 525b943..a225dbe 100644 --- a/go.mod +++ b/go.mod @@ -3,3 +3,33 @@ module github.com/LeRoid-hub/Bookholder-API go 1.22.1 require github.com/joho/godotenv v1.5.1 + +require ( + github.com/bytedance/sonic v1.12.6 // indirect + github.com/bytedance/sonic/loader v0.2.1 // indirect + github.com/cloudwego/base64x v0.1.4 // indirect + github.com/cloudwego/iasm v0.2.0 // indirect + github.com/gabriel-vasile/mimetype v1.4.7 // indirect + github.com/gin-contrib/sse v0.1.0 // indirect + github.com/gin-gonic/gin v1.10.0 // indirect + github.com/go-playground/locales v0.14.1 // indirect + github.com/go-playground/universal-translator v0.18.1 // indirect + github.com/go-playground/validator/v10 v10.23.0 // indirect + github.com/goccy/go-json v0.10.4 // indirect + github.com/json-iterator/go v1.1.12 // indirect + github.com/klauspost/cpuid/v2 v2.2.9 // indirect + github.com/leodido/go-urn v1.4.0 // indirect + github.com/mattn/go-isatty v0.0.20 // indirect + github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect + github.com/modern-go/reflect2 v1.0.2 // indirect + github.com/pelletier/go-toml/v2 v2.2.3 // indirect + github.com/twitchyliquid64/golang-asm v0.15.1 // indirect + github.com/ugorji/go/codec v1.2.12 // indirect + golang.org/x/arch v0.12.0 // indirect + golang.org/x/crypto v0.31.0 // indirect + golang.org/x/net v0.33.0 // indirect + golang.org/x/sys v0.28.0 // indirect + golang.org/x/text v0.21.0 // indirect + google.golang.org/protobuf v1.36.0 // indirect + gopkg.in/yaml.v3 v3.0.1 // indirect +) diff --git a/go.sum b/go.sum index d61b19e..1c806a6 100644 --- a/go.sum +++ b/go.sum @@ -1,2 +1,78 @@ +github.com/bytedance/sonic v1.12.6 h1:/isNmCUF2x3Sh8RAp/4mh4ZGkcFAX/hLrzrK3AvpRzk= +github.com/bytedance/sonic v1.12.6/go.mod h1:B8Gt/XvtZ3Fqj+iSKMypzymZxw/FVwgIGKzMzT9r/rk= +github.com/bytedance/sonic/loader v0.1.1/go.mod h1:ncP89zfokxS5LZrJxl5z0UJcsk4M4yY2JpfqGeCtNLU= +github.com/bytedance/sonic/loader v0.2.1 h1:1GgorWTqf12TA8mma4DDSbaQigE2wOgQo7iCjjJv3+E= +github.com/bytedance/sonic/loader v0.2.1/go.mod h1:ncP89zfokxS5LZrJxl5z0UJcsk4M4yY2JpfqGeCtNLU= +github.com/cloudwego/base64x v0.1.4 h1:jwCgWpFanWmN8xoIUHa2rtzmkd5J2plF/dnLS6Xd/0Y= +github.com/cloudwego/base64x v0.1.4/go.mod h1:0zlkT4Wn5C6NdauXdJRhSKRlJvmclQ1hhJgA0rcu/8w= +github.com/cloudwego/iasm v0.2.0 h1:1KNIy1I1H9hNNFEEH3DVnI4UujN+1zjpuk6gwHLTssg= +github.com/cloudwego/iasm v0.2.0/go.mod h1:8rXZaNYT2n95jn+zTI1sDr+IgcD2GVs0nlbbQPiEFhY= +github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= +github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= +github.com/gabriel-vasile/mimetype v1.4.7 h1:SKFKl7kD0RiPdbht0s7hFtjl489WcQ1VyPW8ZzUMYCA= +github.com/gabriel-vasile/mimetype v1.4.7/go.mod h1:GDlAgAyIRT27BhFl53XNAFtfjzOkLaF35JdEG0P7LtU= +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.10.0 h1:nTuyha1TYqgedzytsKYqna+DfLos46nTv2ygFy86HFU= +github.com/gin-gonic/gin v1.10.0/go.mod h1:4PMNQiOhvDRa013RKVbsiNwoyezlm2rm0uX/T7kzp5Y= +github.com/go-playground/locales v0.14.1 h1:EWaQ/wswjilfKLTECiXz7Rh+3BjFhfDFKv/oXslEjJA= +github.com/go-playground/locales v0.14.1/go.mod h1:hxrqLVvrK65+Rwrd5Fc6F2O76J/NuW9t0sjnWqG1slY= +github.com/go-playground/universal-translator v0.18.1 h1:Bcnm0ZwsGyWbCzImXv+pAJnYK9S473LQFuzCbDbfSFY= +github.com/go-playground/universal-translator v0.18.1/go.mod h1:xekY+UJKNuX9WP91TpwSH2VMlDf28Uj24BCp08ZFTUY= +github.com/go-playground/validator/v10 v10.23.0 h1:/PwmTwZhS0dPkav3cdK9kV1FsAmrL8sThn8IHr/sO+o= +github.com/go-playground/validator/v10 v10.23.0/go.mod h1:dbuPbCMFw/DrkbEynArYaCwl3amGuJotoKCe95atGMM= +github.com/goccy/go-json v0.10.4 h1:JSwxQzIqKfmFX1swYPpUThQZp/Ka4wzJdK0LWVytLPM= +github.com/goccy/go-json v0.10.4/go.mod h1:oq7eo15ShAhp70Anwd5lgX2pLfOS3QCiwU/PULtXL6M= +github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg= github.com/joho/godotenv v1.5.1 h1:7eLL/+HRGLY0ldzfGMeQkb7vMd0as4CfYvUVzLqw0N0= github.com/joho/godotenv v1.5.1/go.mod h1:f4LDr5Voq0i2e/R5DDNOoa2zzDfwtkZa6DnEwAbqwq4= +github.com/json-iterator/go v1.1.12 h1:PV8peI4a0ysnczrg+LtxykD8LfKY9ML6u2jnxaEnrnM= +github.com/json-iterator/go v1.1.12/go.mod h1:e30LSqwooZae/UwlEbR2852Gd8hjQvJoHmT4TnhNGBo= +github.com/klauspost/cpuid/v2 v2.0.9/go.mod h1:FInQzS24/EEf25PyTYn52gqo7WaD8xa0213Md/qVLRg= +github.com/klauspost/cpuid/v2 v2.2.9 h1:66ze0taIn2H33fBvCkXuv9BmCwDfafmiIVpKV9kKGuY= +github.com/klauspost/cpuid/v2 v2.2.9/go.mod h1:rqkxqrZ1EhYM9G+hXH7YdowN5R5RGN6NK4QwQ3WMXF8= +github.com/knz/go-libedit v1.10.1/go.mod h1:MZTVkCWyz0oBc7JOWP3wNAzd002ZbM/5hgShxwh4x8M= +github.com/leodido/go-urn v1.4.0 h1:WT9HwE9SGECu3lg4d/dIA+jxlljEa1/ffXKmRjqdmIQ= +github.com/leodido/go-urn v1.4.0/go.mod h1:bvxc+MVxLKB4z00jd1z+Dvzr47oO32F/QSNjSBOlFxI= +github.com/mattn/go-isatty v0.0.20 h1:xfD0iDuEKnDkl03q4limB+vH+GxLEtL/jb4xVJSWWEY= +github.com/mattn/go-isatty v0.0.20/go.mod h1:W+V8PltTTMOvKvAeJH7IuucS94S2C6jfK/D7dTCTo3Y= +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 v1.0.2 h1:xBagoLtFs94CBntxluKeaWgTMpvLxC4ur3nMaC9Gz0M= +github.com/modern-go/reflect2 v1.0.2/go.mod h1:yWuevngMOJpCy52FWWMvUC8ws7m/LJsjYzDa0/r8luk= +github.com/pelletier/go-toml/v2 v2.2.3 h1:YmeHyLY8mFWbdkNWwpr+qIL2bEqT0o95WSdkNHvL12M= +github.com/pelletier/go-toml/v2 v2.2.3/go.mod h1:MfCQTFTvCcUyyvvwm1+G6H/jORL20Xlb6rzQu9GuUkc= +github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= +github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= +github.com/stretchr/objx v0.4.0/go.mod h1:YvHI0jy2hoMjB+UWwv71VJQ9isScKT/TqJzVSSt89Yw= +github.com/stretchr/objx v0.5.0/go.mod h1:Yh+to48EsGEfYuaHDzXPcE3xhTkx73EhmCGUpEOglKo= +github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI= +github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= +github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg= +github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU= +github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4= +github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY= +github.com/twitchyliquid64/golang-asm v0.15.1 h1:SU5vSMR7hnwNxj24w34ZyCi/FmDZTkS4MhqMhdFk5YI= +github.com/twitchyliquid64/golang-asm v0.15.1/go.mod h1:a1lVb/DtPvCB8fslRZhAngC2+aY1QWCk3Cedj/Gdt08= +github.com/ugorji/go/codec v1.2.12 h1:9LC83zGrHhuUA9l16C9AHXAqEV/2wBQ4nkvumAE65EE= +github.com/ugorji/go/codec v1.2.12/go.mod h1:UNopzCgEMSXjBc6AOMqYvWC1ktqTAfzJZUZgYf6w6lg= +golang.org/x/arch v0.12.0 h1:UsYJhbzPYGsT0HbEdmYcqtCv8UNGvnaL561NnIUvaKg= +golang.org/x/arch v0.12.0/go.mod h1:FEVrYAQjsQXMVJ1nsMoVVXPZg6p2JE2mx8psSWTDQys= +golang.org/x/crypto v0.31.0 h1:ihbySMvVjLAeSH1IbfcRTkD/iNscyz8rGzjF/E5hV6U= +golang.org/x/crypto v0.31.0/go.mod h1:kDsLvtWBEx7MV9tJOj9bnXsPbxwJQ6csT/x4KIN4Ssk= +golang.org/x/net v0.33.0 h1:74SYHlV8BIgHIFC/LrYkOGIwL19eTYXQ5wc6TBuO36I= +golang.org/x/net v0.33.0/go.mod h1:HXLR5J+9DxmrqMwG9qjGCxZ+zKXxBru04zlTvWlWuN4= +golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sys v0.28.0 h1:Fksou7UEQUWlKvIdsqzJmUmCX3cZuD2+P3XyyzwMhlA= +golang.org/x/sys v0.28.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= +golang.org/x/text v0.21.0 h1:zyQAAkrwaneQ066sspRyJaG9VNi/YJ1NfzcGB3hZ/qo= +golang.org/x/text v0.21.0/go.mod h1:4IBbMaMmOPCJ8SecivzSH54+73PCFmPWxNTLm+vZkEQ= +google.golang.org/protobuf v1.36.0 h1:mjIs9gYtt56AzC4ZaffQuh88TZurBGhIJMBZGSxNerQ= +google.golang.org/protobuf v1.36.0/go.mod h1:9fA7Ob0pmnwhb644+1+CVWFRbNajQ6iRojtC/QF5bRE= +gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= +gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= +gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA= +gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= +nullprogram.com/x/optparse v1.0.0/go.mod h1:KdyPE+Igbe0jQUrVfMqDMeJQIJZEuyV7pjYmp6pbG50= +rsc.io/pdf v0.1.1/go.mod h1:n8OzWcQ6Sp37PL01nO98y4iUCRdTGarVfzxY20ICaU4= diff --git a/main.go b/main.go index 06ab7d0..7a31ad2 100644 --- a/main.go +++ b/main.go @@ -1 +1,15 @@ package main + +import ( + "github.com/LeRoid-hub/Bookholder-API/config" + "github.com/LeRoid-hub/Bookholder-API/database" + "github.com/LeRoid-hub/Bookholder-API/server" +) + +func main() { + env := config.Load() + + db := database.SetEnv(env) + + server.Run(env, db) +} diff --git a/server/account.go b/server/account.go new file mode 100644 index 0000000..c71d8ce --- /dev/null +++ b/server/account.go @@ -0,0 +1,31 @@ +package server + +import ( + "net/http" + + "github.com/gin-gonic/gin" +) + +func getAccount(c *gin.Context) { + c.JSON(http.StatusOK, gin.H{ + "message": "getAccount", + }) +} + +func newAccount(c *gin.Context) { + c.JSON(http.StatusOK, gin.H{ + "message": "newAccount", + }) +} + +func updateAccount(c *gin.Context) { + c.JSON(http.StatusOK, gin.H{ + "message": "updateAccount", + }) +} + +func deleteAccount(c *gin.Context) { + c.JSON(http.StatusOK, gin.H{ + "message": "deleteAccount", + }) +} diff --git a/server/server.go b/server/server.go index abb4e43..03f2075 100644 --- a/server/server.go +++ b/server/server.go @@ -1 +1,66 @@ package server + +import ( + "net/http" + + "github.com/LeRoid-hub/Bookholder-API/database" + "github.com/gin-gonic/gin" +) + +/* + GET /Account/:id + GET /Transaction/:TransactionID + GET /Transactions/:AccountID/:year + Get /Transactions/:AccountID/:year/:month + GET /User/:UserID + POST /NewAccount + POST /NewTransaction + POST /NewUser + PUT /UpdateAccount/:AccountID + PUT /UpdateTransaction/:TransactionID + PUT /UpdateUser/:UserID + DELETE /DeleteAccount/:AccountID + DELETE /DeleteTransaction/:TransactionID + DELETE /DeleteUser/:UserID + + +*/ + +func Run(env map[string]string, db database.DB) { + r := gin.Default() + + v1 := r.Group("/v1") + { + //Account + v1.GET("/Account/:AccountID", getAccount) + v1.POST("/NewAccount", newAccount) + v1.PUT("/UpdateAccount/:AccountID", updateAccount) + v1.DELETE("/DeleteAccount/:AccountID", deleteAccount) + + //Transaction + v1.GET("/Transaction/:TransactionID", getTransaction) + v1.GET("/Transactions/:AccountID/:year", getTransactions) + v1.GET("/Transactions/:AccountID/:year/:month", getTransactions) + v1.POST("/NewTransaction", newTransaction) + v1.PUT("/UpdateTransaction/:TransactionID", updateTransaction) + v1.DELETE("/DeleteTransaction/:TransactionID", deleteTransaction) + + //User + v1.GET("/User/:UserID", getUser) + v1.POST("/NewUser", newUser) + v1.PUT("/UpdateUser/:UserID", updateUser) + v1.DELETE("/DeleteUser/:UserID", deleteUser) + } + + r.GET("/ping", func(c *gin.Context) { + c.JSON(http.StatusOK, gin.H{ + "message": "pong", + }) + }) + + if port, ok := env["PORT"]; ok { + r.Run(":" + port) + } else { + r.Run(":8080") + } +} diff --git a/server/transaction.go b/server/transaction.go new file mode 100644 index 0000000..b8eaa3b --- /dev/null +++ b/server/transaction.go @@ -0,0 +1,41 @@ +package server + +import ( + "net/http" + + "github.com/gin-gonic/gin" +) + +func getTransaction(c *gin.Context) { + c.JSON(http.StatusOK, gin.H{ + "message": "getTransaction", + }) +} + +func getTransactions(c *gin.Context) { + year := c.Param("year") + month := c.Param("month") + + message := "getTransactions " + year + " " + month + c.JSON(http.StatusOK, gin.H{ + "message": message, + }) +} + +func newTransaction(c *gin.Context) { + c.JSON(http.StatusOK, gin.H{ + "message": "newTransaction", + }) +} + +func updateTransaction(c *gin.Context) { + c.JSON(http.StatusOK, gin.H{ + "message": "updateTransaction", + }) +} + +func deleteTransaction(c *gin.Context) { + c.JSON(http.StatusOK, gin.H{ + "message": "deleteTransaction", + }) +} diff --git a/server/user.go b/server/user.go new file mode 100644 index 0000000..2aed3b8 --- /dev/null +++ b/server/user.go @@ -0,0 +1,31 @@ +package server + +import ( + "net/http" + + "github.com/gin-gonic/gin" +) + +func getUser(c *gin.Context) { + c.JSON(http.StatusOK, gin.H{ + "message": "getUser", + }) +} + +func newUser(c *gin.Context) { + c.JSON(http.StatusOK, gin.H{ + "message": "newUser", + }) +} + +func updateUser(c *gin.Context) { + c.JSON(http.StatusOK, gin.H{ + "message": "updateUser", + }) +} + +func deleteUser(c *gin.Context) { + c.JSON(http.StatusOK, gin.H{ + "message": "deleteUser", + }) +}