Add People API to server, rework client to use it

piket_client/gui.py

@@ -2,6 +2,7 @@
 Provides the graphical front-end for Piket.
 """
 import sys
+from urllib.parse import urljoin
 
 from PySide2.QtWidgets import QApplication, QPushButton, QGridLayout, QWidget
 from PySide2.QtGui import QFont
@@ -15,22 +16,21 @@ def plop() -> None:
     PLOP_WAVE.play()
 
 
-from piket_server import PEOPLE
+SERVER_URL = "http://127.0.0.1:5000"
 
 
-FONT = QFont("Helvetica", 15)
-
-
-def get_names() -> {int: (str, int)}:
-    return PEOPLE
+def get_people():
+    request = requests.get(urljoin(SERVER_URL, "/people"))
+    return request.json()["people"]
 
 
 class NameButton(QPushButton):
     """ Wraps a QPushButton to provide a counter. """
 
-    def __init__(self, name: str, count: int, *args, **kwargs) -> None:
-        self.name = name
-        self.count = count
+    def __init__(self, person: dict, *args, **kwargs) -> None:
+        self.person_id = person["id"]
+        self.name = person["name"]
+        self.count = person["count"]
 
         super().__init__(self.current_label, *args, **kwargs)
 
@@ -41,9 +41,17 @@ class NameButton(QPushButton):
         return f"{self.name} ({self.count})"
 
     def plop(self) -> None:
-        self.count += 1
-        plop()
-        self.setText(self.current_label)
+        r = requests.post(
+            urljoin(SERVER_URL, f"people/{self.person_id}/add_consumption")
+        )
+        if r.status_code == 200:
+            json = r.json()
+            person = json["person"]
+            self.count = person["count"]
+            self.setText(self.current_label)
+            plop()
+        else:
+            print("Oh shit kapot")
 
 
 class NameButtons(QWidget):
@@ -56,9 +64,8 @@ class NameButtons(QWidget):
     def init_ui(self) -> None:
         self.layout = QGridLayout()
 
-        for index, id in enumerate(PEOPLE):
-            person = PEOPLE[id]
-            button = NameButton(person["name"], person["count"])
+        for index, person in enumerate(get_people()):
+            button = NameButton(person)
             self.layout.addWidget(button, index // 2, index % 2)
 
         self.setLayout(self.layout)

piket_server/__init__.py

@@ -23,14 +23,18 @@ PRESET_NAMES = [
     "Foek Lammenschaap",
 ]
 
-PEOPLE = {index: {"name": name, "count": 0} for index, name in enumerate(PRESET_NAMES)}
+PEOPLE = {
+    index: {"id": index, "name": name, "count": 0}
+    for index, name in enumerate(PRESET_NAMES)
+}
 NEXT_ID = len(PEOPLE)
 
 
 @app.route("/people", methods=["GET"])
 def get_people():
     """ Return a list of currently known people. """
-    return jsonify(people=PEOPLE)
+    people = [p for p in PEOPLE.values()]
+    return jsonify(people=people)
 
 
 @app.route("/people/<int:person_id>", methods=["GET"])
@@ -62,11 +66,10 @@ def add_person():
 
     if not name:
         abort(400)
-    person = {"name": name, "count": 0}
+    person = {"id": NEXT_ID, "name": name, "count": 0}
 
     PEOPLE[NEXT_ID] = person
 
-    person["id"] = NEXT_ID
     NEXT_ID += 1
 
     return jsonify(person=person)