From a88cb6fd163284d3fede00e4f5747dbc935f5e1c Mon Sep 17 00:00:00 2001 From: clupus <154858@sch.bme.hu> Date: Thu, 21 Oct 2021 18:59:49 +0200 Subject: [PATCH] Is over for today --- .idea/dataSources.xml | 4 ++-- {db => dbHelper}/dbController.go | 8 ++++---- debug_dg_docker.txt | 1 + main.go | 4 ++-- routes/delete.go | 1 + routes/get.go | 1 + routes/put.go | 1 + 7 files changed, 12 insertions(+), 8 deletions(-) rename {db => dbHelper}/dbController.go (68%) create mode 100644 debug_dg_docker.txt create mode 100644 routes/delete.go create mode 100644 routes/get.go create mode 100644 routes/put.go diff --git a/.idea/dataSources.xml b/.idea/dataSources.xml index 0050126..51b58eb 100644 --- a/.idea/dataSources.xml +++ b/.idea/dataSources.xml @@ -1,11 +1,11 @@ <?xml version="1.0" encoding="UTF-8"?> <project version="4"> <component name="DataSourceManagerImpl" format="xml" multifile-model="true"> - <data-source source="LOCAL" name="PostgreSQL - backend_db@localhost" uuid="719cc097-78f3-4981-b64f-a7946da0d6b8"> + <data-source source="LOCAL" name="database" uuid="719cc097-78f3-4981-b64f-a7946da0d6b8"> <driver-ref>postgresql</driver-ref> <synchronize>true</synchronize> <jdbc-driver>org.postgresql.Driver</jdbc-driver> - <jdbc-url>jdbc:postgresql://localhost:5432/backend_db</jdbc-url> + <jdbc-url>jdbc:postgresql://localhost:5432/</jdbc-url> <working-dir>$ProjectFileDir$</working-dir> </data-source> </component> diff --git a/db/dbController.go b/dbHelper/dbController.go similarity index 68% rename from db/dbController.go rename to dbHelper/dbController.go index adde28d..c325e0d 100644 --- a/db/dbController.go +++ b/dbHelper/dbController.go @@ -1,4 +1,4 @@ -package db +package dbHelper import ( "gorm.io/driver/postgres" @@ -6,17 +6,17 @@ import ( "mobwebhf/models" ) + + func Dbinit() *gorm.DB { - dsn := "host=localhost user=postgres password=almafa dbname=backend_db port=5432 sslmode=disable TimeZone=Europe/Budapest" + dsn := "host=localhost user=postgres password=almafa port=5432 sslmode=disable TimeZone=Europe/Budapest" db, err := gorm.Open(postgres.Open(dsn), &gorm.Config{}) if err != nil { panic("failed to connect database") } - asd := db.AutoMigrate(&models.Question{}) if asd != nil { } - return db } diff --git a/debug_dg_docker.txt b/debug_dg_docker.txt new file mode 100644 index 0000000..0e0190c --- /dev/null +++ b/debug_dg_docker.txt @@ -0,0 +1 @@ + docker run -p 5432:5432 --name backend_db -e POSTGRES_PASSWORD=almafa -d postgres \ No newline at end of file diff --git a/main.go b/main.go index 45b7bdb..f76dff4 100644 --- a/main.go +++ b/main.go @@ -3,7 +3,7 @@ package main import ( "fmt" "github.com/gin-gonic/gin" - "mobwebhf/db" + "mobwebhf/dbHelper" ) func something(c *gin.Context){ @@ -14,7 +14,7 @@ func something(c *gin.Context){ func main() { fmt.Println("alma") - db := db.Dbinit() + db := dbHelper.Dbinit() if db != nil { print(db) } diff --git a/routes/delete.go b/routes/delete.go new file mode 100644 index 0000000..0db51ae --- /dev/null +++ b/routes/delete.go @@ -0,0 +1 @@ +package routes diff --git a/routes/get.go b/routes/get.go new file mode 100644 index 0000000..0db51ae --- /dev/null +++ b/routes/get.go @@ -0,0 +1 @@ +package routes diff --git a/routes/put.go b/routes/put.go new file mode 100644 index 0000000..0db51ae --- /dev/null +++ b/routes/put.go @@ -0,0 +1 @@ +package routes -- GitLab