From 35df0958f630b56a5aa184e1528adc9208d16723 Mon Sep 17 00:00:00 2001
From: albrecht <flo@DESKTOP-ERC0T8S>
Date: Mon, 10 Jul 2023 21:50:24 +0200
Subject: [PATCH] fixing
---
src/gomazon/main.go | 10 +++++-----
src/gomazon/model/position.go | 10 ++++++----
src/gomazon/model/{produkt.go => product.go} | 0
src/gomazon/model/rating.go | 2 +-
src/gomazon/service/shopping_cart.go | 13 +++++++++----
5 files changed, 21 insertions(+), 14 deletions(-)
rename src/gomazon/model/{produkt.go => product.go} (100%)
diff --git a/src/gomazon/main.go b/src/gomazon/main.go
index 4306b4a..c3cad8f 100644
--- a/src/gomazon/main.go
+++ b/src/gomazon/main.go
@@ -41,13 +41,13 @@ func main() {
router.GET("/ratings", RatingHandler.ReadRatings) //all Ratings
//Bankaccount
- router.POST("/bankaccounts", bankAccountHandler.CreateBankAccount) // new Bankaccount
- router.PUT("/bankaccounts", bankAccountHandler.UpdateBankAccount) // Transfer
+ router.POST("/bankaccounts", bankAccountHandler.CreateBankAccount) // new Bankaccount
+ router.PUT("/bankaccounts/transfer", bankAccountHandler.UpdateBankAccount) // Transfer
//ShoppingCart
- router.POST("/ShoppingCart", ShoppingCartHandler.CreateShoppingCart) //new ShoppingCart
- router.POST("/ShoppingCart/Product/:id", ShoppingCartHandler.AddProductToShoppingCart) //add Product
- router.POST("/ShoppingCart/pay", ShoppingCartHandler.TransferMoney) //pay
+ router.POST("/shoppingcart", ShoppingCartHandler.CreateShoppingCart) //new ShoppingCart
+ router.POST("/shoppingcart/product/:id", ShoppingCartHandler.AddProductToShoppingCart) //add Product
+ router.POST("/shoppingcart/pay", ShoppingCartHandler.TransferMoney) //pay
router.Run(":8080")
}
diff --git a/src/gomazon/model/position.go b/src/gomazon/model/position.go
index aa2bdd4..3e67041 100644
--- a/src/gomazon/model/position.go
+++ b/src/gomazon/model/position.go
@@ -4,8 +4,10 @@ import "gorm.io/gorm"
type Position struct {
gorm.Model
- Amount int `gorm:"notNull"`
- ProductId uint `gorm:"notNull"`
- Price float64 `gorm:"notNull"`
- Totalprice float64 `gorm:"notNull"`
+ Amount int `gorm:"notNull"`
+ ProductId uint `gorm:"notNull"`
+ Price float64 `gorm:"notNull"`
+ Totalprice float64 `gorm:"notNull"`
+ ShoppingCartId uint `gorm:"notNull"`
+ ShoppingCart ShoppingCart `gorm:"-"`
}
diff --git a/src/gomazon/model/produkt.go b/src/gomazon/model/product.go
similarity index 100%
rename from src/gomazon/model/produkt.go
rename to src/gomazon/model/product.go
diff --git a/src/gomazon/model/rating.go b/src/gomazon/model/rating.go
index 81d7386..02400e8 100644
--- a/src/gomazon/model/rating.go
+++ b/src/gomazon/model/rating.go
@@ -7,5 +7,5 @@ type Rating struct {
Username string `gorm:"notNull"`
Content string `gorm:"notNull"`
Rating int `gorm:"notNull"`
- ProductId uint
+ ProductId uint `gorm:"notNull"`
}
diff --git a/src/gomazon/service/shopping_cart.go b/src/gomazon/service/shopping_cart.go
index 3dd8f6a..e2db2c9 100644
--- a/src/gomazon/service/shopping_cart.go
+++ b/src/gomazon/service/shopping_cart.go
@@ -56,10 +56,11 @@ func (s *ShoppingCartService) AddProductToShoppingCart(username string, ProductI
gesPrice := Product.Price * float64(amount)
position := model.Position{
- Amount: amount,
- ProductId: Product.ID,
- Price: Product.Price,
- Totalprice: gesPrice,
+ Amount: amount,
+ ProductId: Product.ID,
+ Price: Product.Price,
+ Totalprice: gesPrice,
+ ShoppingCartId: ShoppingCart.ID,
}
// Add position to shoppingcart
@@ -112,6 +113,10 @@ func (s *ShoppingCartService) TransferMoney(username string) error {
ShoppingCart.Totalprice = 0.0
+ if err := db.DB.Where("shopping_cart_id = ?", ShoppingCart.Username).Delete(&model.Position{}).Error; err != nil {
+ return err
+ }
+
result = db.DB.Save(ShoppingCart)
if result.Error != nil {
log.Error("Could not save Shoppingcart")
--
GitLab