From 5764657ab5d5d1ad3619fe9f52e5132cabfd684e Mon Sep 17 00:00:00 2001
From: Emanuel <Emanuel.Petrinovic@Student.Reutlingen-University.DE>
Date: Mon, 14 Apr 2025 16:10:42 +0200
Subject: [PATCH] fix errors
---
src/myaktion/model/campaign.go | 3 +--
src/myaktion/model/donation.go | 3 ++-
src/myaktion/scripts/db-kill.sh | 2 ++
src/myaktion/scripts/db-start.sh | 2 ++
src/myaktion/service/campaign.go | 9 ---------
5 files changed, 7 insertions(+), 12 deletions(-)
create mode 100644 src/myaktion/scripts/db-kill.sh
create mode 100644 src/myaktion/scripts/db-start.sh
diff --git a/src/myaktion/model/campaign.go b/src/myaktion/model/campaign.go
index ff9472c..84a981f 100644
--- a/src/myaktion/model/campaign.go
+++ b/src/myaktion/model/campaign.go
@@ -4,10 +4,9 @@ import "gorm.io/gorm"
type Campaign struct {
gorm.Model
- CampaignID uint
Name string `gorm:"notNull;size:30"`
OrganizerName string `gorm:"notNull"`
- TargetAmmount float64 `gorm:"notNull;check:target_amount >= 10.0"`
+ TargetAmount 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"`
diff --git a/src/myaktion/model/donation.go b/src/myaktion/model/donation.go
index 3485b69..370f84b 100644
--- a/src/myaktion/model/donation.go
+++ b/src/myaktion/model/donation.go
@@ -4,7 +4,8 @@ import "gorm.io/gorm"
type Donation struct {
gorm.Model
- Ammount float64 `gorm:"notNull;check:amount >= 1.0"`
+ CampaignID uint
+ Amount 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')"`
diff --git a/src/myaktion/scripts/db-kill.sh b/src/myaktion/scripts/db-kill.sh
new file mode 100644
index 0000000..da085ee
--- /dev/null
+++ b/src/myaktion/scripts/db-kill.sh
@@ -0,0 +1,2 @@
+#!/usr/bin/env bash
+docker kill database && docker rm database
\ No newline at end of file
diff --git a/src/myaktion/scripts/db-start.sh b/src/myaktion/scripts/db-start.sh
new file mode 100644
index 0000000..04ad7c1
--- /dev/null
+++ b/src/myaktion/scripts/db-start.sh
@@ -0,0 +1,2 @@
+#!/usr/bin/env bash
+docker run -d -p 3306:3306 --name database -e MYSQL_ROOT_PASSWORD=root -e MYSQL_DATABASE=myaktion mariadb:10.5
\ No newline at end of file
diff --git a/src/myaktion/service/campaign.go b/src/myaktion/service/campaign.go
index 4ff1e83..46e77f3 100644
--- a/src/myaktion/service/campaign.go
+++ b/src/myaktion/service/campaign.go
@@ -7,15 +7,6 @@ import (
model "gitlab.reutlingen-university.de/petrinov/myaktion-go/model"
)
-var (
- campaginStore map[uint]*model.Campaign
- actCampaignId = 1
-)
-
-func init() {
- campaginStore = make(map[uint]*model.Campaign)
-}
-
func CreateCampaign(campaign *model.Campaign) error {
result := db.DB.Create(campaign)
--
GitLab