Allow extracting per-person counts per settlement

piket_server/__init__.py

@@ -114,6 +114,7 @@ class Settlement(db.Model):
             Consumption.query.filter_by(settlement=self)
             .filter_by(reversed=False)
             .group_by(Consumption.consumption_type_id)
+            .order_by(ConsumptionType.name)
             .outerjoin(ConsumptionType)
             .with_entities(
                 Consumption.consumption_type_id,
@@ -125,6 +126,36 @@ class Settlement(db.Model):
 
         return {r[0]: {"name": r[1], "count": r[2]} for r in q}
 
+    @property
+    def per_person(self) -> dict:
+        # Get keys of seen consumption_types
+        c_types = self.consumption_summary.keys()
+
+        result = {}
+        for type in c_types:
+            c_type = ConsumptionType.query.get(type)
+            result[type] = {"consumption_type": c_type.as_dict, "counts": {}}
+
+            q = (
+                Consumption.query.filter_by(settlement=self)
+                .filter_by(reversed=False)
+                .filter_by(consumption_type=c_type)
+                .group_by(Consumption.person_id)
+                .order_by(Person.name)
+                .outerjoin(Person)
+                .with_entities(
+                    Person.person_id,
+                    Person.name,
+                    func.count(Consumption.consumption_id),
+                )
+                .all()
+            )
+
+            for row in q:
+                result[type]["counts"][row[0]] = {"name": row[1], "count": row[2]}
+
+        return result
+
 
 class ConsumptionType(db.Model):
     """ Represents a type of consumption to be counted. """
@@ -387,6 +418,16 @@ def get_settlements():
     return jsonify(settlements=[s.as_dict for s in result])
 
 
+@app.route("/settlements/<int:settlement_id>", methods=["GET"])
+def get_settlement(settlement_id: int):
+    """ Show full details for a single Settlement. """
+    s = Settlement.query.get_or_404(settlement_id)
+
+    per_person = s.per_person
+
+    return jsonify(settlement=s.as_dict, count_info=per_person)
+
+
 @app.route("/settlements", methods=["POST"])
 def add_settlement():
     """ Create a Settlement, and link all un-settled Consumptions to it. """