Compare commits
1 Commits
staging
...
displaynam
| Author | SHA1 | Date | |
|---|---|---|---|
|
4ffd2d45f3
|
@@ -121,6 +121,11 @@ paths:
|
||||
schema:
|
||||
type: string
|
||||
maxLength: 128
|
||||
- name: DisplayNameSubstring
|
||||
in: query
|
||||
schema:
|
||||
type: string
|
||||
maxLength: 128
|
||||
- name: Creator
|
||||
in: query
|
||||
schema:
|
||||
|
||||
@@ -85,7 +85,7 @@ func (env *Maps) GetAll(ctx context.Context) ([]model.Map, error) {
|
||||
func (env *Maps) List(ctx context.Context, filters datastore.OptionalMap, page model.Page) ([]model.Map, error) {
|
||||
var events []model.Map
|
||||
tx := env.db.Model(&model.Map{})
|
||||
if displayName, ok := filters.Pop("display_name"); ok {
|
||||
if displayName, ok := filters.Pop("display_name_substring"); ok {
|
||||
tx = tx.Where("display_name ILIKE ?", "%"+displayName.(string)+"%")
|
||||
}
|
||||
if err := tx.Where(filters.Map()).Offset(int((page.Number - 1) * page.Size)).Limit(int(page.Size)).Find(&events).Error; err != nil {
|
||||
|
||||
@@ -67,6 +67,9 @@ func NewMapFilter(
|
||||
func (update MapFilter) SetDisplayName(display_name string) {
|
||||
datastore.OptionalMap(update).Add("display_name", display_name)
|
||||
}
|
||||
func (update MapFilter) SetDisplayNameSubstring(display_name string) {
|
||||
datastore.OptionalMap(update).Add("display_name_substring", display_name)
|
||||
}
|
||||
func (update MapFilter) SetCreator(creator string) {
|
||||
datastore.OptionalMap(update).Add("creator", creator)
|
||||
}
|
||||
|
||||
@@ -19,6 +19,8 @@ func (svc *Service) ListMaps(ctx context.Context, params api.ListMapsParams) ([]
|
||||
|
||||
if display_name, display_name_ok := params.DisplayName.Get(); display_name_ok{
|
||||
filter.SetDisplayName(display_name)
|
||||
}else if display_name_substring, display_name_substring_ok := params.DisplayNameSubstring.Get(); display_name_substring_ok{
|
||||
filter.SetDisplayNameSubstring(display_name_substring)
|
||||
}
|
||||
if creator, creator_ok := params.Creator.Get(); creator_ok{
|
||||
filter.SetCreator(creator)
|
||||
|
||||
Reference in New Issue
Block a user