Skip to content

Commit 93b9929

Browse files
authored
fix(SPV-1249): wrong additional field for admin for PaymailFilter (#803)
1 parent 492beda commit 93b9929

1 file changed

Lines changed: 4 additions & 4 deletions

File tree

models/filter/paymail_filter.go

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ type PaymailFilter struct {
77
ModelFilter `json:",inline,squash"`
88

99
ID *string `json:"id,omitempty" example:"ffb86c103d17d87c15aaf080aab6be5415c9fa885309a79b04c9910e39f2b542"`
10-
XpubID *string `json:"xpubId,omitempty" example:"79f90a6bab0a44402fc64828af820e9465645658aea2d138c5205b88e6dabd00"`
10+
Alias *string `json:"alias,omitempty" example:"alice"`
1111
Domain *string `json:"domain,omitempty" example:"example.com"`
1212
PublicName *string `json:"publicName,omitempty" example:"Alice"`
1313
}
@@ -21,7 +21,7 @@ func (d *PaymailFilter) ToDbConditions() map[string]interface{} {
2121

2222
// Column names come from the database model, see: /engine/model_paymail_addresses.go
2323
applyIfNotNil(conditions, "id", d.ID)
24-
applyIfNotNil(conditions, "xpub_id", d.XpubID)
24+
applyIfNotNil(conditions, "alias", d.Alias)
2525
applyIfNotNil(conditions, "domain", d.Domain)
2626
applyIfNotNil(conditions, "public_name", d.PublicName)
2727

@@ -32,7 +32,7 @@ type AdminPaymailFilter struct {
3232
//lint:ignore SA5008 We want to reuse json tags also to mapstructure.
3333
PaymailFilter `json:",inline,squash"`
3434

35-
Alias *string `json:"alias,omitempty" example:"alice"`
35+
XpubID *string `json:"xpubId,omitempty" example:"79f90a6bab0a44402fc64828af820e9465645658aea2d138c5205b88e6dabd00"`
3636
}
3737

3838
func (d *AdminPaymailFilter) ToDbConditions() map[string]interface{} {
@@ -42,7 +42,7 @@ func (d *AdminPaymailFilter) ToDbConditions() map[string]interface{} {
4242
conditions := d.PaymailFilter.ToDbConditions()
4343

4444
// Column names come from the database model, see: /engine/model_paymail_addresses.go
45-
applyIfNotNil(conditions, "alias", d.Alias)
45+
applyIfNotNil(conditions, "xpub_id", d.XpubID)
4646

4747
return conditions
4848
}

0 commit comments

Comments
 (0)