Skip to content

Commit

Permalink
Added search arg in List tasks API
Browse files Browse the repository at this point in the history
  • Loading branch information
snyaggarwal committed Apr 26, 2023
1 parent e06f275 commit 6b6cf29
Show file tree
Hide file tree
Showing 2 changed files with 32 additions and 1 deletion.
5 changes: 4 additions & 1 deletion flower/api/tasks.py
Original file line number Diff line number Diff line change
Expand Up @@ -524,6 +524,7 @@ def get(self):
received_start = self.get_argument('received_start', None)
received_end = self.get_argument('received_end', None)
sort_by = self.get_argument('sort_by', None)
search = self.get_argument('search', None)

limit = limit and int(limit)
offset = max(offset, 0)
Expand All @@ -536,7 +537,9 @@ def get(self):
app.events, limit=limit, offset=offset, sort_by=sort_by, type=type,
worker=worker, state=state,
received_start=received_start,
received_end=received_end):
received_end=received_end,
search=search
):
task = tasks.as_dict(task)
worker = task.pop('worker', None)
if worker is not None:
Expand Down
28 changes: 28 additions & 0 deletions tests/unit/api/test_tasks.py
Original file line number Diff line number Diff line change
Expand Up @@ -191,3 +191,31 @@ def test_tasks_pagination(self):
self.assertEqual("task2", firstFetchedTaskName)
self.assertEqual("task3", lastFetchedTaskName)

# Test limit 4 with search
params = dict(limit=4, offset=0, sort_by='name', search='task')

r = self.get('/api/tasks?' + '&'.join(
map(lambda x: '%s=%s' % x, params.items())))

table = json.loads(r.body.decode("utf-8"), object_pairs_hook=OrderedDict)

self.assertEqual(200, r.code)
self.assertEqual(4, len(table))
firstFetchedTaskName = table[list(table)[0]]['name']
lastFetchedTaskName = table[list(table)[-1]]['name']
self.assertEqual("task1", firstFetchedTaskName)
self.assertEqual("task4", lastFetchedTaskName)

# Test limit 4 with search
params = dict(limit=4, offset=0, sort_by='name', search='task1')

r = self.get('/api/tasks?' + '&'.join(
map(lambda x: '%s=%s' % x, params.items())))

table = json.loads(r.body.decode("utf-8"), object_pairs_hook=OrderedDict)

self.assertEqual(200, r.code)
self.assertEqual(1, len(table))
firstFetchedTaskName = table[list(table)[0]]['name']
self.assertEqual("task1", firstFetchedTaskName)

0 comments on commit 6b6cf29

Please sign in to comment.