Feature/showevent (#303)

Author: nelliei

app/internal/showevent.py

@@ -0,0 +1,17 @@
+from datetime import datetime
+from typing import List
+
+from sqlalchemy.orm import Session
+
+from app.database.models import Event, UserEvent
+
+
+def get_upcoming_events(session: Session, user_id: int) -> List[Event]:
+    upcoming_events = (
+        session.query(Event)
+        .join(UserEvent)
+        .filter(UserEvent.user_id == user_id)
+        .filter(Event.start >= datetime.now())
+        .order_by(Event.start)
+    )
+    return upcoming_events

app/routers/profile.py

@@ -16,9 +16,12 @@
 )
 from app.internal.on_this_day_events import get_on_this_day_events
 from app.internal.privacy import PrivacyKinds
+from app.internal.showevent import get_upcoming_events
 
 PICTURE_EXTENSION = config.PICTURE_EXTENSION
 PICTURE_SIZE = config.AVATAR_SIZE
+FIVE_EVENTS = 5
+# We are presenting up to five upcoming events on the profile page
 
 router = APIRouter(
     prefix="/profile",
@@ -44,13 +47,12 @@ async def profile(
     session=Depends(get_db),
     new_user=Depends(get_placeholder_user),
 ):
-    # Get relevant data from database
-    upcoming_events = range(5)
     user = session.query(User).filter_by(id=1).first()
     if not user:
         session.add(new_user)
         session.commit()
         user = session.query(User).filter_by(id=1).first()
+    upcoming_events = get_upcoming_events(session, user.id)[:FIVE_EVENTS]
 
     signs = [
         "Aries",
@@ -66,6 +68,7 @@ async def profile(
         "Aquarius",
         "Pisces",
     ]
+
     on_this_day_data = get_on_this_day_events(session)
 
     return templates.TemplateResponse(

app/templates/partials/user_profile/middle_content.html

@@ -3,11 +3,12 @@
   </div>
   <!-- Upcoming events -->
   <div class="mb-3">
+    <h1>Upcoming events</h1>
     {% for event in events %}
       <!-- Event card -->
       {% include 'partials/user_profile/middle_content/event_card.html' %}
 
       {% include 'partials/user_profile/middle_content/update_event_modal.html' %}
     {% endfor %}
   </div>
-</div>
+</div>

app/templates/partials/user_profile/middle_content/event_card.html

@@ -1,15 +1,15 @@
 <div class="card card-event mb-2 pb-0">
   <div class="card-header d-flex justify-content-between">
-    <small><i>{{ gettext("Upcoming event on (date)", date=event.start) }}</i></small>
+    <small><i>Upcoming event on {{ event.start.strftime("%d/%m/%Y %H:%M") }}</i></small>
     <!-- Event settings -->
     {% include 'partials/user_profile/middle_content/event_settings.html' %}
   </div>
 
   <div class="card-body pb-1">
     <p class="card-text">
-      The Event {{ event }} - description ...
+      {{ event.title }} - {{ event.content if event.content is not none }}
     </p>
     <hr class="mb-0">
-    <small class="event-posted-time text-muted">Last updated {{time}} ago</small>
+    <a href="{{ url_for('eventview', event_id=event.id) }}">{{ event.title }} details</a>
   </div>
-</div>
+</div>

tests/test_showevent.py

@@ -0,0 +1,18 @@
+from app.internal.showevent import get_upcoming_events
+
+
+class TestShowview:
+
+    def test_get_events_success(self, next_week_event, session):
+        events = get_upcoming_events(
+            session=session,
+            user_id=next_week_event.owner_id,
+        )
+        assert list(events) == [next_week_event]
+
+    def test_only_events_from_now_on(self, yesterday_event, session):
+        events = get_upcoming_events(
+            session=session,
+            user_id=yesterday_event.owner_id,
+        )
+        assert list(events) == []