Sprint 19: Social, UX-Verbesserungen, Nerd2Noob-Hilfe
This commit is contained in:
parent
10d30bf565
commit
89d87030a2
18 changed files with 930 additions and 74 deletions
|
|
@ -25,6 +25,9 @@ def _haversine(lat1, lon1, lat2, lon2):
|
|||
# ------------------------------------------------------------------
|
||||
# Schemas
|
||||
# ------------------------------------------------------------------
|
||||
class RsvpCreate(BaseModel):
|
||||
status: str = 'going' # 'going' | 'maybe'
|
||||
|
||||
class EventCreate(BaseModel):
|
||||
titel: str
|
||||
datum: str # YYYY-MM-DD
|
||||
|
|
@ -65,7 +68,8 @@ async def list_events(
|
|||
q = """
|
||||
SELECT e.*,
|
||||
CASE WHEN e.user_id = 0 THEN 'VDH' ELSE u.name END AS veranstalter_name,
|
||||
e.quelle
|
||||
e.quelle,
|
||||
(SELECT COUNT(*) FROM event_rsvp r WHERE r.event_id = e.id AND r.status = 'going') AS rsvp_count
|
||||
FROM events e
|
||||
LEFT JOIN users u ON u.id = e.user_id AND e.user_id != 0
|
||||
WHERE e.status = 'aktiv'
|
||||
|
|
@ -101,7 +105,8 @@ async def create_event(data: EventCreate, user=Depends(get_current_user)):
|
|||
data.lat, data.lon, data.ort_name,
|
||||
data.typ, data.beschreibung, data.link))
|
||||
row = conn.execute(
|
||||
"SELECT e.*, CASE WHEN e.user_id = 0 THEN 'VDH' ELSE u.name END AS veranstalter_name, e.quelle "
|
||||
"SELECT e.*, CASE WHEN e.user_id = 0 THEN 'VDH' ELSE u.name END AS veranstalter_name, e.quelle, "
|
||||
"0 AS rsvp_count "
|
||||
"FROM events e LEFT JOIN users u ON u.id = e.user_id AND e.user_id != 0 WHERE e.id = ?",
|
||||
(cur.lastrowid,)
|
||||
).fetchone()
|
||||
|
|
@ -115,7 +120,8 @@ async def create_event(data: EventCreate, user=Depends(get_current_user)):
|
|||
async def get_event(event_id: int):
|
||||
with db() as conn:
|
||||
row = conn.execute(
|
||||
"SELECT e.*, CASE WHEN e.user_id = 0 THEN 'VDH' ELSE u.name END AS veranstalter_name, e.quelle "
|
||||
"SELECT e.*, CASE WHEN e.user_id = 0 THEN 'VDH' ELSE u.name END AS veranstalter_name, e.quelle, "
|
||||
"(SELECT COUNT(*) FROM event_rsvp r WHERE r.event_id = e.id AND r.status = 'going') AS rsvp_count "
|
||||
"FROM events e LEFT JOIN users u ON u.id = e.user_id AND e.user_id != 0 WHERE e.id = ?",
|
||||
(event_id,)
|
||||
).fetchone()
|
||||
|
|
@ -142,7 +148,8 @@ async def update_event(event_id: int, data: EventUpdate, user=Depends(get_curren
|
|||
cols = ', '.join(f"{k} = ?" for k in updates)
|
||||
conn.execute(f"UPDATE events SET {cols} WHERE id = ?", [*updates.values(), event_id])
|
||||
row = conn.execute(
|
||||
"SELECT e.*, CASE WHEN e.user_id = 0 THEN 'VDH' ELSE u.name END AS veranstalter_name, e.quelle "
|
||||
"SELECT e.*, CASE WHEN e.user_id = 0 THEN 'VDH' ELSE u.name END AS veranstalter_name, e.quelle, "
|
||||
"(SELECT COUNT(*) FROM event_rsvp r WHERE r.event_id = e.id AND r.status = 'going') AS rsvp_count "
|
||||
"FROM events e LEFT JOIN users u ON u.id = e.user_id AND e.user_id != 0 WHERE e.id = ?",
|
||||
(event_id,)
|
||||
).fetchone()
|
||||
|
|
@ -161,3 +168,53 @@ async def delete_event(event_id: int, user=Depends(get_current_user)):
|
|||
if ev['user_id'] == 0 or ev['user_id'] != user['id']:
|
||||
raise HTTPException(403, "Nur der Veranstalter kann das Event löschen.")
|
||||
conn.execute("UPDATE events SET status = 'geloescht' WHERE id = ?", (event_id,))
|
||||
|
||||
|
||||
# ------------------------------------------------------------------
|
||||
# POST /api/events/{id}/rsvp
|
||||
# ------------------------------------------------------------------
|
||||
@router.post("/{event_id}/rsvp", status_code=201)
|
||||
async def rsvp_event(event_id: int, data: RsvpCreate, user=Depends(get_current_user)):
|
||||
if data.status not in ('going', 'maybe'):
|
||||
raise HTTPException(400, "Status muss 'going' oder 'maybe' sein.")
|
||||
with db() as conn:
|
||||
ev = conn.execute("SELECT id FROM events WHERE id = ? AND status = 'aktiv'", (event_id,)).fetchone()
|
||||
if not ev:
|
||||
raise HTTPException(404, "Event nicht gefunden.")
|
||||
conn.execute(
|
||||
"INSERT OR REPLACE INTO event_rsvp (event_id, user_id, status) VALUES (?, ?, ?)",
|
||||
(event_id, user['id'], data.status)
|
||||
)
|
||||
count = conn.execute(
|
||||
"SELECT COUNT(*) FROM event_rsvp WHERE event_id = ? AND status = 'going'", (event_id,)
|
||||
).fetchone()[0]
|
||||
return {"event_id": event_id, "status": data.status, "rsvp_count": count}
|
||||
|
||||
|
||||
# ------------------------------------------------------------------
|
||||
# DELETE /api/events/{id}/rsvp
|
||||
# ------------------------------------------------------------------
|
||||
@router.delete("/{event_id}/rsvp", status_code=204)
|
||||
async def cancel_rsvp(event_id: int, user=Depends(get_current_user)):
|
||||
with db() as conn:
|
||||
conn.execute(
|
||||
"DELETE FROM event_rsvp WHERE event_id = ? AND user_id = ?",
|
||||
(event_id, user['id'])
|
||||
)
|
||||
|
||||
|
||||
# ------------------------------------------------------------------
|
||||
# GET /api/events/{id}/rsvp
|
||||
# ------------------------------------------------------------------
|
||||
@router.get("/{event_id}/rsvp")
|
||||
async def list_rsvp(event_id: int):
|
||||
with db() as conn:
|
||||
rows = conn.execute(
|
||||
"SELECT r.user_id, u.name, r.status "
|
||||
"FROM event_rsvp r "
|
||||
"JOIN users u ON u.id = r.user_id "
|
||||
"WHERE r.event_id = ? "
|
||||
"ORDER BY r.created_at ASC",
|
||||
(event_id,)
|
||||
).fetchall()
|
||||
return [dict(r) for r in rows]
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue