Merge 6f784b5 into 2730ecf

Author: orontamir

app/config.py.example

@@ -114,5 +114,8 @@ LOG_FORMAT = ("<level>{level: <8}</level>"
               " - <cyan>{name}</cyan>:<cyan>{function}</cyan>"
               " - <level>{message}</level>")
 
+# EXERCISE_FILE_PATH
+EXERCISE_FILE = "web_page/exercises/Exercise_{num}.htm"
+
 # RESOURCES
 RESOURCES_DIR = pathlib.Path(__file__).parent / 'resources'

app/database/models.py

@@ -57,6 +57,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)
     disabled = Column(Boolean, default=False, nullable=False)
     privacy = Column(String, default="Private", nullable=False)
     is_manager = Column(Boolean, default=False)
@@ -101,6 +102,18 @@ async def get_by_username(db: Session, username: str) -> User:
         return db.query(User).filter(User.username == username).first()
 
 
+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 Feature(Base):
     __tablename__ = "features"
 

app/main.py

@@ -70,6 +70,7 @@ def create_tables(engine, psql_environment):
     dayview,
     email,
     event,
+    exercise,
     export,
     features,
     four_o_four,
@@ -124,6 +125,7 @@ async def swagger_ui_redirect():
     dayview.router,
     email.router,
     event.router,
+    exercise.router,
     export.router,
     features.router,
     four_o_four.router,

app/routers/event.py

@@ -416,7 +416,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

@@ -18,7 +18,8 @@
 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
-
+from app.routers.user_exercise import create_user_exercise
+from sqlalchemy.orm import Session
 PICTURE_EXTENSION = config.PICTURE_EXTENSION
 PICTURE_SIZE = config.AVATAR_SIZE
 FIVE_EVENTS = 5
@@ -39,6 +40,7 @@ def get_placeholder_user():
         full_name="My Name",
         language_id=1,
         telegram_id="",
+        is_active_exercise=False,
     )
 
 
@@ -88,6 +90,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)):
     user = session.query(User).filter_by(id=1).first()

app/routers/user_exercise.py

@@ -0,0 +1,51 @@
+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

@@ -114,8 +114,13 @@ p {
 }
 
 .profile-modal-header {
-  border: none;
-  background-color: whitesmoke;
+    border: none;
+    background-color: whitesmoke;
+}
+
+.exercise {
+    font-family: 'Assistant', sans-serif;
+    text-align: center;
 }
 
 #on,