fix: order_by on filtered hosts

Closes: #511
Change-Id: I4d3af32f5e67cd6e744e0bfa8cc043c9a71d44ea

src/quads/server/dao/baseDao.py

@@ -65,15 +65,17 @@ def safe_commit() -> bool:
             return False
 
     @classmethod
-    def create_query_select(cls, model, filters=None, columns=None, group_by=None):
+    def create_query_select(cls, model, filters=None, columns=None, group_by=None, order_by=None):
         """
         Create a query to select data from a model with filters and columns.
         :param model: The model to query.
         :param filters: A list of filter expressions.
         :param columns: A list of columns to select.
         :param group_by: A column to group by.
+        :param order_by: A column to order by.
         :return: The query result.
         """
+        group_by_column = None
         if group_by:
             group_by_column = cls.get_group_by_column(model=model, group_by=group_by)
             query_columns = [group_by_column, func.count(group_by_column)]
@@ -113,8 +115,10 @@ def create_query_select(cls, model, filters=None, columns=None, group_by=None):
                 if value == "null":
                     value = None
                 query = query.filter(getattr(column, attr)(value))
-        if group_by:
+        if group_by_column:
             query = query.group_by(group_by_column)
+        if order_by is not None and not group_by:
+            query = query.order_by(order_by)
         return query.all()
 
     @classmethod

src/quads/server/dao/host.py

@@ -17,7 +17,9 @@
 
 class HostDao(BaseDao):
     @classmethod
-    def create_host(cls, name: str, model: str, host_type: str, default_cloud: str) -> Host:
+    def create_host(
+        cls, name: str, model: str, host_type: str, default_cloud: str
+    ) -> Host:
         _host_obj = cls.get_host(name)
         if _host_obj:
             raise EntryExisting
@@ -93,7 +95,11 @@ def get_hosts() -> List[Host]:
 
     @staticmethod
     def get_host_models():
-        host_models = db.session.query(Host.model, func.count(Host.model)).group_by(Host.model).all()
+        host_models = (
+            db.session.query(Host.model, func.count(Host.model))
+            .group_by(Host.model)
+            .all()
+        )
         return host_models
 
     @staticmethod
@@ -145,7 +151,9 @@ def filter_hosts_dict(data: dict) -> List[Host]:
                         value,
                     )
                 )
-        _hosts = HostDao.create_query_select(Host, filters=filter_tuples, group_by=group_by)
+        _hosts = HostDao.create_query_select(
+            Host, filters=filter_tuples, group_by=group_by, order_by=Host.name.asc()
+        )
         return _hosts
 
     @staticmethod

tests/cli/test_report.py

@@ -48,8 +48,8 @@ def test_report_available(self, remove_fixture):
         assert self._caplog.messages[0].startswith("QUADS report for ")
         assert self._caplog.messages[1].startswith("Percentage Utilized: ")
         assert self._caplog.messages[2] == "Server Type | Total|  Free| Scheduled| 2 weeks| 4 weeks"
-        assert self._caplog.messages[3].startswith("R930        |     1|     0|      100%")
-        assert self._caplog.messages[4].startswith("R640        |     1|     0|      100%")
+        assert self._caplog.messages[3].startswith("R640        |     1|     0|      100%")
+        assert self._caplog.messages[4].startswith("R930        |     1|     0|      100%")
 
     def test_report_scheduled(self, remove_fixture):
         today = datetime.now()