allow filtering with array of contract states #920
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
- register a custome Encoder/Decoder for in the schema pkg for []string param - change the type of ContractFilter to be []string - modify the sql query/ mock tests to check the existing of the state in an array instead of exact equal
Omarabdul3ziz
requested review from
muhamadazmy,
MarioBassem,
ashraffouda,
rawdaGastan,
AbdelrahmanElawady,
xmonader,
sameh-farouk and
Eslam-Nawara
as code owners
grid-proxy/pkg/client/grid_client.go
Outdated
Comment on lines
27
to
30
| if value.Kind() == reflect.Slice && value.Type().Elem().Kind() == reflect.String { | ||
| slice := value.Interface().([]string) | ||
| return strings.Join(slice, ",") | ||
| } |
There was a problem hiding this comment.
I am curious why we are checking value type and its elements type, doesn't the first value in RegisterEncoder guarantee only []string will be passed?
Also, wouldn't something like slice, ok := slice := value.Interface().([]string) work instead of the multiple reflect calls?
| @@ -96,7 +97,7 @@ func (c *RentContract) satisfies(f types.ContractFilter) bool { | |||
| return false | |||
| } | |||
|
|
|||
| if f.State != nil && *f.State != c.State { | |||
| if f.State != nil && len(f.State) != 0 && !containsState(f.State, c.State) { | |||
There was a problem hiding this comment.
I think neither f.State != nil or len(f.State) != 0 is needed, containsState should be enough
| @@ -783,8 +783,13 @@ func (d *PostgresDatabase) GetContracts(ctx context.Context, filter types.Contra | |||
| if filter.Type != nil { | |||
| q = q.Where("type = ?", *filter.Type) | |||
| } | |||
| if filter.State != nil { | |||
| q = q.Where("state ILIKE ?", *filter.State) | |||
| if filter.State != nil && len(filter.State) != 0 { | |||
There was a problem hiding this comment.
no need to check for nil len works fine with nil
…-sdk-go into development_proxy_array_filtering
AbdelrahmanElawady
approved these changes
Apr 21, 2024
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Description
allow filtering with array of contract states
Changes
Related Issues
Checklist