Add new name fields to client

piket_client/model.py

@@ -3,7 +3,7 @@ Provides access to the models stored in the database, via the server.
 """
 import datetime
 import logging
-from typing import NamedTuple, Sequence
+from typing import NamedTuple, Sequence, Tuple, Any, Optional
 from urllib.parse import urljoin
 
 import requests
@@ -19,7 +19,7 @@ class ServerStatus:
     """ Provides helper classes to check whether the server is up. """
 
     @classmethod
-    def is_server_running(cls) -> bool:
+    def is_server_running(cls) -> Tuple[bool, Any]:
         try:
             req = requests.get(urljoin(SERVER_URL, "ping"))
 
@@ -50,11 +50,16 @@ class ServerStatus:
 class Person(NamedTuple):
     """ Represents a Person, as retrieved from the database. """
 
-    name: str
+    full_name: str
+    display_name: Optional[str]
     active: bool = True
-    person_id: int = None
+    person_id: Optional[int] = None
     consumptions: dict = {}
 
+    @property
+    def name(self) -> str:
+        return self.display_name or self.full_name
+
     def add_consumption(self, type_id: str) -> bool:
         """ Register a consumption for this Person. """
         req = requests.post(
@@ -182,7 +187,8 @@ class Person(NamedTuple):
     def from_dict(cls, data: dict) -> "Person":
         """ Reconstruct a Person object from a dict. """
         return Person(
-            name=data["name"],
+            full_name=data["full_name"],
+            display_name=data["display_name"],
             active=data["active"],
             person_id=data["person_id"],
             consumptions=data["consumptions"],