Skip to content
This repository has been archived by the owner on Apr 2, 2024. It is now read-only.

Fixed sorting of transactions #149

Merged
merged 1 commit into from
Jul 19, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions definitions.go
Original file line number Diff line number Diff line change
Expand Up @@ -90,6 +90,7 @@ const (
// Internal field names
aliasField = "alias"
broadcastStatusField = "broadcast_status"
createdAtField = "created_at"
currentBalanceField = "current_balance"
domainField = "domain"
draftIDField = "draft_id"
Expand Down
14 changes: 9 additions & 5 deletions model_sync_transactions.go
Original file line number Diff line number Diff line change
Expand Up @@ -129,10 +129,14 @@ func getSyncTransactionsByConditions(ctx context.Context, conditions map[string]
queryParams *datastore.QueryParams, opts ...ModelOps) ([]*SyncTransaction, error) {

if queryParams == nil {
queryParams = &datastore.QueryParams{}
queryParams = &datastore.QueryParams{
OrderByField: createdAtField,
SortDirection: datastore.SortAsc,
}
} else if queryParams.OrderByField == "" || queryParams.SortDirection == "" {
queryParams.OrderByField = createdAtField
queryParams.SortDirection = datastore.SortAsc
}
queryParams.OrderByField = idField
queryParams.SortDirection = datastore.SortAsc

// Get the records
var models []SyncTransaction
Expand Down Expand Up @@ -346,8 +350,8 @@ func processBroadcastTransactions(ctx context.Context, maxTransactions int, opts
queryParams := &datastore.QueryParams{
Page: 1,
PageSize: maxTransactions,
OrderByField: "created_at",
SortDirection: "asc",
OrderByField: createdAtField,
SortDirection: datastore.SortAsc,
}

// Get x records
Expand Down