Add "people list"

piket_client/cli.py

@@ -3,6 +3,7 @@ from piket_client.model import (
     ServerStatus,
     NetworkError,
     Consumption,
+    Person,
     Settlement,
     ConsumptionType,
 )
@@ -47,6 +48,28 @@ def people():
     pass
 
 
+@people.command("list")
+@click.option("--active/--inactive", default=None)
+def list_people(active: bool) -> None:
+    people = Person.get_all(active=active)
+
+    if isinstance(people, NetworkError):
+        print_error(f"Could not get people: {people.value}")
+        return
+
+    table = PrettyTable()
+    table.field_names = ["ID", "Full name", "Display name", "Active"]
+    table.align["ID"] = "r"
+    table.align["Full name"] = "l"
+    table.align["Display name"] = "l"
+    table.sortby = "Full name"
+
+    for p in people:
+        table.add_row([p.person_id, p.full_name, p.display_name, p.active])
+
+    print(table)
+
+
 @cli.group()
 def settlements():
     pass

piket_client/model.py

@@ -201,29 +201,28 @@ class Person(NamedTuple):
             return None
 
     @classmethod
-    def get_all(cls, active=None) -> Optional[List[Person]]:
+    def get_all(cls, active=None) -> Union[List[Person], NetworkError]:
         """ Get all active People. """
         params = {}
         if active is not None:
             params["active"] = int(active)
 
-        req = requests.get(urljoin(SERVER_URL, "/people"), params=params)
-
         try:
+            req = requests.get(urljoin(SERVER_URL, "/people"), params=params)
+            req.raise_for_status()
             data = req.json()
+            return [Person.from_dict(item) for item in data["people"]]
 
-            if "error" in data:
-                LOG.warning("Could not get people (%s): %s", req.status_code, data)
+        except requests.ConnectionError as e:
+            LOG.exception(e)
+            return NetworkError.ConnectionFailure
 
-            return [Person.from_dict(item) for item in data["people"]]
+        except requests.HTTPError as e:
+            LOG.exception(e)
+            return NetworkError.HttpFailure
 
-        except ValueError:
-            LOG.error(
-                "Did not get JSON from server on getting People (%s): %s",
-                req.status_code,
-                req.content,
-            )
-            return None
+        except ValueError as e:
+            return NetworkError.InvalidData
 
     @classmethod
     def from_dict(cls, data: dict) -> "Person":
@@ -355,7 +354,6 @@ class ConsumptionType(NamedTuple):
             LOG.exception(e)
             return NetworkError.InvalidData
 
-
     @classmethod
     def get(cls, consumption_type_id: int) -> Union[ConsumptionType, NetworkError]:
         """ Retrieve a ConsumptionType by id. """