Make user-friendly status filter multi-search #43
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
krithika369
commented
Oct 12, 2022
| err = database.Migrate(cfg.DbConfig) | ||
| if err != nil { | ||
| panic(err) | ||
| } | ||
| db.LogMode(false) |
There was a problem hiding this comment.
This is now added to management-service/database/database.go, as a part of the Gorm config, when opening the DB connection. Ref: https://gorm.io/docs/logger.html
| @@ -49,12 +49,15 @@ func NewServer(configFiles []string) (*Server, error) { | |||
| if err != nil { | |||
| panic(err) | |||
| } | |||
| sqlDB, err := db.DB() | |||
There was a problem hiding this comment.
Gorm doesn't expose a close method anymore on its DB. We have to grab the underlying SQL db and close it.
| OR tstzrange(start_time, end_time, '()') @> tstzrange(?, ?, '[]') | ||
| OR tstzrange(?, ?, '[]') @> tstzrange(start_time, end_time, '[)')`, | ||
| params.StartTime, params.StartTime, params.EndTime, params.EndTime, params.StartTime, params.EndTime, | ||
| svc.query(). |
There was a problem hiding this comment.
Refactoring this OR clause to use the APIs rather than raw query string, since the new version of the Gorm API supports it correctly.
deadlycoconuts
approved these changes
Oct 17, 2022
| } | ||
| } | ||
| if len(params.StatusFriendly) > 0 { | ||
| query = svc.filterExperimentStatusFriendly(query, params.StatusFriendly) |
There was a problem hiding this comment.
Thanks for refactoring this into a separate method!
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.
What this PR does / why we need it: This is a follow up from the previous PR #42 which introduced a search filter for the experiments using user-friendly status names. However, in that PR, the API was only designed to take in a single value. This PR makes it possible to search using multiple values of the status, to match any of them. This required the underlying
gormlibrary to be upgraded, as the OR clauses were not gracefully handled in the older version.Illustration
multiSelectStatus.mov
Search Filter Changes
api/experiments.yaml- Accept multiple values forstatus_friendly, in List Experiments filtersmanagement-service/controller/experiment_controller.go- Handle multiple values forstatus_friendlyin List API search filtersmanagement-service/services/experiment_service.go- AddfilterExperimentStatusFriendlyto handle matching the status values.ui/src/experiments/list/search/components/ExperimentStatusFilter.js- Make the status filter multiselectGORM upgrade
github.com/jinzhu/gorm->gorm.io/gorm@ latestgithub.com/jinzhu/gorm/dialects/postgres->gorm.io/driver/postgres@ latestmanagement-service/database/database.go,management-service/server/server.go,management-service/internal/testutils/database.go- DB init / close related API changesmanagement-service/models/experiment.go,management-service/models/experiment_history.go- AddAfterFindhook as the new ORM version doesn't respect the timezone info in the connection string.int/int32/int64conversions in OFFSET / LIMIT / COUNT queries to match the new APIssavefunction in every service that saves the data to the DB is refactored to use Upsert instead of Create / Update. This is needed because theNewRecordfunction from Gorm v1 no longer exists. Ref: https://gorm.io/docs/create.html#Upsert-x2F-On-Conflict