Feature/exercise

app/config.py.example

@@ -86,3 +86,6 @@ LOG_FORMAT = ("<level>{level: <8}</level>"
               " <green>{time:YYYY-MM-DD HH:mm:ss.SSS}</green>"
               " - <cyan>{name}</cyan>:<cyan>{function}</cyan>"
               " - <level>{message}</level>")
+
+# EXERCISE_FILE_PATH
+EXERCISE_FILE = "images/exercises/Exercise_{num}.png"

app/database/models.py

@@ -32,6 +32,7 @@ class User(Base):
     avatar = Column(String, default="profile.png")
     telegram_id = Column(String, unique=True)
     is_active = Column(Boolean, default=False)
+    is_active_exercise = Column(Boolean, default=False)
     language_id = Column(Integer, ForeignKey("languages.id"))
 
     owned_events = relationship(
@@ -48,6 +49,18 @@ def __repr__(self):
         return f'<User {self.id}>'
 
 
+class UserExercise(Base):
+    """
+    Table name user exercise
+    Save when user start his exercise
+    """
+    __tablename__ = "user_exercise"
+
+    id = Column(Integer, primary_key=True, index=True)
+    user_id = Column(Integer, ForeignKey("users.id"))
+    start_date = Column(DateTime, nullable=False)
+
+
 class Event(Base):
     __tablename__ = "events"
 

app/main.py

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

app/routers/event.py

@@ -149,7 +149,8 @@ def is_fields_types_valid(to_check: Dict[str, Any], types: Dict[str, Any]):
     """validate dictionary values by dictionary of types"""
     errors = []
     for field_name, field_type in to_check.items():
-        if types[field_name] and not isinstance(field_type, types[field_name]):
+        if types[field_name] and not isinstance(field_type,
+                                                (types[field_name])):
             errors.append(
                 f"{field_name} is '{type(field_type).__name__}' and"
                 + f"it should be from type '{types[field_name].__name__}'")

app/routers/exercise.py

@@ -0,0 +1,47 @@
+from fastapi import APIRouter, Depends, Request
+from app.database.models import User
+from app.dependencies import get_db, templates
+from app.routers.user_exercise import get_user_exercise
+from datetime import datetime
+from app import config
+from sqlalchemy.orm import Session
+
+router = APIRouter(
+    prefix="/exercise",
+    tags=["exercise"],
+    responses={404: {"description": "Not found"}},
+)
+
+
+@router.get("/")
+async def exercise(
+        request: Request,
+        session: Session = Depends(get_db),
+        ):
+    """
+    If is active exercise = True
+    Show user exercise for a specific day if is_active_exercise is ture.
+    """
+    user = session.query(User).filter_by(id=1).first()
+    if not user:
+        # create empty default user
+        user = User(
+            username='',
+            password='',
+            email=''
+        )
+    # Get user exercise
+    user_exercise = get_user_exercise(session, user_id=user.id)
+    if user_exercise:
+        # Get exercise day
+        delta = datetime.now() - user_exercise[0].start_date
+        # All exercises split to 30 days
+        day = (delta.days % 30) + 1
+    else:
+        day = 1
+    exercise_day = str(config.EXERCISE_FILE.format(num=day))
+    return templates.TemplateResponse("exercise.html", {
+        "request": request,
+        "user": user,
+        "exercise": exercise_day
+    })

app/routers/profile.py

@@ -1,7 +1,9 @@
 import io
 
+from app.routers.user_exercise import create_user_exercise
 from fastapi import APIRouter, Depends, File, Request, UploadFile
 from PIL import Image
+from sqlalchemy.orm import Session
 from starlette.responses import RedirectResponse
 from starlette.status import HTTP_302_FOUND
 
@@ -28,6 +30,7 @@ def get_placeholder_user():
         full_name='My Name',
         language_id=1,
         telegram_id='',
+        is_active_exercise=False,
         language='english',
     )
 
@@ -59,6 +62,32 @@ async def profile(
     })
 
 
+@router.get("/exercise/start")
+async def start_exercise(session: Session = Depends(get_db)):
+    user = session.query(User).filter_by(id=1).first()
+
+    # Update database
+    user.is_active_exercise = True
+    session.commit()
+
+    # create user exercise
+    create_user_exercise(session, user)
+    url = router.url_path_for("profile")
+    return RedirectResponse(url=url, status_code=HTTP_302_FOUND)
+
+
+@router.get("/exercise/stop")
+async def stop_exercise(session=Depends(get_db)):
+    user = session.query(User).filter_by(id=1).first()
+
+    # Update database
+    user.is_active_exercise = False
+    session.commit()
+
+    url = router.url_path_for("profile")
+    return RedirectResponse(url=url, status_code=HTTP_302_FOUND)
+
+
 @router.post("/update_user_fullname")
 async def update_user_fullname(
         request: Request, session=Depends(get_db)):

app/routers/user_exercise.py

