x/stacktach
Code Issues Proposed changes

Returning stacky search results in descending order

Browse Source
This commit is contained in:
Andrew Melton 2013-09-12 15:06:09 -04:00
parent cbf59f6d04
commit 44a0826b87
2 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
stacktach/stacky_server.py
View File

@ -594,7 +594,7 @@ def search(request):
results = []
try:
events = model_search(request, model, filters)
events = model_search(request, model, filters, order_by='-when')
for event in events:
when = dt.dt_from_decimal(event.when)
routing_key_status = routing_key_type(event.routing_key)

13
tests/unit/test_stacky_server.py
View File

@ -1279,7 +1279,9 @@ class StackyServerTestCase(StacktachBaseTestCase):
fake_request = self.mox.CreateMockAnything()
fake_request.GET = {'field': 'tenant', 'value': 'tenant'}
raw = self._create_raw()
models.RawData.objects.filter(tenant='tenant').AndReturn([raw])
results = self.mox.CreateMockAnything()
models.RawData.objects.filter(tenant='tenant').AndReturn(results)
results.order_by('-when').AndReturn([raw])
raw.search_results([], mox.IgnoreArg(), ' ').AndReturn(search_result)
self.mox.ReplayAll()
@ -1300,9 +1302,11 @@ class StackyServerTestCase(StacktachBaseTestCase):
'when_min': '1.1',
'when_max': '2.1'}
raw = self._create_raw()
results = self.mox.CreateMockAnything()
models.RawData.objects.filter(tenant='tenant',
when__gte=decimal.Decimal('1.1'),
when__lte=decimal.Decimal('2.1')).AndReturn([raw])
when__lte=decimal.Decimal('2.1')).AndReturn(results)
results.order_by('-when').AndReturn([raw])
raw.search_results([], mox.IgnoreArg(), ' ').AndReturn(search_result)
self.mox.ReplayAll()
@ -1332,8 +1336,9 @@ class StackyServerTestCase(StacktachBaseTestCase):
raw3 = self._create_raw()
raw2.id = 2
raw3.id = 3
models.RawData.objects.filter(tenant='tenant').AndReturn([raw1, raw2,
raw3])
results = self.mox.CreateMockAnything()
models.RawData.objects.filter(tenant='tenant').AndReturn(results)
results.order_by('-when').AndReturn([raw1, raw2, raw3])
raw1.search_results([], mox.IgnoreArg(), ' ').AndReturn(search_result)
raw2.search_results(search_result, mox.IgnoreArg(),' ').AndReturn(search_result_2)
self.mox.ReplayAll()