Feature/timer

app/config.py.example

@@ -17,6 +17,7 @@ class Settings(BaseSettings):
 # GENERAL
 DOMAIN = 'Our-Domain'
 
+
 # DATABASE
 DEVELOPMENT_DATABASE_STRING = "sqlite:///./dev.db"
 # Set the following True if working on PSQL environment or set False otherwise

app/internal/timer.py

@@ -0,0 +1,21 @@
+from app.routers.event import sort_by_date
+from app.routers.user import get_all_user_events
+from sqlalchemy.orm import Session
+from app.database.models import Event
+
+
+def get_next_user_event(session: Session, user_id: int) -> Event:
+    events_as_list = list(sort_by_date(get_all_user_events(session, user_id)))
+    next_event = None
+    if len(events_as_list) > 0:
+        next_event = events_as_list[0]
+    return next_event
+
+
+def get_next_user_event_start_time(session: Session, user_id: int):
+    next_event = get_next_user_event(session, user_id)
+    if next_event is None:
+        timer_to_next_event = None
+    else:
+        timer_to_next_event = next_event.start.strftime("%Y-%m-%d %H:%M")
+    return {"timer": timer_to_next_event}

app/main.py

@@ -33,7 +33,7 @@ def create_tables(engine, psql_environment):
 
 from app.routers import (  # noqa: E402
     agenda, calendar, categories, currency, dayview, email,
-    event, invitation, profile, search, telegram, whatsapp
+    event, invitation, profile, search, telegram, timer, whatsapp
 )
 
 json_data_loader.load_to_db(next(get_db()))
@@ -50,6 +50,7 @@ def create_tables(engine, psql_environment):
     profile.router,
     search.router,
     telegram.router,
+    timer.router,
     whatsapp.router,
 ]
 

app/routers/event.py

@@ -273,7 +273,7 @@ def delete_event(event_id: int,
         url="/calendar", status_code=status.HTTP_200_OK)
 
 
-def is_date_before(start_time: datetime, end_time: datetime) -> bool:
+def is_date_before(start_time: dt, end_time: dt) -> bool:
     """Check if the start_date is smaller then the end_time"""
     try:
         return start_time < end_time

app/routers/timer.py

@@ -0,0 +1,14 @@
+
+from fastapi import APIRouter, Depends, Request
+from app.internal.timer import get_next_user_event_start_time
+from app.database.models import User
+from app.database.database import get_db
+
+
+router = APIRouter()
+
+
+@router.get("/timer")
+def timer(request: Request, session=Depends(get_db)):
+    user = session.query(User).filter_by(id=1).first()
+    return get_next_user_event_start_time(session, user.id)

app/static/timer.js

@@ -0,0 +1,25 @@
+//credit for the countdowntimer: https://gist.github.com/Mak-Pro/0e1194d0f8696489a5c8bac72c8fa300
+fetch('/timer')
+  .then(response => response.json())
+  .then(data => {
+
+var countDownDate = new Date(data.timer).getTime();
+
+// Update the countdown every 1 second
+var x = setInterval(function() {
+  var now = new Date().getTime();
+  var distance = countDownDate - now;
+  var days = Math.floor(distance / (1000 * 60 * 60 * 24));
+  var hours = Math.floor((distance % (1000 * 60 * 60 * 24)) / (1000 * 60 * 60));
+  var minutes = Math.floor((distance % (1000 * 60 * 60)) / (1000 * 60));
+  var seconds = Math.floor((distance % (1000 * 60)) / 1000);
+  // Output the result to base.html in an element with id="eventtimer"
+  document.getElementById("eventtimer").innerHTML = "Next Event will be in: " + days + "d " + hours + "h "
+  + minutes + "m " + seconds + "s ";
+  // Countdown had finished
+  if (distance < 0) {
+    clearInterval(x);
+    document.getElementById("eventtimer").innerHTML = "Your Event Starts NOW:)";
+  }
+}, 1000);
+ } );

app/templates/profile.html

@@ -203,6 +203,10 @@ <h6 class="card-title text-center mb-1">{{ user.full_name }}</h6>
                             <a class="text-decoration-none text-secondary" href="#">Your feature</a>
                         </li>
                     </ul>
+                    <div>
+                        <p id="eventtimer"></p>
+                        <script src="{{ url_for('static', path='/timer.js') }}"></script>
+                    </div>
                 </div>
             </div>
             <!-- End Features card -->

tests/test_profile.py

@@ -37,6 +37,7 @@ def test_profile_page(profile_test_client):
     assert b'FakeName' in data
     assert b'Happy new user!' in data
     assert b'On This Day' in data
+    assert b'Event' in data
 
 
 def test_update_user_fullname(profile_test_client):

tests/test_timer.py

@@ -0,0 +1,18 @@
+from app.internal.timer import get_next_user_event
+from app.internal.timer import get_next_user_event_start_time
+
+
+def test_get_last_event_success(event, session):
+    next_event = get_next_user_event(
+        session=session,
+        user_id=event.owner_id,
+    )
+    assert next_event == event
+
+
+def test_time_left(event, session):
+    time_left = get_next_user_event_start_time(
+        session=session,
+        user_id=event.owner_id,
+    )
+    assert type(time_left["timer"]) is str