Restore newest-first ordering in listEvents

Author: MitchDrage

server/src/main/java/com/cloud/event/dao/EventJoinDaoImpl.java

@@ -137,7 +137,9 @@ public List<EventJoinVO> searchByIds(Long... ids) {
         }
         SearchCriteria<EventJoinVO> sc = vrSearch.create();
         sc.setParameters("idIN", ids);
-        return searchIncludingRemoved(sc, null, null, false);
+        Filter filter = new Filter(EventJoinVO.class, "createDate", false);
+        filter.addOrderBy(EventJoinVO.class, "id", false);
+        return searchIncludingRemoved(sc, filter, null, false);
     }
 
     @Override

server/src/test/java/com/cloud/event/dao/EventJoinDaoImplTest.java

@@ -19,17 +19,20 @@
 
 import com.cloud.api.query.vo.EventJoinVO;
 import com.cloud.utils.db.EntityManager;
+import com.cloud.utils.db.Filter;
 import com.cloud.vm.VirtualMachine;
 import org.apache.cloudstack.api.ApiCommandResourceType;
 import org.apache.cloudstack.api.response.EventResponse;
 import org.junit.Assert;
 import org.junit.Test;
 import org.junit.runner.RunWith;
+import org.mockito.ArgumentCaptor;
 import org.mockito.InjectMocks;
 import org.mockito.Mock;
 import org.mockito.Mockito;
 import org.mockito.junit.MockitoJUnitRunner;
 
+import java.util.ArrayList;
 import java.util.UUID;
 
 @RunWith(MockitoJUnitRunner.class)
@@ -62,4 +65,17 @@ public void testNewEventViewResource() {
         Assert.assertEquals(response.getResourceType(), resourceType);
         Assert.assertEquals(response.getResourceName(), resourceName);
     }
+
+    @Test
+    public void testSearchByIdsOrdersNewestFirst() {
+        EventJoinDaoImpl spyDao = Mockito.spy(dao);
+        ArgumentCaptor<Filter> filterCaptor = ArgumentCaptor.forClass(Filter.class);
+        Mockito.doReturn(new ArrayList<EventJoinVO>()).when(spyDao)
+                .searchIncludingRemoved(Mockito.any(), filterCaptor.capture(), Mockito.any(), Mockito.anyBoolean());
+
+        spyDao.searchByIds(1L, 2L, 3L);
+
+        Assert.assertNotNull("searchByIds must pass an ordering filter", filterCaptor.getValue());
+        Assert.assertEquals(" ORDER BY event_view.created DESC , event_view.id DESC ", filterCaptor.getValue().getOrderBy());
+    }
 }