mirror of
https://github.com/FJurmanovic/wallet-go-api.git
synced 2026-02-06 14:18:12 +00:00
fixed showing transactions for all users
This commit is contained in:
@@ -34,10 +34,14 @@ func (wc *TransactionController) New(c *gin.Context) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
func (wc *TransactionController) GetAll(c *gin.Context) {
|
func (wc *TransactionController) GetAll(c *gin.Context) {
|
||||||
|
body := new(models.Auth)
|
||||||
|
auth := c.MustGet("auth")
|
||||||
|
body.Id = auth.(*models.Auth).Id
|
||||||
|
|
||||||
fr := FilteredResponse(c)
|
fr := FilteredResponse(c)
|
||||||
wallet, _ := c.GetQuery("walletId")
|
wallet, _ := c.GetQuery("walletId")
|
||||||
|
|
||||||
wc.TransactionService.GetAll(wallet, fr)
|
wc.TransactionService.GetAll(body, wallet, fr)
|
||||||
|
|
||||||
c.JSON(200, fr)
|
c.JSON(200, fr)
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -32,10 +32,10 @@ func (as *TransactionService) New(body *models.NewTransactionBody) *models.Trans
|
|||||||
return tm
|
return tm
|
||||||
}
|
}
|
||||||
|
|
||||||
func (as *TransactionService) GetAll(walletId string, filtered *models.FilteredResponse) {
|
func (as *TransactionService) GetAll(am *models.Auth, walletId string, filtered *models.FilteredResponse) {
|
||||||
wm := new([]models.Transaction)
|
wm := new([]models.Transaction)
|
||||||
|
|
||||||
query := as.Db.Model((wm))
|
query := as.Db.Model((wm)).Relation("Wallet").Where("wallet.? = ?", pg.Ident("user_id"), am.Id)
|
||||||
if walletId != "" {
|
if walletId != "" {
|
||||||
query = query.Where("? = ?", pg.Ident("wallet_id"), walletId)
|
query = query.Where("? = ?", pg.Ident("wallet_id"), walletId)
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user