Skip to content

Commit

Permalink
Merge pull request #78 from LerianStudio/feature/MZ-479
Browse files Browse the repository at this point in the history
Feature/MZ-479
  • Loading branch information
MartinezAvellan authored Oct 2, 2024
2 parents 049aebc + 3779924 commit 9824d28
Show file tree
Hide file tree
Showing 36 changed files with 2,167 additions and 982 deletions.
10 changes: 10 additions & 0 deletions common/constant/transaction.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
package constant

const (
CREATED = "CREATED"
APPROVED = "APPROVED"
PREAPPROVED = "PRE_APPROVED"
SENT = "SENT"
CANCELED = "CANCELED"
DECLINED = "DECLINED"
)
26 changes: 13 additions & 13 deletions common/gold/transaction/model/transaction.go
Original file line number Diff line number Diff line change
Expand Up @@ -31,12 +31,12 @@ type Source struct {
}

type FromTo struct {
Account string `json:"account,omitempty"`
Amount *Amount `json:"amount,omitempty"`
Share *Share `json:"share,omitempty"`
Remaining string `json:"remaining,omitempty"`
Description string `json:"description,omitempty"`
Metadata []Metadata `json:"metadata,omitempty"`
Account string `json:"account,omitempty"`
Amount *Amount `json:"amount,omitempty"`
Share *Share `json:"share,omitempty"`
Remaining string `json:"remaining,omitempty"`
Description string `json:"description,omitempty"`
Metadata map[string]any `json:"metadata,omitempty"`
}

type Distribute struct {
Expand All @@ -46,11 +46,11 @@ type Distribute struct {
}

type Transaction struct {
ChartOfAccountsGroupName string `json:"chartOfAccountsGroupName"`
Description string `json:"description,omitempty"`
Code string `json:"code,omitempty"`
Pending bool `json:"pending,omitempty"`
Metadata []Metadata `json:"metadata,omitempty"`
Send Send `json:"send,omitempty"`
Distribute Distribute `json:"distribute,omitempty"`
ChartOfAccountsGroupName string `json:"chartOfAccountsGroupName"`
Description string `json:"description,omitempty"`
Code string `json:"code,omitempty"`
Pending bool `json:"pending,omitempty"`
Metadata map[string]any `json:"metadata,omitempty"`
Send Send `json:"send,omitempty"`
Distribute Distribute `json:"distribute,omitempty"`
}
20 changes: 10 additions & 10 deletions common/gold/transaction/parse.go
Original file line number Diff line number Diff line change
Expand Up @@ -35,9 +35,9 @@ func (v *TransactionVisitor) VisitTransaction(ctx *parser.TransactionContext) an
pending = v.VisitPending(ctx.Pending().(*parser.PendingContext)).(bool)
}

var metadata []model.Metadata
var metadata map[string]any
if ctx.Metadata() != nil {
metadata = v.VisitMetadata(ctx.Metadata().(*parser.MetadataContext)).([]model.Metadata)
metadata = v.VisitMetadata(ctx.Metadata().(*parser.MetadataContext)).(map[string]any)
}

send := v.VisitSend(ctx.Send().(*parser.SendContext)).(model.Send)
Expand Down Expand Up @@ -86,14 +86,14 @@ func (v *TransactionVisitor) VisitVisitChartOfAccounts(ctx *parser.ChartOfAccoun
}

func (v *TransactionVisitor) VisitMetadata(ctx *parser.MetadataContext) any {
metas := make([]model.Metadata, 0, len(ctx.AllPair()))
metadata := make(map[string]any, len(ctx.AllPair()))

for _, pair := range ctx.AllPair() {
meta := v.VisitPair(pair.(*parser.PairContext)).(model.Metadata)
metas = append(metas, meta)
m := v.VisitPair(pair.(*parser.PairContext)).(model.Metadata)
metadata[m.Key] = m.Value
}

return metas
return metadata
}

func (v *TransactionVisitor) VisitPair(ctx *parser.PairContext) any {
Expand Down Expand Up @@ -220,9 +220,9 @@ func (v *TransactionVisitor) VisitFrom(ctx *parser.FromContext) any {
description = v.VisitDescription(ctx.Description().(*parser.DescriptionContext)).(string)
}

var metadata []model.Metadata
var metadata map[string]any
if ctx.Metadata() != nil {
metadata = v.VisitMetadata(ctx.Metadata().(*parser.MetadataContext)).([]model.Metadata)
metadata = v.VisitMetadata(ctx.Metadata().(*parser.MetadataContext)).(map[string]any)
}

var amount model.Amount
Expand Down Expand Up @@ -262,9 +262,9 @@ func (v *TransactionVisitor) VisitTo(ctx *parser.ToContext) any {
description = v.VisitDescription(ctx.Description().(*parser.DescriptionContext)).(string)
}

var metadata []model.Metadata
var metadata map[string]any
if ctx.Metadata() != nil {
metadata = v.VisitMetadata(ctx.Metadata().(*parser.MetadataContext)).([]model.Metadata)
metadata = v.VisitMetadata(ctx.Metadata().(*parser.MetadataContext)).(map[string]any)
}

var amount model.Amount
Expand Down
Loading

0 comments on commit 9824d28

Please sign in to comment.