FJurmanovic/wallet-go-api
1
0
Fork 0
mirror of https://github.com/FJurmanovic/wallet-go-api.git synced 2026-02-06 06:08:16 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'sea-of-edit' into develop

Browse Source
This commit is contained in:
Fran Jurmanovic
2021-08-02 04:31:37 -07:00
parent 9ee2169d17 26e39322e4
commit 18508446fd
11 changed files with 295 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
pkg/api/routes.go
View File

@@ -22,6 +22,11 @@ func Routes(s *gin.Engine, db *pg.DB) {
subscription := ver.Group("subscription", middleware.Auth)
subscriptionType := ver.Group("subscription-type", middleware.Auth)
s.NoRoute(func(c *gin.Context) {
c.JSON(404, gin.H{"code": "PAGE_NOT_FOUND", "message": "Page not found"})
})
apiService := services.ApiService{Db: db}
usersService := services.UsersService{Db: db}
walletService := services.WalletService{Db: db}

56
pkg/controllers/subscriptions.go
View File

@@ -17,8 +17,15 @@ func NewSubscriptionController(as *services.SubscriptionService, s *gin.RouterGr
wc.SubscriptionService = as
s.POST("", wc.New)
s.PUT("/:id", wc.Edit)
s.GET("/:id", wc.Get)
s.GET("", wc.GetAll)
se := s.Group("/end")
{
se.POST("", wc.End)
}
return wc
}
@@ -33,6 +40,55 @@ func (wc *SubscriptionController) New(c *gin.Context) {
c.JSON(200, wm)
}
func (wc *SubscriptionController) Edit(c *gin.Context) {
body := new(models.SubscriptionEdit)
if err := c.ShouldBind(body); err != nil {
c.JSON(http.StatusBadRequest, gin.H{"error": err.Error()})
return
}
id := c.Param("id")
wm := wc.SubscriptionService.Edit(c, body, id)
c.JSON(200, wm)
}
func (wc *SubscriptionController) Get(c *gin.Context) {
body := new(models.Auth)
params := new(models.Params)
auth := c.MustGet("auth")
body.Id = auth.(*models.Auth).Id
id := c.Param("id")
embed, _ := c.GetQuery("embed")
params.Embed = embed
fr := wc.SubscriptionService.Get(c, body, id, params)
c.JSON(200, fr)
}
func (wc *SubscriptionController) End(c *gin.Context) {
body := new(models.Auth)
auth := c.MustGet("auth")
body.Id = auth.(*models.Auth).Id
end := new(models.SubscriptionEnd)
if err := c.ShouldBind(end); err != nil {
c.JSON(http.StatusBadRequest, gin.H{"error": err.Error()})
return
}
id := end.Id
fr := wc.SubscriptionService.End(c, id)
c.JSON(200, fr)
}
func (wc *SubscriptionController) GetAll(c *gin.Context) {
body := new(models.Auth)
auth := c.MustGet("auth")

32
pkg/controllers/transactions.go
View File

@@ -18,6 +18,8 @@ func NewTransactionController(as *services.TransactionService, s *gin.RouterGrou
s.POST("", wc.New)
s.GET("", wc.GetAll)
s.PUT("/:id", wc.Edit)
s.GET("/:id", wc.Get)
return wc
}
@@ -45,3 +47,33 @@ func (wc *TransactionController) GetAll(c *gin.Context) {
c.JSON(200, fr)
}
func (wc *TransactionController) Edit(c *gin.Context) {
body := new(models.TransactionEdit)
if err := c.ShouldBind(body); err != nil {
c.JSON(http.StatusBadRequest, gin.H{"error": err.Error()})
return
}
id := c.Param("id")
wm := wc.TransactionService.Edit(c, body, id)
c.JSON(200, wm)
}
func (wc *TransactionController) Get(c *gin.Context) {
body := new(models.Auth)
params := new(models.Params)
auth := c.MustGet("auth")
body.Id = auth.(*models.Auth).Id
id := c.Param("id")
embed, _ := c.GetQuery("embed")
params.Embed = embed
fr := wc.TransactionService.Get(c, body, id, params)
c.JSON(200, fr)
}

41
pkg/controllers/wallets.go
View File

@@ -18,6 +18,8 @@ func NewWalletsController(as *services.WalletService, s *gin.RouterGroup) *Walle
s.POST("", wc.New)
s.GET("", wc.GetAll)
s.PUT("/:id", wc.Edit)
s.GET("/:id", wc.Get)
return wc
}
@@ -37,18 +39,6 @@ func (wc *WalletsController) New(c *gin.Context) {
c.JSON(200, wm)
}
func (wc *WalletsController) Get(c *gin.Context) {
body := new(models.Auth)
embed, _ := c.GetQuery("embed")
auth := c.MustGet("auth")
body.Id = auth.(*models.Auth).Id
wm := wc.WalletService.Get(c, body, embed)
c.JSON(200, wm)
}
func (wc *WalletsController) GetAll(c *gin.Context) {
body := new(models.Auth)
auth := c.MustGet("auth")
@@ -59,5 +49,30 @@ func (wc *WalletsController) GetAll(c *gin.Context) {
wc.WalletService.GetAll(c, body, fr)
c.JSON(200, fr)
}
func (wc *WalletsController) Edit(c *gin.Context) {
body := new(models.WalletEdit)
if err := c.ShouldBind(body); err != nil {
c.JSON(http.StatusBadRequest, gin.H{"error": err.Error()})
return
}
id := c.Param("id")
wm := wc.WalletService.Edit(c, body, id)
c.JSON(200, wm)
}
func (wc *WalletsController) Get(c *gin.Context) {
params := new(models.Params)
id := c.Param("id")
embed, _ := c.GetQuery("embed")
params.Embed = embed
fr := wc.WalletService.Get(c, id, params)
c.JSON(200, fr)
}

14
pkg/models/models.go
View File

@@ -4,11 +4,7 @@ import "github.com/gin-gonic/gin"
type FilteredResponse struct {
Items interface{} `json:"items"`
SortBy string `json:"sortBy"`
Embed string `json:"embed"`
Page int `json:"page"`
Rpp int `json:"rpp"`
TotalRecords int `json:"totalRecords"`
Params
}
type ResponseFunc func(*gin.Context) *[]interface{}
@@ -16,3 +12,11 @@ type ResponseFunc func(*gin.Context) *[]interface{}
type MessageResponse struct {
Message string `json:"message"`
}
type Params struct {
SortBy string `json:"sortBy"`
Embed string `json:"embed"`
Page int `json:"page"`
Rpp int `json:"rpp"`
TotalRecords int `json:"totalRecords"`
}

14
pkg/models/subscriptions.go
View File

@@ -23,6 +23,16 @@ type Subscription struct {
Amount float32 `json:"amount", pg:"amount,default:0"`
}
type SubscriptionEdit struct {
tableName struct{} `pg:"subscriptions,alias:subscriptions"`
Id string `json:"id" form:"id"`
Description string `json:"description" form:"description"`
EndDate time.Time `json:"endDate" form:"endDate" `
HasEnd bool `json:"hasEnd" form:"hasEnd"`
WalletID string `json:"walletId" form:"walletId"`
Amount json.Number `json:"amount" form:"amount"`
}
type NewSubscriptionBody struct {
WalletID string `json:"walletId" form:"walletId"`
TransactionTypeID string `json:"transactionTypeId" form:"transactionTypeId"`
@@ -35,6 +45,10 @@ type NewSubscriptionBody struct {
Amount json.Number `json:"amount" form:"amount"`
}
type SubscriptionEnd struct {
Id string `json:"id" form:"id"`
}
func (cm *Subscription) ToTrans() *Transaction {
trans := new(Transaction)
trans.Init()

9
pkg/models/transactions.go
View File

@@ -26,3 +26,12 @@ type NewTransactionBody struct {
Description string `json:"description" form:"description"`
Amount json.Number `json:"amount" form:"amount"`
}
type TransactionEdit struct {
Id string `json:"id" form:"id"`
WalletID string `json:"walletId" form:"walletId"`
TransactionTypeID string `json:"transactionTypeId" form:"transactionTypeId"`
TransactionDate time.Time `json:"transactionDate" form:"transactionDate"`
Description string `json:"description" form:"description"`
Amount json.Number `json:"amount" form:"amount"`
}

5
pkg/models/wallets.go
View File

@@ -28,3 +28,8 @@ type WalletTransactions struct {
LastMonth float32
NextMonth float32
}
type WalletEdit struct {
Id string `json:"id" form:"id"`
Name string `json:"name" form:"name"`
}

63
pkg/services/subscriptions.go
View File

@@ -5,6 +5,7 @@ import (
"math"
"time"
"wallet-api/pkg/models"
"wallet-api/pkg/utl/common"
"github.com/go-pg/pg/v10"
)
@@ -47,6 +48,27 @@ func (as *SubscriptionService) New(ctx context.Context, body *models.NewSubscrip
return tm
}
func (as *SubscriptionService) Get(ctx context.Context, am *models.Auth, id string, params *models.Params) *models.Subscription {
db := as.Db.WithContext(ctx)
wm := new(models.Subscription)
wm.Id = id
tx, _ := db.Begin()
defer tx.Rollback()
qry := tx.Model(wm)
common.GenerateEmbed(qry, params.Embed).WherePK().Select()
if (*wm).HasNew() {
as.SubToTrans(wm, tx)
}
tx.Commit()
return wm
}
func (as *SubscriptionService) GetAll(ctx context.Context, am *models.Auth, walletId string, filtered *models.FilteredResponse) {
db := as.Db.WithContext(ctx)
@@ -69,6 +91,47 @@ func (as *SubscriptionService) GetAll(ctx context.Context, am *models.Auth, wall
tx.Commit()
}
func (as *SubscriptionService) Edit(ctx context.Context, body *models.SubscriptionEdit, id string) *models.Subscription {
db := as.Db.WithContext(ctx)
amount, _ := body.Amount.Float64()
tm := new(models.Subscription)
tm.Id = id
tm.EndDate = body.EndDate
tm.HasEnd = body.HasEnd
tm.Description = body.Description
tm.WalletID = body.WalletID
tm.Amount = float32(math.Round(amount*100) / 100)
tx, _ := db.Begin()
defer tx.Rollback()
tx.Model(tm).WherePK().UpdateNotZero()
tx.Commit()
return tm
}
func (as *SubscriptionService) End(ctx context.Context, id string) *models.Subscription {
db := as.Db.WithContext(ctx)
tm := new(models.Subscription)
tm.Id = id
tm.EndDate = time.Now()
tm.HasEnd = true
tx, _ := db.Begin()
defer tx.Rollback()
tx.Model(tm).WherePK().UpdateNotZero()
tx.Commit()
return tm
}
func (as *SubscriptionService) SubToTrans(subModel *models.Subscription, tx *pg.Tx) {
now := time.Now()

47
pkg/services/transactions.go
View File

@@ -5,6 +5,7 @@ import (
"math"
"time"
"wallet-api/pkg/models"
"wallet-api/pkg/utl/common"
"github.com/go-pg/pg/v10"
)
@@ -19,6 +20,9 @@ func (as *TransactionService) New(ctx context.Context, body *models.NewTransacti
tm := new(models.Transaction)
tx, _ := db.Begin()
defer tx.Rollback()
amount, _ := body.Amount.Float64()
tm.Init()
@@ -32,7 +36,8 @@ func (as *TransactionService) New(ctx context.Context, body *models.NewTransacti
tm.TransactionDate = time.Now()
}
db.Model(tm).Insert()
tx.Model(tm).Insert()
tx.Commit()
return tm
}
@@ -67,3 +72,43 @@ func (as *TransactionService) GetAll(ctx context.Context, am *models.Auth, walle
tx.Commit()
}
func (as *TransactionService) Edit(ctx context.Context, body *models.TransactionEdit, id string) *models.Transaction {
db := as.Db.WithContext(ctx)
amount, _ := body.Amount.Float64()
tm := new(models.Transaction)
tm.Id = id
tm.Description = body.Description
tm.WalletID = body.WalletID
tm.TransactionTypeID = body.TransactionTypeID
tm.TransactionDate = body.TransactionDate
tm.Amount = float32(math.Round(amount*100) / 100)
tx, _ := db.Begin()
defer tx.Rollback()
tx.Model(tm).WherePK().UpdateNotZero()
tx.Commit()
return tm
}
func (as *TransactionService) Get(ctx context.Context, am *models.Auth, id string, params *models.Params) *models.Transaction {
db := as.Db.WithContext(ctx)
wm := new(models.Transaction)
wm.Id = id
tx, _ := db.Begin()
defer tx.Rollback()
qry := tx.Model(wm)
common.GenerateEmbed(qry, params.Embed).WherePK().Select()
tx.Commit()
return wm
}

30
pkg/services/wallets.go
View File

@@ -25,13 +25,36 @@ func (as *WalletService) New(ctx context.Context, am *models.NewWalletBody) *mod
return walletModel
}
func (as *WalletService) Get(ctx context.Context, am *models.Auth, embed string) *models.Wallet {
func (as *WalletService) Edit(ctx context.Context, body *models.WalletEdit, id string) *models.Wallet {
db := as.Db.WithContext(ctx)
tm := new(models.Wallet)
tm.Id = id
tm.Name = body.Name
tx, _ := db.Begin()
defer tx.Rollback()
tx.Model(tm).WherePK().UpdateNotZero()
tx.Commit()
return tm
}
func (as *WalletService) Get(ctx context.Context, id string, params *models.Params) *models.Wallet {
db := as.Db.WithContext(ctx)
wm := new(models.Wallet)
wm.Id = id
query := db.Model(wm).Where("? = ?", pg.Ident("user_id"), am.Id)
common.GenerateEmbed(query, embed).Select()
tx, _ := db.Begin()
defer tx.Rollback()
qry := tx.Model(wm)
common.GenerateEmbed(qry, params.Embed).WherePK().Select()
tx.Commit()
return wm
}
@@ -148,7 +171,6 @@ func (as *WalletService) GetHeader(ctx context.Context, am *models.Auth, walletI
wm.Currency = "USD"
wm.WalletId = walletId
return wm
}