@@ -0,0 +1,53 @@
+from sqlalchemy.exc import SQLAlchemyError
+from sqlalchemy.orm import Session
+from datetime import datetime
+from app.database.models import Base, User, UserExercise
+
+
+def save(session: Session, instance: Base) -> bool:
+    """Commits an instance to the db.
+    source: app.database.models.Base"""
+
+    if issubclass(instance.__class__, Base):
+        session.add(instance)
+        session.commit()
+        return True
+    return False
+
+
+def create_user_exercise(session: Session, user: User) -> UserExercise:
+    """ Create and save new user exercise """
+    if not does_user_exercise_exist(session=session, user_id=user.id):
+        user_exercise = UserExercise(
+            user_id=user.id,
+            start_date=datetime.now()
+            )
+        save(session=session, instance=user_exercise)
+    else:
+        user_exercise = update_user_exercise(session=session, user=user)
+    return user_exercise
+
+
+def does_user_exercise_exist(session: Session, user_id: int) -> bool:
+    """
+      Check if a user exercise for user id exists.
+    """
+    return get_user_exercise(session=session, user_id=user_id)
+
+
+def get_user_exercise(session: Session, **param) -> list:
+    """Returns user exercise filter by param."""
+    try:
+        user_exercise = list(session.query(UserExercise).filter_by(**param))
+    except SQLAlchemyError:
+        return []
+    else:
+        return user_exercise
+
+
+def update_user_exercise(session: Session, user: User) -> UserExercise:
+    user_ex = session.query(UserExercise).filter_by(user_id=user.id).first()
+    # Update database
+    user_ex.start_date = datetime.now()
+    session.commit()
+    return user_ex

app/static/style.css

@@ -61,6 +61,12 @@ body {
 }
 
 .profile-modal-header {
-  border: none;
-  background-color: whitesmoke;
+    border: none;
+    background-color:whitesmoke;
+}
+
+.exercise {
+    font-family: 'Assistant', sans-serif;
+    text-align: center;
 }
+

app/templates/base.html

@@ -47,6 +47,9 @@
         <li class="nav-item">
           <a class="nav-link" href="/search">Search</a>
         </li>
+        <li class="nav-item">
+            <a class="nav-link" href="{{ url_for('exercise') }}">Exercise</a>
+        </li>
         <li class="nav-item">
           <a class="nav-link" href="/celebrity">Celebrities Born Today</a>
         </li>

app/templates/exercise.html

@@ -0,0 +1,20 @@
+{% extends "base.html" %}
+
+
+{% block content %}
+
+    <div class="container mt-4">
+        <div class="row">
+            <!-- Right side -->
+            <div class="col-5">
+                <!-- Exercise -->
+                {% if user.is_active_exercise %}
+                    <div class="exercise">
+                         <img src="{{ url_for('static', path=exercise) }}" alt="exercise image" width="270%" height="200%">
+                    </div>
+                {% endif %}
+            </div>
+        </div>
+    </div>
+
+{% endblock %}

app/templates/partials/index/navigation.html

@@ -30,6 +30,9 @@
         <li class="nav-item">
           <a class="nav-link" href="/search">Search</a>
         </li>
+        <li class="nav-item">
+          <a class="nav-link" href="{{ url_for('exercise') }}">Exercise</a>
+       </li>
       </ul>
     </div>
   </div>

app/templates/profile.html

@@ -219,6 +219,15 @@ <h6 class="card-title text-center mb-1">{{ user.full_name }}</h6>
               <li class="list-group-item list-group-item-action no-border">
                 <a class="text-decoration-none text-secondary" href="#">Export my calendar</a>
               </li>
+              {% if not user.is_active_exercise %}
+              <li class="list-group-item list-group-item-action no-border">
+                <a class="text-decoration-none text-secondary" href="./exercise/start">Start Exercise</a>
+              </li>
+              {% else %}
+              <li class="list-group-item list-group-item-action no-border">
+                <a class="text-decoration-none text-secondary" href="./exercise/stop">Stop Exercise</a>
+              </li>
+              {% endif %}
               <li class="list-group-item list-group-item-action no-border">
                 <a class="text-decoration-none text-secondary" href="#">Your feature</a>
               </li>

tests/test_user_exercise.py

@@ -0,0 +1,38 @@
+from app.routers.user_exercise import create_user_exercise,\
+    does_user_exercise_exist, get_user_exercise
+from app.routers.user import create_user
+
+
+class TestUserExercise:
+
+    def test_create_user_exercise(self, session):
+        _user = create_user(
+            session=session,
+            username='new_test_username',
+            password='new_test_password',
+            email='[email protected]',
+            language='english',
+            language_id=1,
+        )
+        user_exercise = create_user_exercise(
+            session=session,
+            user=_user
+        )
+        assert user_exercise.user_id == _user.id
+        session.delete(user_exercise)
+        session.delete(_user)
+        session.commit()
+
+    def test_get_users_exercise_success(self, user_exercise, session):
+        assert get_user_exercise(user_id=user_exercise.user_id,
+                                 session=session) == [user_exercise]
+
+    def test_get_user_exercise_failure(self, user_exercise, session):
+        assert get_user_exercise(user_id=100, session=session) == []
+
+    def test_does_user_exercise_exist_success(self, user_exercise, session):
+        assert does_user_exercise_exist(session=session,
+                                        user_id=user_exercise.user_id)
+
+    def test_does_user_exercise_exist_failure(self, session):
+        assert not does_user_exercise_exist(session=session, user_id=100)

tests/user_fixture.py

@@ -1,7 +1,7 @@
 import pytest
 from sqlalchemy.orm import Session
-
-from app.database.models import User
+from datetime import datetime
+from app.database.models import User, UserExercise
 from app.internal.utils import create_model, delete_instance
 
 
@@ -19,6 +19,17 @@ def user(session: Session) -> User:
     delete_instance(session, test_user)
 
 
+@pytest.fixture
+def user_exercise(session: Session, user: User) -> UserExercise:
+    test_user_exercise = create_model(
+        session, UserExercise,
+        user_id=11,
+        start_date=datetime.now()
+    )
+    yield test_user_exercise
+    delete_instance(session, test_user_exercise)
+
+
 @pytest.fixture
 def sender(session: Session) -> User:
     sender = create_model(