This commit is contained in:
2025-07-21 18:31:28 +01:00
parent 4e50ad653f
commit a679b7334c
15 changed files with 508 additions and 104 deletions
+92 -38
View File
@@ -8,6 +8,86 @@ import (
"github.com/gin-gonic/gin"
)
func processFormShares(c *gin.Context) ([]expenses.ExpenseShare, error) {
shares := []expenses.ExpenseShare{}
sharesUserIDs := c.PostFormArray("shares-user-ids[]")
formSharesIDs := c.PostFormArray("shares-ids[]")
formShares := c.PostFormArray("shares-percent[]")
for i := range sharesUserIDs {
userID, err := strconv.Atoi(sharesUserIDs[i])
if err != nil {
return nil, err
}
share, err := strconv.ParseFloat(formShares[i], 32)
if err != nil {
return nil, err
}
newShare := expenses.ExpenseShare{
ExpShareID: -1,
User: expenses.User{
UserID: userID,
},
Share: float32(share),
}
if formSharesIDs[i] != "" {
id, err := strconv.Atoi(formSharesIDs[i])
if err != nil {
return nil, err
}
newShare.ExpShareID = id
}
shares = append(shares, newShare)
}
return shares, nil
}
func processFormPayments(c *gin.Context) ([]expenses.ExpensePayment, error) {
payments := []expenses.ExpensePayment{}
paymentsUserIDs := c.PostFormArray("payments-user-ids[]")
formPaymentsIDs := c.PostFormArray("payments-ids[]")
formPaymentsValues := c.PostFormArray("payments-payment[]")
for k := range paymentsUserIDs {
userID, err := strconv.Atoi(paymentsUserIDs[k])
if err != nil {
return nil, err
}
payed, err := strconv.ParseFloat(formPaymentsValues[k], 32)
if err != nil {
return nil, err
}
newPayment := expenses.ExpensePayment{
ExpPaymID: -1,
User: expenses.User{
UserID: userID,
},
PayedAmount: float32(payed),
}
if formPaymentsIDs[k] != "" {
id, err := strconv.Atoi(formPaymentsIDs[k])
if err != nil {
return nil, err
}
newPayment.ExpPaymID = id
}
payments = append(payments, newPayment)
}
return payments, nil
}
func expenseFromForm(c *gin.Context) (*expenses.Expense, error) {
newDescription := c.PostForm("expense-desc")
newDate := c.PostForm("expense-date")
@@ -42,44 +122,13 @@ func expenseFromForm(c *gin.Context) (*expenses.Expense, error) {
return nil, err
}
shares := []expenses.ExpenseShare{}
payments := []expenses.ExpensePayment{}
sharesUserIDs := c.PostFormArray("shares-user-ids[]")
formShares := c.PostFormArray("shares-percent[]")
formPayments := c.PostFormArray("payments-payment[]")
for i := range sharesUserIDs {
userID, err := strconv.Atoi(sharesUserIDs[i])
if err != nil {
return nil, err
}
share, err := strconv.ParseFloat(formShares[i], 32)
if err != nil {
return nil, err
}
payed, err := strconv.ParseFloat(formPayments[i], 32)
if err != nil {
return nil, err
}
newShare := expenses.ExpenseShare{
User: expenses.User{
UserID: userID,
},
Share: float32(share),
}
shares = append(shares, newShare)
newPayment := expenses.ExpensePayment{
User: expenses.User{
UserID: userID,
},
PayedAmount: float32(payed),
}
payments = append(payments, newPayment)
payments, err := processFormPayments(c)
if err != nil {
return nil, err
}
shares, err := processFormShares(c)
if err != nil {
return nil, err
}
newExp := expenses.Expense{
@@ -95,6 +144,11 @@ func expenseFromForm(c *gin.Context) (*expenses.Expense, error) {
ExpStore: expenses.Store{
StoreID: storeID,
},
OwnerUser: expenses.User{
// TODO
// This needs to be dynamic - to be added once we have logins and whatnot
UserID: 1,
},
Shares: shares,
Payments: payments,
}