Completed db rewrite
This commit is contained in:
parent
54d7d14ef9
commit
cf4b8e0119
19 changed files with 481 additions and 276 deletions
|
|
@ -49,7 +49,7 @@ func createExpense(c *gin.Context) {
|
|||
|
||||
if exp.Type == "user" {
|
||||
compare = func(m core.Member) bool {
|
||||
return m.UserID == exp.Payer
|
||||
return *m.UserId == exp.Payer
|
||||
}
|
||||
} else if exp.Type == "non-user" {
|
||||
compare = func(m core.Member) bool {
|
||||
|
|
@ -61,7 +61,7 @@ func createExpense(c *gin.Context) {
|
|||
}
|
||||
idx := slices.IndexFunc(members, compare)
|
||||
if idx != -1 {
|
||||
expense, err := core.CreateExpense(db, plan, members[idx], exp.Amount)
|
||||
expense, err := core.ExpenseCreate(db, *plan, members[idx], exp.Amount)
|
||||
if err != nil {
|
||||
c.Status(http.StatusInternalServerError)
|
||||
return
|
||||
|
|
@ -89,7 +89,7 @@ func listExpenses(c *gin.Context) {
|
|||
c.Status(http.StatusBadRequest)
|
||||
return
|
||||
}
|
||||
expenses, err := core.ListExpenses(db, plan)
|
||||
expenses, err := core.ExpensesList(db, *plan)
|
||||
if err != nil {
|
||||
c.Status(http.StatusInternalServerError)
|
||||
return
|
||||
|
|
@ -109,12 +109,12 @@ func getExpense(c *gin.Context) {
|
|||
c.Status(http.StatusBadRequest)
|
||||
return
|
||||
}
|
||||
expense, err := core.GetExpense(db, uint(expense_id))
|
||||
expense, err := core.ExpensesGet(db, uint(expense_id))
|
||||
if err != nil {
|
||||
c.Status(http.StatusBadRequest)
|
||||
return
|
||||
}
|
||||
_, err = u.GetPlan(db, expense.PlanID)
|
||||
_, err = u.GetPlan(db, expense.PlanId)
|
||||
if err != nil {
|
||||
c.Status(http.StatusBadRequest)
|
||||
return
|
||||
|
|
@ -135,12 +135,12 @@ func deleteExpense(c *gin.Context) {
|
|||
c.Status(http.StatusBadRequest)
|
||||
return
|
||||
}
|
||||
expense, err := core.GetExpense(db, uint(expense_id))
|
||||
expense, err := core.ExpensesGet(db, uint(expense_id))
|
||||
if err != nil {
|
||||
c.Status(http.StatusBadRequest)
|
||||
return
|
||||
}
|
||||
_, err = u.GetPlan(db, expense.PlanID)
|
||||
_, err = u.GetPlan(db, expense.PlanId)
|
||||
if err != nil {
|
||||
c.Status(http.StatusBadRequest)
|
||||
return
|
||||
|
|
@ -166,12 +166,12 @@ func getExpenseDebts(c *gin.Context) {
|
|||
c.Status(http.StatusBadRequest)
|
||||
return
|
||||
}
|
||||
expense, err := core.GetExpense(db, uint(expense_id))
|
||||
expense, err := core.ExpensesGet(db, uint(expense_id))
|
||||
if err != nil {
|
||||
c.Status(http.StatusBadRequest)
|
||||
return
|
||||
}
|
||||
_, err = u.GetPlan(db, expense.PlanID)
|
||||
_, err = u.GetPlan(db, expense.PlanId)
|
||||
if err != nil {
|
||||
c.Status(http.StatusBadRequest)
|
||||
return
|
||||
|
|
@ -198,17 +198,16 @@ func setExpenseDebts(c *gin.Context) {
|
|||
c.Status(http.StatusBadRequest)
|
||||
return
|
||||
}
|
||||
expense, err := core.GetExpense(db, uint(expense_id))
|
||||
expense, err := core.ExpensesGet(db, uint(expense_id))
|
||||
if err != nil {
|
||||
c.Status(http.StatusBadRequest)
|
||||
return
|
||||
}
|
||||
plan, err := u.GetPlan(db, expense.PlanID)
|
||||
_, err = u.GetPlan(db, expense.PlanId)
|
||||
if err != nil {
|
||||
c.Status(http.StatusBadRequest)
|
||||
return
|
||||
}
|
||||
expense.Plan = plan
|
||||
|
||||
var debtSpec []core.DebtSpec
|
||||
if err := c.ShouldBind(&debtSpec); err != nil {
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue