per_person_counts, NetworkError in client Settlement

piket_client/model.py

@@ -7,7 +7,7 @@ import datetime
 import enum
 import logging
 from dataclasses import dataclass
-from typing import Any, List, NamedTuple, Optional, Sequence, Tuple, Union
+from typing import Any, Dict, List, NamedTuple, Optional, Sequence, Tuple, Union
 from urllib.parse import urljoin
 
 import requests
@@ -473,8 +473,9 @@ class Settlement(NamedTuple):
 
     settlement_id: int
     name: str
-    consumption_summary: dict
-    count_info: dict = {}
+    consumption_summary: Dict[str, Any]
+    count_info: Dict[str, Any] = {}
+    per_person_counts: Dict[str, Any] = {}
 
     @classmethod
     def from_dict(cls, data: dict) -> "Settlement":
@@ -482,7 +483,8 @@ class Settlement(NamedTuple):
             settlement_id=data["settlement_id"],
             name=data["name"],
             consumption_summary=data["consumption_summary"],
-            count_info=data.get("count_info", {}),
+            count_info=data["count_info"],
+            per_person_counts=data["per_person_counts"],
         )
 
     @classmethod
@@ -494,22 +496,23 @@ class Settlement(NamedTuple):
         return cls.from_dict(req.json()["settlement"])
 
     @classmethod
-    def get(cls, settlement_id: int) -> Optional[Settlement]:
-        req = requests.get(urljoin(SERVER_URL, f"/settlements/{settlement_id}"))
-
+    def get(cls, settlement_id: int) -> Union[Settlement, NetworkError]:
         try:
+            req = requests.get(urljoin(SERVER_URL, f"/settlements/{settlement_id}"))
+            req.raise_for_status()
             data = req.json()
-        except ValueError:
-            LOG.error(
-                "Did not get JSON on retrieving Settlement (%s): %s",
-                req.status_code,
-                req.content,
-            )
-            return None
 
-        if "error" in data or req.status_code != 200:
-            LOG.error("Could not get Export (%s): %s", req.status_code, data)
-            return None
+        except ValueError as e:
+            LOG.exception(e)
+            return NetworkError.InvalidData
+
+        except requests.ConnectionError as e:
+            LOG.exception(e)
+            return NetworkError.ConnectionFailure
+
+        except requests.HTTPError as e:
+            LOG.exception(e)
+            return NetworkError.HttpFailure
 
         data["settlement"]["count_info"] = data["count_info"]
 

piket_server/models.py

@@ -3,6 +3,8 @@ Defines database models used by the server.
 """
 
 import datetime
+from typing import List, Dict, Any
+from collections import defaultdict
 
 from sqlalchemy import func
 from sqlalchemy.exc import SQLAlchemyError
@@ -86,6 +88,7 @@ class Settlement(db.Model):
             "name": self.name,
             "consumption_summary": self.consumption_summary,
             "unique_people": self.unique_people,
+            "per_person_counts": self.per_person_counts,
         }
 
     @property
@@ -146,6 +149,43 @@ class Settlement(db.Model):
 
         return result
 
+    @property
+    def per_person_counts(self) -> Dict[int, Any]:
+        """
+        Output a more usable dict containing for each person in the settlement
+        how many of each consumption type was counted.
+        """
+
+        q = (
+            Consumption.query.filter_by(settlement=self)
+            .filter_by(reversed=False)
+            .group_by(Consumption.person_id)
+            .group_by(Consumption.consumption_type_id)
+            .group_by(Person.full_name)
+            .outerjoin(Person)
+            .with_entities(
+                Consumption.person_id,
+                Person.full_name,
+                Consumption.consumption_type_id,
+                func.count(Consumption.consumption_id),
+            )
+            .all()
+        )
+
+        res: Dict[int, Any] = defaultdict(dict)
+
+        for row in q:
+            item = res[row[0]]
+            item["full_name"] = row[1]
+            if not item.get("counts"):
+                item["counts"] = {}
+
+            item["counts"][row[2]] = row[3]
+
+        return res
+
+
+
 
 class ConsumptionType(db.Model):
     """ Represents a type of consumption to be counted. """

setup.py

@@ -25,7 +25,7 @@ setup(
     extras_require={
         "dev": ["black", "pylint", "mypy", "isort"],
         "server": ["Flask", "SQLAlchemy", "Flask-SQLAlchemy", "alembic", "uwsgi"],
-        "client": ["PySide2", "qdarkstyle>=2.6.0", "requests", "simpleaudio", "click"],
+        "client": ["PySide2", "qdarkstyle>=2.6.0", "requests", "simpleaudio", "click", "prettytable"],
         "osk": ["dbus-python"],
         "sentry": ["raven"],
     },