diff --git a/service/planner/db/client.go b/service/planner/db/client.go
new file mode 100644
index 0000000000000000000000000000000000000000..3a49c63e3548a2ce98b4397b34357eb92223bd95
--- /dev/null
+++ b/service/planner/db/client.go
@@ -0,0 +1 @@
+package db
diff --git a/service/planner/db/db.go b/service/planner/db/db.go
deleted file mode 100644
index 46a20fdce4c2050c8abdbce6c9be41a814f8856a..0000000000000000000000000000000000000000
--- a/service/planner/db/db.go
+++ /dev/null
@@ -1,27 +0,0 @@
-package db
-
-import (
- "fmt"
- "os"
-
- "gitlab.reutlingen-university.de/yesildas/mealplanner2go/service/planner/model"
- "gorm.io/driver/mysql"
- "gorm.io/gorm"
-)
-
-var DB *gorm.DB
-
-func Init() {
- dsn := fmt.Sprintf("root:root@tcp(%s)/planner?charset=utf8&parseTime=True&loc=Local", os.Getenv("DB_CONNECT"))
- var err error
- DB, err = gorm.Open(mysql.Open(dsn), &gorm.Config{})
- if err != nil {
- panic("failed to connect to database")
- }
- if err := DB.Debug().AutoMigrate(&model.Group{}); err != nil {
- panic(err)
- }
- if err := DB.Debug().AutoMigrate(&model.User{}); err != nil {
- panic(err)
- }
-}
diff --git a/service/planner/go.mod b/service/planner/go.mod
index b654ef7383a7044d7bcb46060e1e8435d2eed2fc..5f0565df7aeff6febf83c69d65875759cd3f8b45 100644
--- a/service/planner/go.mod
+++ b/service/planner/go.mod
@@ -2,14 +2,4 @@ module gitlab.reutlingen-university.de/yesildas/mealplanner2go/service/planner
go 1.20
-require (
- github.com/gorilla/mux v1.8.0
- gorm.io/driver/mysql v1.5.1
- gorm.io/gorm v1.25.2
-)
-
-require (
- github.com/go-sql-driver/mysql v1.7.0 // indirect
- github.com/jinzhu/inflection v1.0.0 // indirect
- github.com/jinzhu/now v1.1.5 // indirect
-)
+require github.com/gorilla/mux v1.8.0
diff --git a/service/planner/go.sum b/service/planner/go.sum
index c0a226463e701f7ac02b2920155a499c1b45f39a..535028803d222b0e4e9174f56529c0ed9fece4e0 100644
--- a/service/planner/go.sum
+++ b/service/planner/go.sum
@@ -1,13 +1,2 @@
-github.com/go-sql-driver/mysql v1.7.0 h1:ueSltNNllEqE3qcWBTD0iQd3IpL/6U+mJxLkazJ7YPc=
-github.com/go-sql-driver/mysql v1.7.0/go.mod h1:OXbVy3sEdcQ2Doequ6Z5BW6fXNQTmx+9S1MCJN5yJMI=
github.com/gorilla/mux v1.8.0 h1:i40aqfkR1h2SlN9hojwV5ZA91wcXFOvkdNIeFDP5koI=
github.com/gorilla/mux v1.8.0/go.mod h1:DVbg23sWSpFRCP0SfiEN6jmj59UnW/n46BH5rLB71So=
-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=
-gorm.io/driver/mysql v1.5.1 h1:WUEH5VF9obL/lTtzjmML/5e6VfFR/788coz2uaVCAZw=
-gorm.io/driver/mysql v1.5.1/go.mod h1:Jo3Xu7mMhCyj8dlrb3WoCaRd1FhsVh+yMXb1jUInf5o=
-gorm.io/gorm v1.25.1/go.mod h1:L4uxeKpfBml98NYqVqwAdmV1a2nBtAec/cf3fpucW/k=
-gorm.io/gorm v1.25.2 h1:gs1o6Vsa+oVKG/a9ElL3XgyGfghFfkKA2SInQaCyMho=
-gorm.io/gorm v1.25.2/go.mod h1:L4uxeKpfBml98NYqVqwAdmV1a2nBtAec/cf3fpucW/k=
diff --git a/service/planner/main.go b/service/planner/main.go
index adac101bef86889cf5c5606bc92f9807c14073eb..476fe4f4e4bd3e96ad004d6898bfe26a6e2c1bac 100644
--- a/service/planner/main.go
+++ b/service/planner/main.go
@@ -6,14 +6,8 @@ import (
"net/http"
"github.com/gorilla/mux"
- "gitlab.reutlingen-university.de/yesildas/mealplanner2go/service/planner/db"
)
-func init() {
- // init database
- defer db.Init()
-}
-
func main() {
port := 8000
router := mux.NewRouter()
diff --git a/service/planner/model/group.go b/service/planner/model/group.go
index f27562d203c63b857b131aed0594fc15c2dd396f..593f78ac438a1b40165c9c229e26d69ab1dd3bb9 100644
--- a/service/planner/model/group.go
+++ b/service/planner/model/group.go
@@ -1,10 +1,7 @@
package model
-import "gorm.io/gorm"
-
type Group struct {
- gorm.Model
- ID uint `json:"id" gorm:"primaryKey"`
+ ID uint `json:"id"`
UserIDs []uint `json:"userIds"`
- Meals []MealGroup `json:"meals" gorm:"foreignKey: GroupID; constraint:OnUpdate:CASCADE, OnDelete:CASCADE"`
+ Meals []MealGroup `json:"meals"`
}
diff --git a/service/planner/model/meal.go b/service/planner/model/meal.go
index 2dc3214a365dda243dd7f05defd271c31a7d9525..003f5004fc96e4cbbc130d4fc79679d151d4ddb8 100644
--- a/service/planner/model/meal.go
+++ b/service/planner/model/meal.go
@@ -1,8 +1,8 @@
package model
type Meal struct {
- MealID int `json:"mealId" gorm:"notNull"`
- Date string `json:"date" gorm:"notNull"`
+ MealID int `json:"mealId"`
+ Date string `json:"date"`
}
type MealUser struct {
diff --git a/service/planner/model/shopping.go b/service/planner/model/shopping.go
index 9477fd885211100764524d3a1f2bedf47c428afe..a87ec8341760e0214f7a4600ed043bbf6933bf6a 100644
--- a/service/planner/model/shopping.go
+++ b/service/planner/model/shopping.go
@@ -2,5 +2,5 @@ package model
type ShoppingDate struct {
UserID uint `json:"userId"`
- Date string `json:"date" gorm:"notNull"`
+ Date string `json:"date"`
}
diff --git a/service/planner/model/user.go b/service/planner/model/user.go
index 5648f4ef31a56ac7161e6bc622502925af4df1a2..8b2fc831db90ae653bede4e76b11fe2e49fb8eb6 100644
--- a/service/planner/model/user.go
+++ b/service/planner/model/user.go
@@ -1,13 +1,10 @@
package model
-import "gorm.io/gorm"
-
type User struct {
- gorm.Model
- ID uint `json:"id" gorm:"primaryKey"`
- Mail string `json:"mail" gorm:"notNull"`
- FirstName string `json:"firstName" gorm:"notNull"`
- LastName string `json:"lastName" gorm:"notNull"`
- Meals []MealUser `json:"meals" gorm:"foreignKey: UserID; constraint:OnUpdate:CASCADE, OnDelete:CASCADE"`
- ShoppingDates []ShoppingDate `json:"shoppingDates" gorm:"foreignKey: UserID; constraint:OnUpdate:CASCADE, OnDelete:CASCADE"`
+ ID uint `json:"id"`
+ Mail string `json:"mail"`
+ FirstName string `json:"firstName"`
+ LastName string `json:"lastName"`
+ Meals []MealUser `json:"meals"`
+ ShoppingDates []ShoppingDate `json:"shoppingDates"`
}