jacob1123/budgeteer
1
1
Fork 0
Code Issues 12 Pull Requests 1 Packages Releases 1 Wiki Activity

Merge pull request 'Fix GroupID not being set for original transaction' (#27) from hotfix-transfers into master
All checks were successful
continuous-integration/drone/push Build is passing
Details

Browse Source 
Reviewed-on: #27
This commit is contained in:
Jan Bader 2022-02-27 22:53:19 +01:00
commit d8a96535dc
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
server/transaction.go
View File

@ -57,11 +57,13 @@ func (h *Handler) newTransaction(c *gin.Context) {
} }
if payload.Payee.Type == "account" { if payload.Payee.Type == "account" {
err := h.CreateTransferForOtherAccount(newTransaction, amount, payload, c) groupID, err := h.CreateTransferForOtherAccount(newTransaction, amount, payload, c)
if err != nil { if err != nil {
c.AbortWithError(http.StatusInternalServerError, err) c.AbortWithError(http.StatusInternalServerError, err)
return return
} }
newTransaction.GroupID = groupID
} else { } else {
payeeID, err := GetPayeeID(c.Request.Context(), payload, h) payeeID, err := GetPayeeID(c.Request.Context(), payload, h)
if err != nil { if err != nil {
@ -119,7 +121,7 @@ func (h *Handler) UpdateTransaction(payload NewTransactionPayload, amount numeri
c.JSON(http.StatusOK, transaction) c.JSON(http.StatusOK, transaction)
} }
func (h *Handler) CreateTransferForOtherAccount(newTransaction postgres.CreateTransactionParams, amount numeric.Numeric, payload NewTransactionPayload, c *gin.Context) error { func (h *Handler) CreateTransferForOtherAccount(newTransaction postgres.CreateTransactionParams, amount numeric.Numeric, payload NewTransactionPayload, c *gin.Context) (uuid.NullUUID, error) {
newTransaction.GroupID = uuid.NullUUID{UUID: uuid.New(), Valid: true} newTransaction.GroupID = uuid.NullUUID{UUID: uuid.New(), Valid: true}
newTransaction.Amount = amount.Neg() newTransaction.Amount = amount.Neg()
newTransaction.AccountID = payload.Payee.ID.UUID newTransaction.AccountID = payload.Payee.ID.UUID
@ -129,9 +131,9 @@ func (h *Handler) CreateTransferForOtherAccount(newTransaction postgres.CreateTr
_, err := h.Service.CreateTransaction(c.Request.Context(), newTransaction) _, err := h.Service.CreateTransaction(c.Request.Context(), newTransaction)
if err != nil { if err != nil {
return fmt.Errorf("create transfer transaction: %w", err) return uuid.NullUUID{}, fmt.Errorf("create transfer transaction: %w", err)
} }
return nil return newTransaction.GroupID, nil
} }
func GetPayeeID(context context.Context, payload NewTransactionPayload, h *Handler) (uuid.NullUUID, error) { func GetPayeeID(context context.Context, payload NewTransactionPayload, h *Handler) (uuid.NullUUID, error) {