[SuperAdmin] Add optional word clause to query for providers #1552
Conversation
|
@ecurrencyhodler I have also added a query for the 'metrics/bounties/count' endpoint to ensure alignment with the "metrics/bounties" endpoints. Additionally, I have provided unit tests for both scenarios: metrics bounties and metrics bounties count. |
handlers/metrics.go
Outdated
| @@ -227,6 +233,8 @@ func (mh *metricHandler) MetricsBountiesCount(w http.ResponseWriter, r *http.Req | |||
| return | |||
| } | |||
|
|
|||
| request.Providers = providers | |||
There was a problem hiding this comment.
Don't pass the providers to the request variable, get it from the request.Query
| }, | ||
| } | ||
| // Mock the database call to return bounties for the selected providers | ||
| mockDb.On("GetBountiesByDateRange", dateRange, req).Return(bounties).Once() |
There was a problem hiding this comment.
You don't need to mock this amount of Providers, the you don't have this amount of DB calls in the request handler
db/metrics.go
Outdated
| @@ -226,9 +233,16 @@ func (db database) GetBountiesByDateRangeCount(r PaymentDateRange, re *http.Requ | |||
| statusQuery = "" | |||
| } | |||
|
|
|||
| var providerCondition string | |||
| if len(r.Providers) > 0 { | |||
| providerCondition = " AND owner_id IN ('" + strings.Join(r.Providers, "','") + "')" | |||
There was a problem hiding this comment.
owner_id is for the user pubkey we're looking for org_uuid
here is a reference to the bounty object
Line 373 in e051c0d
There was a problem hiding this comment.
@kevkevinpal provider is the person who created the bounty. Please check these comments #1547 (comment) and #1547 (comment)
db/metrics.go
Outdated
| if len(r.Providers) > 0 { | ||
| providerCondition = " AND owner_id IN ('" + strings.Join(r.Providers, "','") + "')" | ||
| } else { | ||
| providerCondition = "" |
There was a problem hiding this comment.
lets initialize the providerCondition with this emptystring value
db/metrics.go
Outdated
| @@ -193,7 +193,14 @@ func (db database) GetBountiesByDateRange(r PaymentDateRange, re *http.Request) | |||
| limitQuery = fmt.Sprintf("LIMIT %d OFFSET %d", limit, offset) | |||
| } | |||
|
|
|||
| query := `SELECT * FROM public.bounty WHERE created >= '` + r.StartDate + `' AND created <= '` + r.EndDate + `'` | |||
| var providerCondition string | |||
There was a problem hiding this comment.
let's rename this to orgFilter since it matches org_uuid better
db/structs.go
Outdated
| @@ -611,6 +611,7 @@ type PaymentDateRange struct { | |||
| StartDate string `json:"start_date"` | |||
| EndDate string `json:"end_date"` | |||
| PaymentType PaymentType `json:"payment_type,omitempty"` | |||
| Providers []string `json:"providers,omitempty"` | |||
There was a problem hiding this comment.
let's change this to OrgFilter
|
@FaisalIqbal211 The providers should be a comma separate string |
@elraphty Done |
|
@elraphty @kevkevinpal Needs your attention at this PR. |
handlers/metrics_test.go
Outdated
| } | ||
|
|
||
| // Provide multiple provider IDs in the request query parameters | ||
| req.URL.RawQuery = "provider=provider1&provider=provider2&provider=provider3" |
There was a problem hiding this comment.
@FaisalIqbal211 you have not updated the test to accept, a comma-separated provider string.
There was a problem hiding this comment.
@elraphty Addressed
|
Describe your changes
https://www.loom.com/share/93cb4eba1c65413bace24e66984a6121
Issue ticket number and link
Closes #1547
Type of change
Please delete options that are not relevant.
Checklist before requesting a review