From 830fa65f8a8afcde31047d63b5b7e4dc9553ae36 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fran=20Jurmanovi=C4=87?= <fjurma12@outlook.com>
Date: Tue, 22 Jun 2021 17:18:48 +0200
Subject: [PATCH] small pattern fixes

---
 pkg/controllers/wallets-header.go | 3 +--
 pkg/middleware/auth.go            | 2 +-
 pkg/services/transactions.go      | 1 +
 pkg/services/wallets.go           | 4 ++--
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkg/controllers/wallets-header.go b/pkg/controllers/wallets-header.go
index 0aa08e4..9bb8cdc 100644
--- a/pkg/controllers/wallets-header.go
+++ b/pkg/controllers/wallets-header.go
@@ -23,13 +23,12 @@ func NewWalletsHeaderController(as *services.WalletService, s *gin.RouterGroup)
 func (wc *WalletsHeaderController) Get(c *gin.Context) {
 	body := new(models.Auth)
 
-	embed, _ := c.GetQuery("embed")
 	walletId, _ := c.GetQuery("walletId")
 
 	auth := c.MustGet("auth")
 	body.Id = auth.(*models.Auth).Id
 
-	wm := wc.WalletService.GetHeader(body, embed, walletId)
+	wm := wc.WalletService.GetHeader(body, walletId)
 
 	c.JSON(200, wm)
 }
diff --git a/pkg/middleware/auth.go b/pkg/middleware/auth.go
index 087b58b..e6380d7 100644
--- a/pkg/middleware/auth.go
+++ b/pkg/middleware/auth.go
@@ -55,7 +55,7 @@ func CheckToken(tokenString string) (*jwt.Token, error) {
 		_, ok := token.Method.(*jwt.SigningMethodHMAC)
 		var err error
 		if !ok {
-			err = errors.New("Invalid token")
+			err = errors.New("invalid token")
 		}
 		return []byte(secret), err
 	})
diff --git a/pkg/services/transactions.go b/pkg/services/transactions.go
index 5eb38a7..43d9784 100644
--- a/pkg/services/transactions.go
+++ b/pkg/services/transactions.go
@@ -42,6 +42,7 @@ func (as *TransactionService) GetAll(am *models.Auth, walletId string, filtered
 	if walletId != "" {
 		query2 = query2.Where("? = ?", pg.Ident("wallet_id"), walletId)
 	}
+	query2.Select()
 
 	for _, sub := range *sm {
 		as.Ss.SubToTrans(&sub)
diff --git a/pkg/services/wallets.go b/pkg/services/wallets.go
index d08b5fb..5679f5c 100644
--- a/pkg/services/wallets.go
+++ b/pkg/services/wallets.go
@@ -40,7 +40,7 @@ func (as *WalletService) GetAll(am *models.Auth, filtered *models.FilteredRespon
 	FilteredResponse(query, wm, filtered)
 }
 
-func (as *WalletService) GetHeader(am *models.Auth, embed string, walletId string) *models.WalletHeader {
+func (as *WalletService) GetHeader(am *models.Auth, walletId string) *models.WalletHeader {
 	wm := new(models.WalletHeader)
 	wallets := new([]models.WalletTransactions)
 	var wg sync.WaitGroup
@@ -117,7 +117,7 @@ func (as *WalletService) GetHeader(am *models.Auth, embed string, walletId strin
 
 func addWhere(s *[]models.WalletTransactions, walletId string, e models.Transaction) {
 	var exists bool
-	for a, _ := range *s {
+	for a := range *s {
 		if (*s)[a].WalletId == walletId {
 			(*s)[a].Transactions = append((*s)[a].Transactions, e)
 			exists = true