From dae105d15f50e0679b28a2fc8063d19851c31f35 Mon Sep 17 00:00:00 2001 From: masterhc Date: Wed, 24 Jul 2024 17:24:51 +0100 Subject: [PATCH] Feature: DB connector --- .gitignore | 1 + controllers/controller.go | 57 +++++++++++++++++++++++++++++++++------ go.mod | 12 +++++++++ go.sum | 26 ++++++++++++++++++ tests/test.go | 47 ++++++++++++++++++++++++++++++++ 5 files changed, 135 insertions(+), 8 deletions(-) create mode 100644 tests/test.go diff --git a/.gitignore b/.gitignore index 1046240..1cd62cd 100644 --- a/.gitignore +++ b/.gitignore @@ -21,4 +21,5 @@ # Go workspace file go.work .vscode +.env diff --git a/controllers/controller.go b/controllers/controller.go index 49230d9..18bc347 100644 --- a/controllers/controller.go +++ b/controllers/controller.go @@ -1,23 +1,34 @@ package controllers import ( - "encoding/json" + "log" "fmt" + "os" + "time" "net/http" + "encoding/json" + "github.com/gorilla/mux" + "github.com/joho/godotenv" + "gorm.io/driver/postgres" + "gorm.io/gorm" + ) // User represents a user in the system type User struct { - ID int `json:"id"` - Name string `json:"name"` + UserID uint `gorm:"primaryKey"` + Username string `gorm:"size:50;not null"` + Email string `gorm:"size:100;not null"` + Password string `gorm:"size:100;not null"` + CreatedAt time.Time `gorm:"autoCreateTime"` } // GetUsers handles the GET /users route func GetUsers(w http.ResponseWriter, r *http.Request) { users := []User{ - {ID: 1, Name: "John Doe"}, - {ID: 2, Name: "Jane Doe"}, + {UserID: 1, Username: "John Doe"}, + {UserID: 2, Username: "Jane Doe"}, } w.Header().Set("Content-Type", "application/json") @@ -29,7 +40,7 @@ func GetUser(w http.ResponseWriter, r *http.Request) { vars := mux.Vars(r) id := vars["id"] - user := User{ID: 1, Name: "John Doe"} // Placeholder user + user := User{UserID: 1, Username: "John Doe"} // Placeholder user if id == "1" { w.Header().Set("Content-Type", "application/json") @@ -41,13 +52,43 @@ func GetUser(w http.ResponseWriter, r *http.Request) { // CreateUser handles the POST /users route func CreateUser(w http.ResponseWriter, r *http.Request) { - var user User - + user := User{Username: "john_doe", Email: "john@example.com", Password: "securepassword"} + err := json.NewDecoder(r.Body).Decode(&user) if err != nil { http.Error(w, err.Error(), http.StatusBadRequest) return } + + db, err:=connector() + // Auto-migrate the schema + db.AutoMigrate(&User{}) + + // Example of inserting a user + + db.Create(&user) + + // At this point, user.UserID will be set to the ID generated by the database + log.Println("New user ID:", user.UserID) + + fmt.Fprintf(w, "Received user: %+v", user) } + + +func connector() (*gorm.DB, error) { + // Database connection string + err:= godotenv.Load(); + if(err!=nil) { + log.Fatal("Error loading .env file") + } + dsn := fmt.Sprint(os.Getenv("DATABASE_DSN")) + log.Print(dsn) + // Open the database connection + db, err := gorm.Open(postgres.Open(dsn), &gorm.Config{}) + if err != nil { + log.Fatal("failed to connect database:", err) + } + return db, err +} diff --git a/go.mod b/go.mod index 90804bd..f4e12b6 100644 --- a/go.mod +++ b/go.mod @@ -8,7 +8,19 @@ require ( github.com/codegangsta/gin v0.0.0-20230218063734-2c98d96c9244 // indirect github.com/cpuguy83/go-md2man/v2 v2.0.4 // indirect github.com/gorilla/mux v1.8.1 // indirect + github.com/jackc/pgpassfile v1.0.0 // indirect + github.com/jackc/pgservicefile v0.0.0-20240606120523-5a60cdf6a761 // indirect + github.com/jackc/pgx/v5 v5.6.0 // indirect + github.com/jackc/puddle/v2 v2.2.1 // indirect + github.com/jinzhu/inflection v1.0.0 // indirect + github.com/jinzhu/now v1.1.5 // indirect + github.com/joho/godotenv v1.5.1 // indirect github.com/mattn/go-shellwords v1.0.12 // indirect github.com/russross/blackfriday/v2 v2.1.0 // indirect github.com/urfave/cli v1.22.15 // indirect + golang.org/x/crypto v0.25.0 // indirect + golang.org/x/sync v0.7.0 // indirect + golang.org/x/text v0.16.0 // indirect + gorm.io/driver/postgres v1.5.9 // indirect + gorm.io/gorm v1.25.11 // indirect ) diff --git a/go.sum b/go.sum index fc2de7a..6383095 100644 --- a/go.sum +++ b/go.sum @@ -11,6 +11,20 @@ github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSs github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/gorilla/mux v1.8.1 h1:TuBL49tXwgrFYWhqrNgrUNEY92u81SPhu7sTdzQEiWY= github.com/gorilla/mux v1.8.1/go.mod h1:AKf9I4AEqPTmMytcMc0KkNouC66V3BtZ4qD5fmWSiMQ= +github.com/jackc/pgpassfile v1.0.0 h1:/6Hmqy13Ss2zCq62VdNG8tM1wchn8zjSGOBJ6icpsIM= +github.com/jackc/pgpassfile v1.0.0/go.mod h1:CEx0iS5ambNFdcRtxPj5JhEz+xB6uRky5eyVu/W2HEg= +github.com/jackc/pgservicefile v0.0.0-20240606120523-5a60cdf6a761 h1:iCEnooe7UlwOQYpKFhBabPMi4aNAfoODPEFNiAnClxo= +github.com/jackc/pgservicefile v0.0.0-20240606120523-5a60cdf6a761/go.mod h1:5TJZWKEWniPve33vlWYSoGYefn3gLQRzjfDlhSJ9ZKM= +github.com/jackc/pgx/v5 v5.6.0 h1:SWJzexBzPL5jb0GEsrPMLIsi/3jOo7RHlzTjcAeDrPY= +github.com/jackc/pgx/v5 v5.6.0/go.mod h1:DNZ/vlrUnhWCoFGxHAG8U2ljioxukquj7utPDgtQdTw= +github.com/jackc/puddle/v2 v2.2.1 h1:RhxXJtFG022u4ibrCSMSiu5aOq1i77R3OHKNJj77OAk= +github.com/jackc/puddle/v2 v2.2.1/go.mod h1:vriiEXHvEE654aYKXXjOvZM39qJ0q+azkZFrfEOc3H4= +github.com/jinzhu/inflection v1.0.0 h1:K317FqzuhWc8YvSVlFMCCUb36O/S9MCKRDI7QkRKD/E= +github.com/jinzhu/inflection v1.0.0/go.mod h1:h+uFLlag+Qp1Va5pdKtLDYj+kHp5pxUVkryuEj+Srlc= +github.com/jinzhu/now v1.1.5 h1:/o9tlHleP7gOFmsnYNz3RGnqzefHA47wQpKrrdTIwXQ= +github.com/jinzhu/now v1.1.5/go.mod h1:d3SSVoowX0Lcu0IBviAWJpolVfI5UJVZZ7cO71lE/z8= +github.com/joho/godotenv v1.5.1 h1:7eLL/+HRGLY0ldzfGMeQkb7vMd0as4CfYvUVzLqw0N0= +github.com/joho/godotenv v1.5.1/go.mod h1:f4LDr5Voq0i2e/R5DDNOoa2zzDfwtkZa6DnEwAbqwq4= github.com/mattn/go-shellwords v1.0.12 h1:M2zGm7EW6UQJvDeQxo4T51eKPurbeFbe8WtebGE2xrk= github.com/mattn/go-shellwords v1.0.12/go.mod h1:EZzvwXDESEeg03EKmM+RmDnNOPKG4lLtQsUlTZDWQ8Y= github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= @@ -20,13 +34,25 @@ github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+ 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/objx v0.5.2/go.mod h1:FRsXN1f5AsAjCGJKqEizvkpNtU+EGNCLh3NxZ/8L+MA= +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.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo= github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY= github.com/urfave/cli v1.22.15 h1:nuqt+pdC/KqswQKhETJjo7pvn/k4xMUxgW6liI7XpnM= github.com/urfave/cli v1.22.15/go.mod h1:wSan1hmo5zeyLGBjRJbzRTNk8gwoYa2B9n4q9dmRIc0= +golang.org/x/crypto v0.25.0 h1:ypSNr+bnYL2YhwoMt2zPxHFmbAN1KZs/njMG3hxUp30= +golang.org/x/crypto v0.25.0/go.mod h1:T+wALwcMOSE0kXgUAnPAHqTLW+XHgcELELW8VaDgm/M= +golang.org/x/sync v0.7.0 h1:YsImfSBoP9QPYL0xyKJPq0gcaJdG3rInoqxTWbfQu9M= +golang.org/x/sync v0.7.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk= +golang.org/x/text v0.16.0 h1:a94ExnEXNtEwYLGJSIUxnWoxoRz/ZcCsV63ROupILh4= +golang.org/x/text v0.16.0/go.mod h1:GhwF1Be+LQoKShO3cGOHzqOgRrGaYc9AvblQOmPVHnI= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= 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.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM= +gorm.io/driver/postgres v1.5.9 h1:DkegyItji119OlcaLjqN11kHoUgZ/j13E0jkJZgD6A8= +gorm.io/driver/postgres v1.5.9/go.mod h1:DX3GReXH+3FPWGrrgffdvCk3DQ1dwDPdmbenSkweRGI= +gorm.io/gorm v1.25.11 h1:/Wfyg1B/je1hnDx3sMkX+gAlxrlZpn6X0BXRlwXlvHg= +gorm.io/gorm v1.25.11/go.mod h1:xh7N7RHfYlNc5EmcI/El95gXusucDrQnHXe0+CgWcLQ= diff --git a/tests/test.go b/tests/test.go new file mode 100644 index 0000000..b8a4c56 --- /dev/null +++ b/tests/test.go @@ -0,0 +1,47 @@ +package main + +import ( + "fmt" + "os" + + "github.com/joho/godotenv" + + "gorm.io/driver/postgres" + "gorm.io/gorm" + "log" + "time" +) + +// User model +type User struct { + UserID uint `gorm:"primaryKey"` + Username string `gorm:"size:50;not null"` + Email string `gorm:"size:100;not null"` + Password string `gorm:"size:100;not null"` + CreatedAt time.Time `gorm:"autoCreateTime"` +} + +func main() { + // Database connection string + err:= godotenv.Load(); + if(err!=nil) { + log.Fatal("Error loading .env file") + } + dsn := fmt.Sprint(os.Getenv("DATABASE_DSN")) + log.Print(dsn) + // Open the database connection + db, err := gorm.Open(postgres.Open(dsn), &gorm.Config{}) + if err != nil { + log.Fatal("failed to connect database:", err) + } + + // Auto-migrate the schema + db.AutoMigrate(&User{}) + + // Example of inserting a user + user := User{Username: "john_doe", Email: "john@example.com", Password: "securepassword"} + db.Create(&user) + + // At this point, user.UserID will be set to the ID generated by the database + log.Println("New user ID:", user.UserID) +}