diff --git a/ee/reconciliation/internal/models/policy.go b/ee/reconciliation/internal/models/policy.go index fd57d3b3e8..44ad2f521f 100644 --- a/ee/reconciliation/internal/models/policy.go +++ b/ee/reconciliation/internal/models/policy.go @@ -8,15 +8,15 @@ import ( ) type Policy struct { - bun.BaseModel `bun:"reconciliations.policy"` + bun.BaseModel `bun:"reconciliations.policy" json:"-"` // Policy Related fields - ID uuid.UUID `bun:",pk,nullzero"` - CreatedAt time.Time `bun:",notnull"` - Name string `bun:",notnull"` + ID uuid.UUID `bun:",pk,nullzero" json:"id"` + CreatedAt time.Time `bun:",notnull" json:"createdAt"` + Name string `bun:",notnull" json:"name"` // Reconciliation Needed fields - LedgerName string `bun:",notnull"` - LedgerQuery map[string]interface{} `bun:",type:jsonb,notnull"` - PaymentsPoolID uuid.UUID `bun:",notnull"` + LedgerName string `bun:",notnull" json:"ledgerName"` + LedgerQuery map[string]interface{} `bun:",type:jsonb,notnull" json:"ledgerQuery"` + PaymentsPoolID uuid.UUID `bun:",notnull" json:"paymentsPoolID"` } diff --git a/ee/reconciliation/internal/models/reconciliation.go b/ee/reconciliation/internal/models/reconciliation.go index 82be5adcc9..5b681f944b 100644 --- a/ee/reconciliation/internal/models/reconciliation.go +++ b/ee/reconciliation/internal/models/reconciliation.go @@ -20,14 +20,14 @@ func (r ReconciliationStatus) String() string { } type Reconciliation struct { - bun.BaseModel `bun:"reconciliations.reconciliation"` + bun.BaseModel `bun:"reconciliations.reconciliation" json:"-"` - ID uuid.UUID `bun:",pk,nullzero"` - PolicyID uuid.UUID `bun:",nullzero"` - CreatedAt time.Time `bun:",nullzero"` - ReconciledAt time.Time `bun:",nullzero"` - Status ReconciliationStatus - LedgerBalances map[string]*big.Int `bun:",jsonb"` - PaymentsBalances map[string]*big.Int `bun:",jsonb"` - Error string + ID uuid.UUID `bun:",pk,nullzero" json:"id"` + PolicyID uuid.UUID `bun:",nullzero" json:"policyID"` + CreatedAt time.Time `bun:",nullzero" json:"createdAt"` + ReconciledAt time.Time `bun:",nullzero" json:"reconciledAt"` + Status ReconciliationStatus `json:"status"` + LedgerBalances map[string]*big.Int `bun:",jsonb" json:"ledgerBalances" ` + PaymentsBalances map[string]*big.Int `bun:",jsonb" json:"paymentsBalances" ` + Error string `json:"error"` }