diff --git a/go.work.sum b/go.work.sum
new file mode 100644
index 0000000000000000000000000000000000000000..92ca04a7bf6c91850e4e86b2789838e771b99f42
--- /dev/null
+++ b/go.work.sum
@@ -0,0 +1,3 @@
+golang.org/x/mod v0.17.0/go.mod h1:hTbmBsO62+eylJbnUtE2MGJUyE7QWk4xUqPFrRgJ+7c=
+golang.org/x/sync v0.13.0/go.mod h1:1dzgHSNfp02xaA81J2MS99Qcpr2w7fw1gpm99rleRqA=
+golang.org/x/tools v0.21.1-0.20240508182429-e35e4ccd0d2d/go.mod h1:aiJjzUbINMkxbQROHiO6hDPo2LHcIPhhQsa9DLh0yGk=
diff --git a/src/myaktion/db/db.go b/src/myaktion/db/db.go
new file mode 100644
index 0000000000000000000000000000000000000000..3c5df036f650696da3297b322a7b694e968034d1
--- /dev/null
+++ b/src/myaktion/db/db.go
@@ -0,0 +1,32 @@
+package db
+
+import (
+ "fmt"
+ "os"
+
+ "gitlab.reutlingen-university.de/petrinov/myaktion-go/model"
+ "gorm.io/driver/mysql"
+ "gorm.io/gorm"
+
+ log "github.com/sirupsen/logrus"
+)
+
+func init() {
+ dsn := fmt.Sprintf("root:root@tcp(%s)/myaktion?charset=utf8&parseTime=True&loc=Local", os.Getenv("DB_CONNECT"))
+ log.Info("Using DSN for DB:", dsn)
+ var err error
+ DB, err := gorm.Open(mysql.Open(dsn), &gorm.Config{})
+
+ //error handling
+ if err != nil {
+ panic("failed to connect to database")
+ }
+ log.Info("Starting automatic migrations")
+ if err := DB.Debug().AutoMigrate(&model.Campaign{}); err != nil {
+ panic(err)
+ }
+ if err := DB.Debug().AutoMigrate(&model.Donation{}); err != nil {
+ panic(err)
+ }
+ log.Info("Automatic migrations finished")
+}
diff --git a/src/myaktion/go.mod b/src/myaktion/go.mod
index 0abc8924cb75c44a90008f269381bb597c89b4d7..535890aa101aa314a770097ef52445950b213178 100644
--- a/src/myaktion/go.mod
+++ b/src/myaktion/go.mod
@@ -3,7 +3,14 @@ module gitlab.reutlingen-university.de/petrinov/myaktion-go
go 1.24.2
require (
+ filippo.io/edwards25519 v1.1.0 // indirect
+ github.com/go-sql-driver/mysql v1.9.2 // indirect
github.com/gorilla/mux v1.8.1 // indirect
+ github.com/jinzhu/inflection v1.0.0 // indirect
+ github.com/jinzhu/now v1.1.5 // indirect
github.com/sirupsen/logrus v1.9.3 // indirect
- golang.org/x/sys v0.0.0-20220715151400-c0bba94af5f8 // indirect
+ golang.org/x/sys v0.5.0 // indirect
+ golang.org/x/text v0.24.0 // indirect
+ gorm.io/driver/mysql v1.5.7 // indirect
+ gorm.io/gorm v1.25.12 // indirect
)
diff --git a/src/myaktion/go.sum b/src/myaktion/go.sum
index b146617ee5b1cc8047c16e79b5f0d2c6ecdd4d1c..d079fc615b9ce7e06d064f58215cf5a1fe8d03f4 100644
--- a/src/myaktion/go.sum
+++ b/src/myaktion/go.sum
@@ -1,7 +1,16 @@
+filippo.io/edwards25519 v1.1.0 h1:FNf4tywRC1HmFuKW5xopWpigGjJKiJSV0Cqo0cJWDaA=
+filippo.io/edwards25519 v1.1.0/go.mod h1:BxyFTGdWcka3PhytdK4V28tE5sGfRvvvRV7EaN4VDT4=
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/go-sql-driver/mysql v1.7.0/go.mod h1:OXbVy3sEdcQ2Doequ6Z5BW6fXNQTmx+9S1MCJN5yJMI=
+github.com/go-sql-driver/mysql v1.9.2 h1:4cNKDYQ1I84SXslGddlsrMhc8k4LeDVj6Ad6WRjiHuU=
+github.com/go-sql-driver/mysql v1.9.2/go.mod h1:qn46aNg1333BRMNU69Lq93t8du/dwxI64Gl8i5p1WMU=
github.com/gorilla/mux v1.8.1 h1:TuBL49tXwgrFYWhqrNgrUNEY92u81SPhu7sTdzQEiWY=
github.com/gorilla/mux v1.8.1/go.mod h1:AKf9I4AEqPTmMytcMc0KkNouC66V3BtZ4qD5fmWSiMQ=
+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/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
github.com/sirupsen/logrus v1.9.3 h1:dueUQJ1C2q9oE3F7wvmSGAaVtTmUizReu6fjN8uqzbQ=
github.com/sirupsen/logrus v1.9.3/go.mod h1:naHLuLoDiP4jHNo9R0sCBMtWGeIprob74mVsIT4qYEQ=
@@ -9,5 +18,14 @@ github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+
github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
golang.org/x/sys v0.0.0-20220715151400-c0bba94af5f8 h1:0A+M6Uqn+Eje4kHMK80dtF3JCXC4ykBgQG4Fe06QRhQ=
golang.org/x/sys v0.0.0-20220715151400-c0bba94af5f8/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.5.0 h1:MUK/U/4lj1t1oPg0HfuXDN/Z1wv31ZJ/YcPiGccS4DU=
+golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/text v0.24.0 h1:dd5Bzh4yt5KYA8f9CJHCP4FB4D51c2c6JvN37xJJkJ0=
+golang.org/x/text v0.24.0/go.mod h1:L8rBsPeo2pSS+xqN0d5u2ikmjtmoJbDBT1b7nHvFCdU=
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=
+gorm.io/driver/mysql v1.5.7 h1:MndhOPYOfEp2rHKgkZIhJ16eVUIRf2HmzgoPmh7FCWo=
+gorm.io/driver/mysql v1.5.7/go.mod h1:sEtPWMiqiN1N1cMXoXmBbd8C6/l+TESwriotuRRpkDM=
+gorm.io/gorm v1.25.7/go.mod h1:hbnx/Oo0ChWMn1BIhpy1oYozzpM15i4YPuHDmfYtwg8=
+gorm.io/gorm v1.25.12 h1:I0u8i2hWQItBq1WfE0o2+WuL9+8L21K9e2HHSTE/0f8=
+gorm.io/gorm v1.25.12/go.mod h1:xh7N7RHfYlNc5EmcI/El95gXusucDrQnHXe0+CgWcLQ=
diff --git a/src/myaktion/handler/campaign.go b/src/myaktion/handler/campaign.go
index 95b293432ea43069844992ed11859121657a29e3..8dddcbedbc9335639c2ad99d2824c9e28b734ceb 100644
--- a/src/myaktion/handler/campaign.go
+++ b/src/myaktion/handler/campaign.go
@@ -2,31 +2,26 @@ package handler
import (
"encoding/json"
- "log"
"net/http"
+ log "github.com/sirupsen/logrus"
"gitlab.reutlingen-university.de/petrinov/myaktion-go/model"
"gitlab.reutlingen-university.de/petrinov/myaktion-go/service"
)
func CreateCampaign(w http.ResponseWriter, r *http.Request) {
- var campaign model.Campaign
- err := json.NewDecoder(r.Body).Decode(&campaign)
+ var campaign *model.Campaign
+ campaign, err := getCampaign(r)
if err != nil {
- log.Printf("Can't serialize request body to campaign struct: %v", err)
http.Error(w, err.Error(), http.StatusBadRequest)
return
}
- if err := service.CreateCampaign(&campaign); err != nil {
+ if err := service.CreateCampaign(campaign); err != nil {
log.Printf("Error calling service CreateCampaign: %v", err)
http.Error(w, err.Error(), http.StatusInternalServerError)
return
}
- w.Header().Set("Content-Type", "application/json")
- if err := json.NewEncoder(w).Encode(campaign); err != nil {
- log.Printf("Failure encoding value to JSON: %v", err)
- http.Error(w, err.Error(), http.StatusInternalServerError)
- }
+ sendJson(w, campaign)
}
func GetCampaigns(w http.ResponseWriter, _ *http.Request) {
@@ -36,9 +31,15 @@ func GetCampaigns(w http.ResponseWriter, _ *http.Request) {
http.Error(w, err.Error(), http.StatusInternalServerError)
return
}
- w.Header().Set("Content-Type", "application/json")
- if err := json.NewEncoder(w).Encode(campaigns); err != nil {
- log.Printf("Failure encoding value to JSON: %v", err)
- http.Error(w, err.Error(), http.StatusInternalServerError)
+ sendJson(w, campaigns)
+}
+
+func getCampaign(r *http.Request) (*model.Campaign, error) {
+ var campaign model.Campaign
+ err := json.NewDecoder(r.Body).Decode(&campaign)
+ if err != nil {
+ log.Errorf("Can't serialize request body to campaign struct: %v", err)
+ return nil, err
}
+ return &campaign, nil
}
diff --git a/src/myaktion/handler/util.go b/src/myaktion/handler/util.go
new file mode 100644
index 0000000000000000000000000000000000000000..3e4a837311d8c922d886a9ec89ae0638da222982
--- /dev/null
+++ b/src/myaktion/handler/util.go
@@ -0,0 +1,34 @@
+package handler
+
+import (
+ "encoding/json"
+ "net/http"
+ "strconv"
+
+ "github.com/gorilla/mux"
+ log "github.com/sirupsen/logrus"
+)
+
+type result struct {
+ Success string `json:"success"`
+}
+
+func sendJson(w http.ResponseWriter, value interface{}) {
+ //try
+ w.Header().Set("Content-Type", "application/json")
+ //catch
+ if err := json.NewEncoder(w).Encode(value); err != nil {
+ log.Errorf("Failure encoding value to JSON: %v", err)
+ http.Error(w, err.Error(), http.StatusInternalServerError)
+ }
+}
+
+func getId(r *http.Request) (uint, error) {
+ vars := mux.Vars(r)
+ id, err := strconv.ParseUint(vars["id"], 10, 0)
+ if err != nil {
+ log.Errorf("Can't get ID from request: %v", err)
+ return 0, err
+ }
+ return uint(id), nil
+}
diff --git a/src/myaktion/model/campaign.go b/src/myaktion/model/campaign.go
index 7ea5e4481a15e8bcb32d840444e9002f5e3531f0..ff9472cbe433f460037a90238b48417e0947dd06 100644
--- a/src/myaktion/model/campaign.go
+++ b/src/myaktion/model/campaign.go
@@ -1,12 +1,15 @@
package model
+import "gorm.io/gorm"
+
type Campaign struct {
- ID uint `json:id`
- Name string `json:name`
- OrganizerName string `json:organizername`
- TargetAmmount float64 `json:targetammount`
- DonationMinimum float64 `json:donationminimum`
- AmmountDonatedSoFar float64 `json: ammountdonatedsofar`
- Donations []Donation `json: donations`
- Account Account `account`
+ gorm.Model
+ CampaignID uint
+ Name string `gorm:"notNull;size:30"`
+ OrganizerName string `gorm:"notNull"`
+ TargetAmmount float64 `gorm:"notNull;check:target_amount >= 10.0"`
+ DonationMinimum float64 `gorm:"notNull;check:donation_minimum >= 1.0"`
+ AmmountDonatedSoFar float64 `gorm:"-"`
+ Donations []Donation `gorm:"foreignKey:CampaignID;constraint:OnUpdate:CASCADE,OnDelete:CASCADE"`
+ Account Account `gorm:"embedded;embeddedPrefix:account_"`
}
diff --git a/src/myaktion/model/donation.go b/src/myaktion/model/donation.go
index bee821232c967895f9d18afe32187e83e7905365..3485b69d9ba9695ee1d4f4dbe0227d2c72e2bd4f 100644
--- a/src/myaktion/model/donation.go
+++ b/src/myaktion/model/donation.go
@@ -1,11 +1,14 @@
package model
+import "gorm.io/gorm"
+
type Donation struct {
- Ammount float64 `json:ammount`
- DonorName string `json:donorname`
- ReceiptRequested bool `json:receiptrequested`
- Status Status `json:status`
- Account Account `json:account`
+ gorm.Model
+ Ammount float64 `gorm:"notNull;check:amount >= 1.0"`
+ DonorName string `gorm:"notNull;size:40"`
+ ReceiptRequested bool `gorm:"notNull"`
+ Status Status `gorm:"notNull;type:ENUM('TRANSFERRED','IN_PROCESS')"`
+ Account Account `gorm:"embedded;embeddedPrefix:account_"`
}
type Status string
diff --git a/src/myaktion/service/campaign.go b/src/myaktion/service/campaign.go
index 5cac517aff2d40e9d8127f2f3883fce36fbebf4f..51b8f290e398f2bebbe6a4c7b92549a3a3f3e374 100644
--- a/src/myaktion/service/campaign.go
+++ b/src/myaktion/service/campaign.go
@@ -1,7 +1,7 @@
package service
import (
- "log"
+ log "github.com/sirupsen/logrus"
model "gitlab.reutlingen-university.de/petrinov/myaktion-go/model"
)
@@ -16,13 +16,13 @@ func init() {
}
func CreateCampaign(campaign *model.Campaign) error {
- campaign.ID = uint(actCampaignId)
- campaginStore[uint(actCampaignId)] = campaign
+ result := db.DB.Create(campaign)
- actCampaignId += 1
-
- log.Printf("Successfully stored new campaign with ID %v in database.", campaign.ID)
- log.Printf("Stored: %v", campaign)
+ if result.Error != nil {
+ return result.Error
+ }
+ log.Infof("Successfully stored new campaign with ID %v in database.", campaign.ID)
+ log.Tracef("Stored: %v", campaign)
return nil
}