Merge branch 'develop' of https://github.com/PythonFreeCourse/calendar into feature/favorite-quotes

Author: subscorp

app/database/models.py

@@ -9,6 +9,7 @@
     JSON,
     Boolean,
     Column,
+    Date,
     DateTime,
     Enum,
     Float,
@@ -78,6 +79,8 @@ class User(Base):
         back_populates="user",
     )
     comments = relationship("Comment", back_populates="user")
+    tasks = relationship(
+        "Task", cascade="all, delete", back_populates="owner")
 
     features = relationship("Feature", secondary=UserFeature.__tablename__)
     oauth_credentials = relationship(
@@ -582,6 +585,21 @@ class InternationalDays(Base):
     international_day = Column(String, nullable=False)
 
 
+class Task(Base):
+    __tablename__ = "tasks"
+
+    id = Column(Integer, primary_key=True, index=True)
+    title = Column(String, nullable=False)
+    description = Column(String, nullable=False)
+    is_done = Column(Boolean, default=False)
+    is_important = Column(Boolean, nullable=False)
+    date = Column(Date, nullable=False)
+    time = Column(Time, nullable=False)
+    owner_id = Column(Integer, ForeignKey("users.id"))
+
+    owner = relationship("User", back_populates="tasks")
+
+
 # insert language data
 
 

app/internal/todo_list.py

@@ -0,0 +1,35 @@
+from datetime import date, time
+
+from sqlalchemy.orm import Session
+
+from app.database.models import Task
+from app.internal.utils import create_model
+
+
+def create_task(
+        db: Session,
+        title: str,
+        description: str,
+        date_str: date,
+        time_str: time,
+        owner_id: int,
+        is_important: bool,
+) -> Task:
+    """Creates and saves a new task."""
+    task = create_model(
+        db,
+        Task,
+        title=title,
+        description=description,
+        date=date_str,
+        time=time_str,
+        owner_id=owner_id,
+        is_important=is_important,
+        is_done=False,
+    )
+    return task
+
+
+def by_id(db: Session, task_id: int) -> Task:
+    task = db.query(Task).filter_by(id=task_id).one()
+    return task

app/main.py

@@ -85,6 +85,7 @@ def create_tables(engine, psql_environment):
     search,
     settings,
     telegram,
+    todo_list,
     user,
     weekview,
     weight,
@@ -140,6 +141,7 @@ async def swagger_ui_redirect():
     search.router,
     settings.router,
     telegram.router,
+    todo_list.router,
     user.router,
     weekview.router,
     weight.router,

app/routers/dayview.py

@@ -4,12 +4,10 @@
 
 from fastapi import APIRouter, Depends, HTTPException, Request
 
-from app.database.models import Event, User
+from app.database.models import Event, Task, User
 from app.dependencies import get_db, templates
 from app.internal import international_days, zodiac
 from app.internal.security.dependencies import current_user
-
-# from app.internal.security.schema import CurrentUser
 from app.routers.user import get_all_user_events
 
 router = APIRouter()
@@ -74,9 +72,9 @@ def _date_is_today(self) -> bool:
 
 class EventsAttributes(DivAttributes):
     def __init__(
-        self,
-        event: Event,
-        day: Union[bool, datetime] = False,
+            self,
+            event: Event,
+            day: Union[bool, datetime] = False,
     ) -> None:
         self.start_time = event.start
         self.end_time = event.end
@@ -136,9 +134,9 @@ def _check_multiday_event(self) -> Tuple[bool, bool]:
 
 
 def is_specific_time_event_in_day(
-    event: Event,
-    day: datetime,
-    day_end: datetime,
+        event: Event,
+        day: datetime,
+        day_end: datetime,
 ) -> bool:
     if event.all_day:
         return False
@@ -150,9 +148,9 @@ def is_specific_time_event_in_day(
 
 
 def is_all_day_event_in_day(
-    event: Event,
-    day: datetime,
-    day_end: datetime,
+        event: Event,
+        day: datetime,
+        day_end: datetime,
 ) -> bool:
     if not event.all_day:
         return False
@@ -164,9 +162,9 @@ def is_all_day_event_in_day(
 
 
 def get_events_and_attributes(
-    day: datetime,
-    session,
-    user_id: int,
+        day: datetime,
+        session,
+        user_id: int,
 ) -> Iterator[Tuple[Event, EventsAttributes]]:
     events = get_all_user_events(session, user_id)
     day_end = day + timedelta(hours=24)
@@ -176,9 +174,9 @@ def get_events_and_attributes(
 
 
 def get_all_day_events(
-    day: datetime,
-    session,
-    user_id: int,
+        day: datetime,
+        session,
+        user_id: int,
 ) -> Iterator[Event]:
     events = get_all_user_events(session, user_id)
     day_end = day + timedelta(hours=24)
@@ -189,11 +187,11 @@ def get_all_day_events(
 
 @router.get("/day/{date}", include_in_schema=False)
 async def dayview(
-    request: Request,
-    date: str,
-    view="day",
-    session=Depends(get_db),
-    user: User = Depends(current_user),
+        request: Request,
+        date: str,
+        view="day",
+        session=Depends(get_db),
+        user: User = Depends(current_user),
 ):
     try:
         day = datetime.strptime(date, "%Y-%m-%d")
@@ -212,6 +210,12 @@ async def dayview(
     )
     current_time_with_attrs = CurrentTimeAttributes(date=day)
     inter_day = international_days.get_international_day_per_day(session, day)
+    tasks = (
+        session.query(Task)
+        .filter(Task.owner_id == user.user_id)
+        .filter(Task.date == day.date())
+        .order_by(Task.time)
+    )
     month = day.strftime("%B").upper()
     return templates.TemplateResponse(
         "calendar_day_view.html",
@@ -221,9 +225,11 @@ async def dayview(
             "all_day_events": all_day_events,
             "month": month,
             "day": day.day,
+            "date_str": date,
             "international_day": inter_day,
             "zodiac": zodiac_obj,
             "view": view,
             "current_time": current_time_with_attrs,
+            "tasks": tasks,
         },
     )

app/routers/todo_list.py

@@ -0,0 +1,143 @@
+from datetime import datetime
+
+from fastapi import APIRouter, Depends, Form, status
+from fastapi.encoders import jsonable_encoder
+from fastapi.responses import JSONResponse, RedirectResponse
+from sqlalchemy.exc import SQLAlchemyError
+from sqlalchemy.orm import Session
+from starlette.requests import Request
+
+from app.config import templates
+from app.dependencies import get_db
+from app.internal.todo_list import by_id, create_task
+from app.internal.utils import get_current_user
+
+router = APIRouter(
+    prefix="/task",
+    tags=["task"],
+    responses={status.HTTP_404_NOT_FOUND: {"description": "Not found"}},
+)
+
+
+@router.post("/delete")
+def delete_task(
+        request: Request,
+        task_id: int = Form(...),
+        db: Session = Depends(get_db),
+) -> RedirectResponse:
+    user = get_current_user(db)
+    task = by_id(db, task_id)
+    if task.owner_id != user.id:
+        return templates.TemplateResponse(
+            "calendar_day_view.html",
+            {"task_id": task_id},
+            status_code=status.HTTP_403_FORBIDDEN,
+        )
+
+    date_str = task.date.strftime('%Y-%m-%d')
+    try:
+        # Delete task
+        db.delete(task)
+
+        db.commit()
+
+    except (SQLAlchemyError, TypeError):
+        return templates.TemplateResponse(
+            "calendar_day_view.html",
+            {"task_id": task_id},
+            status_code=status.HTTP_500_INTERNAL_SERVER_ERROR,
+        )
+    return RedirectResponse(
+        request.url_for("dayview", date=date_str),
+        status_code=status.HTTP_302_FOUND,
+    )
+
+
+@router.post("/add")
+async def add_task(
+        request: Request,
+        title: str = Form(...),
+        description: str = Form(...),
+        date_str: str = Form(...),
+        time_str: str = Form(...),
+        is_important: bool = Form(False),
+        session: Session = Depends(get_db),
+) -> RedirectResponse:
+    user = get_current_user(session)
+    create_task(
+        session,
+        title,
+        description,
+        datetime.strptime(date_str, '%Y-%m-%d').date(),
+        datetime.strptime(time_str, '%H:%M').time(),
+        user.id,
+        is_important,
+    )
+    return RedirectResponse(
+        request.url_for("dayview", date=date_str),
+        status_code=status.HTTP_303_SEE_OTHER,
+    )
+
+
+@router.post("/edit")
+async def edit_task(
+        request: Request,
+        task_id: int = Form(...),
+        title: str = Form(...),
+        description: str = Form(...),
+        date_str: str = Form(...),
+        time_str: str = Form(...),
+        is_important: bool = Form(False),
+        session: Session = Depends(get_db),
+) -> RedirectResponse:
+    task = by_id(session, task_id)
+    task.title = title
+    task.description = description
+    task.date = datetime.strptime(date_str, '%Y-%m-%d').date()
+    task.time = datetime.strptime(time_str, '%H:%M:%S').time()
+    task.is_important = is_important
+    session.commit()
+    return RedirectResponse(
+        request.url_for("dayview", date=date_str),
+        status_code=status.HTTP_303_SEE_OTHER,
+    )
+
+
+@router.post("/done/{task_id}")
+async def set_task_done(
+        request: Request,
+        task_id: int,
+        session: Session = Depends(get_db),
+) -> RedirectResponse:
+    task = by_id(session, task_id)
+    task.is_done = True
+    session.commit()
+    return RedirectResponse(
+        request.url_for("dayview", date=task.date.strftime('%Y-%m-%d')),
+        status_code=status.HTTP_303_SEE_OTHER,
+    )
+
+
+@router.post("/undone/{task_id}")
+async def set_task_undone(
+        request: Request,
+        task_id: int,
+        session: Session = Depends(get_db),
+) -> RedirectResponse:
+    task = by_id(session, task_id)
+    task.is_done = False
+    session.commit()
+    return RedirectResponse(
+        request.url_for("dayview", date=task.date.strftime('%Y-%m-%d')),
+        status_code=status.HTTP_303_SEE_OTHER,
+    )
+
+
+@router.get("/{task_id}")
+async def get_task(
+        task_id: int,
+        session: Session = Depends(get_db),
+) -> JSONResponse:
+    task = by_id(session, task_id)
+    data = jsonable_encoder(task)
+    return JSONResponse(content=data)