Upload server.py

server.py

@@ -872,92 +872,85 @@ def api_invoice_detail(invoice_id: str) -> Any:
 
 @app.route("/api/invoices/summary", methods=["GET"])
 def api_invoice_summary() -> Any:
-    try:
-        login_key = require_auth()
-    except PermissionError:
-        return jsonify({"error": "Brak autoryzacji."}), 401
-
-    now = datetime.utcnow()
-    last_month_start = now - timedelta(days=30)
-    quarter_first_month = ((now.month - 1) // 3) * 3 + 1
-    quarter_start = now.replace(month=quarter_first_month, day=1, hour=0, minute=0, second=0, microsecond=0)
-    year_start = now.replace(month=1, day=1, hour=0, minute=0, second=0, microsecond=0)
-
-    def aggregate_from_rows(rows: List[Dict[str, Any]], start: datetime) -> Dict[str, Any]:
-        count = 0
-        gross_total = Decimal("0.00")
-        for row in rows:
-            issued_dt = row["issued_at"]
-            if issued_dt < start:
-                continue
-            count += 1
-            gross_total += Decimal(row["total_gross"])
-        return {"count": count, "gross_total": str(_quantize(gross_total))}
-
-    if DATABASE_AVAILABLE:
-        try:
-            account_row = get_account_row(login_key)
-        except KeyError:
-            return jsonify({"error": "Nie znaleziono konta."}), 404
-        rows = fetch_all(
-            """
-            SELECT issued_at, total_gross
-            FROM invoices
-            WHERE account_id = %s
-            """,
-            (account_row["id"],),
-        )
-        # rows zwraca datetime, ale upewniamy się, że są w Python datetime
-        parsed = [
-            {
-                "issued_at": row["issued_at"],
-                "total_gross": row["total_gross"],
-            }
-            for row in rows
-        ]
-        summary = {
-            "last_month": aggregate_from_rows(parsed, last_month_start),
-            "quarter": aggregate_from_rows(parsed, quarter_start),
-            "year": aggregate_from_rows(parsed, year_start),
-        }
-        return jsonify({"summary": summary})
-
-    data = load_store()
-    try:
-        account = get_account(data, login_key)
-    except KeyError:
-        return jsonify({"error": "Nie znaleziono konta."}), 404
-    invoices = account.get("invoices", [])
-
-    def parse_issued_at(value: Optional[str]) -> Optional[datetime]:
-        if not value:
-            return None
-        try:
-            return datetime.strptime(value, "%Y-%m-%d %H:%M")
-        except ValueError:
-            return None
-
-    def aggregate(start: datetime) -> Dict[str, Any]:
-        count = 0
-        gross_total = Decimal("0.00")
-        for invoice in invoices:
-            issued_dt = parse_issued_at(invoice.get("issued_at"))
-            if issued_dt is None or issued_dt < start:
-                continue
-            count += 1
-            gross_value = invoice.get("totals", {}).get("gross", "0")
-            try:
-                gross_total += _decimal(gross_value)
-            except ValueError:
-                continue
-        return {"count": count, "gross_total": str(_quantize(gross_total))}
-
-    summary = {
-        "last_month": aggregate(last_month_start),
-        "quarter": aggregate(quarter_start),
-        "year": aggregate(year_start),
-    }
-    return jsonify({"summary": summary})
+    try:
+        login_key = require_auth()
+    except PermissionError:
+        return jsonify({"error": "Brak autoryzacji."}), 401
+
+    now = datetime.utcnow()
+    last_month_start = now - timedelta(days=30)
+    quarter_first_month = ((now.month - 1) // 3) * 3 + 1
+    quarter_start = now.replace(month=quarter_first_month, day=1, hour=0, minute=0, second=0, microsecond=0)
+    year_start = now.replace(month=1, day=1, hour=0, minute=0, second=0, microsecond=0)
+
+    def normalize_issued_at(value: Any) -> Optional[datetime]:
+        if isinstance(value, datetime):
+            return value
+        if isinstance(value, str):
+            candidate = value.strip()
+            if not candidate:
+                return None
+            for fmt in ("%Y-%m-%d %H:%M", "%Y-%m-%dT%H:%M:%S", "%Y-%m-%d"):
+                try:
+                    return datetime.strptime(candidate, fmt)
+                except ValueError:
+                    continue
+        return None
+
+    def aggregate_from_rows(rows: List[Dict[str, Any]], start: datetime) -> Dict[str, Any]:
+        count = 0
+        gross_total = Decimal("0.00")
+        for row in rows:
+            issued_dt = normalize_issued_at(row.get("issued_at"))
+            if issued_dt is None or issued_dt < start:
+                continue
+            try:
+                gross_total += _decimal(row.get("total_gross") or "0")
+            except ValueError:
+                continue
+            count += 1
+        return {"count": count, "gross_total": str(_quantize(gross_total))}
+
+    if DATABASE_AVAILABLE:
+        try:
+            account_row = get_account_row(login_key)
+        except KeyError:
+            return jsonify({"error": "Nie znaleziono konta."}), 404
+        rows = fetch_all(
+            """
+            SELECT issued_at, total_gross
+            FROM invoices
+            WHERE account_id = %s
+            """,
+            (account_row["id"],),
+        )
+        summary = {
+            "last_month": aggregate_from_rows(rows, last_month_start),
+            "quarter": aggregate_from_rows(rows, quarter_start),
+            "year": aggregate_from_rows(rows, year_start),
+        }
+        return jsonify({"summary": summary})
+
+    data = load_store()
+    try:
+        account = get_account(data, login_key)
+    except KeyError:
+        return jsonify({"error": "Nie znaleziono konta."}), 404
+    invoices = account.get("invoices", [])
+    rows = [
+        {
+            "issued_at": invoice.get("issued_at"),
+            "total_gross": (invoice.get("totals") or {}).get("gross", "0"),
+        }
+        for invoice in invoices
+    ]
+
+    summary = {
+        "last_month": aggregate_from_rows(rows, last_month_start),
+        "quarter": aggregate_from_rows(rows, quarter_start),
+        "year": aggregate_from_rows(rows, year_start),
+    }
+    return jsonify({"summary": summary})
 
 
 if __name__ == "__main__":