fix: for Changes requeste

Author: issac211

app/database/models.py

@@ -8,6 +8,7 @@
 from sqlalchemy import (
     Boolean,
     Column,
+    Date,
     DateTime,
     DDL,
     event,
@@ -277,13 +278,14 @@ class Task(Base):
 
     id = Column(Integer, primary_key=True, index=True)
     title = Column(String)
-    content = Column(String)
-    is_done = Column(Boolean, nullable=False)
+    description = Column(String)
+    is_done = Column(Boolean, default=False)
     is_important = Column(Boolean, nullable=False)
-    date_time = Column(DateTime, nullable=False)
+    date = Column(Date, nullable=False)
+    time = Column(Time, nullable=False)
+    owner_id = Column(Integer, ForeignKey("users.id"))
 
-    user_id = Column(Integer, ForeignKey("users.id"))
-    owner = relationship("User", back_populates=__tablename__)
+    owner = relationship("User", back_populates="tasks")
 
 
 class WeeklyTask(Base):
@@ -294,7 +296,7 @@ class WeeklyTask(Base):
     days = Column(String, nullable=False)
     content = Column(String)
     is_important = Column(Boolean, nullable=False)
-    the_time = Column(String, nullable=False)
+    task_time = Column(String, nullable=False)
 
     user_id = Column(Integer, ForeignKey("users.id"))
     owner = relationship("User", back_populates=__tablename__)

app/internal/weekly_tasks.py

@@ -6,17 +6,17 @@
 from sqlalchemy.orm.session import Session
 
 
-def check_inputs(days: str, the_time: time, title: str) -> bool:
+def check_inputs(days: str, task_time: time, title: str) -> bool:
     """Checks inputs, used by the weekly_task_from_input function"""
-    return days and the_time and title
+    return days and task_time and title
 
 
 def weekly_task_from_input(
     user: User,
     title: Optional[str],
     days: str,
     content: Optional[str],
-    the_time: Optional[time],
+    task_time: Optional[time],
     is_important: bool,
     weekly_task_id: int = 0,
 ) -> WeeklyTask:
@@ -28,7 +28,7 @@ def weekly_task_from_input(
         title (str): Title of the Weekly Task.
         days (str): Return days of the Weekly Task.
         content (str): Content of the Weekly Task.
-        the_time (time): Return time of the Weekly Task.
+        task_time (time): Return time of the Weekly Task.
         is_important (bool): If the task is important.
         weekly_task_id (int): The id of the weekly task, zero if not mentioned.
 
@@ -49,16 +49,15 @@ def weekly_task_from_input(
     if weekly_task_id != 0:
         weekly_task.id = weekly_task_id
 
-    inputs_ok = check_inputs(days, the_time, title)
+    inputs_ok = check_inputs(days, task_time, title)
     if not inputs_ok:
         return weekly_task
     weekly_task.set_days(days)
-    weekly_task.the_time = the_time.strftime("%H:%M")
+    weekly_task.task_time = task_time.strftime("%H:%M")
     return weekly_task
 
 
 def create_weekly_task(
-    user: User,
     weekly_task: WeeklyTask,
     session: Session,
 ) -> bool:
@@ -72,12 +71,12 @@ def create_weekly_task(
     Returns:
         bool: Shows if the weekly_task has been added to the db.
     """
-    if not weekly_task.days or not weekly_task.the_time:
-        return False
-    task_titles = (
-        user_weekly_task.title for user_weekly_task in user.weekly_tasks
+    inputs_ok = check_inputs(
+        weekly_task.days,
+        weekly_task.task_time,
+        weekly_task.title,
     )
-    if weekly_task.title in task_titles:
+    if not inputs_ok:
         return False
     session.add(weekly_task)
     session.commit()
@@ -100,37 +99,34 @@ def change_weekly_task(
     Returns:
         bool: Shows if the weekly_task has been edited in the db.
     """
-    if weekly_task.days is None or weekly_task.the_time is None:
+    inputs_ok = check_inputs(
+        weekly_task.days,
+        weekly_task.task_time,
+        weekly_task.title,
+    )
+    if not inputs_ok:
         return False
     w_task_query = session.query(WeeklyTask)
     old_weekly_task = w_task_query.filter_by(id=weekly_task.id).first()
 
-    user_titles = (
-        user_weekly_task.title
-        for user_weekly_task in user.weekly_tasks
-        if user_weekly_task.title != old_weekly_task.title
-    )
-
-    if weekly_task.title in user_titles:
-        return False
-
     if weekly_task.user_id != user.id:
         return False
 
     old_weekly_task.title = weekly_task.title
     old_weekly_task.days = weekly_task.days
     old_weekly_task.content = weekly_task.content
     old_weekly_task.is_important = weekly_task.is_important
-    old_weekly_task.the_time = weekly_task.the_time
+    old_weekly_task.task_time = weekly_task.task_time
     session.commit()
     return True
 
 
 def create_task(task: Task, user: User, session: Session) -> bool:
     """Make a task, used by the generate_tasks function"""
-    user_tasks_query = session.query(Task).filter_by(user_id=user.id)
-    task_by_time = user_tasks_query.filter_by(date_time=task.date_time)
-    task_by_title_and_time = task_by_time.filter_by(title=task.title)
+    user_tasks_query = session.query(Task).filter_by(owner_id=user.id)
+    task_by_time = user_tasks_query.filter_by(time=task.time)
+    task_by_date_time = task_by_time.filter_by(date=task.date)
+    task_by_title_and_time = task_by_date_time.filter_by(title=task.title)
     task_exist = task_by_title_and_time.first()
     if task_exist:
         return False
@@ -139,32 +135,33 @@ def create_task(task: Task, user: User, session: Session) -> bool:
     return True
 
 
-def get_datetime(day: str, the_time: str) -> datetime:
+def get_datetime(day: str, task_time: str) -> datetime:
     """Getting the datetime of days in the current week,
     used by the generate_tasks function"""
     current_date = date.today()
     current_week_num = current_date.strftime("%W")
     current_year = current_date.strftime("%Y")
-    date_string = f"{day} {the_time} {current_week_num} {current_year}"
+    date_string = f"{day} {task_time} {current_week_num} {current_year}"
     return datetime.strptime(date_string, "%a %H:%M %W %Y")
 
 
 def generate_tasks(user: User, session: Session) -> Iterator[bool]:
     """Generates tasks for the week
     based on all the weekly tasks the user have"""
     for weekly_task in user.weekly_tasks:
-        the_time = weekly_task.the_time
+        task_time = weekly_task.task_time
         days = weekly_task.get_days()
         days_list = days.split(", ")
         for day in days_list:
-            date_time = get_datetime(day, the_time)
+            date_time = get_datetime(day, task_time)
             task = Task(
                 title=weekly_task.title,
-                content=weekly_task.content,
+                description=weekly_task.content,
                 is_done=False,
                 is_important=weekly_task.is_important,
-                date_time=date_time,
-                user_id=user.id,
+                date=date_time.date(),
+                time=date_time.time(),
+                owner_id=user.id,
             )
             yield create_task(task, user, session)
 

app/routers/weekly_tasks.py

@@ -70,7 +70,7 @@ def get_days_string(
     return days
 
 
-@router.get("/")
+@router.get("/", include_in_schema=False)
 async def weekly_tasks_manager(
     request: Request,
     user: schema.CurrentUser = Depends(current_user_from_db),
@@ -165,7 +165,7 @@ def weekly_task_execute(
     sat: bool = Form(False),
     content: str = Form(None),
     is_important: bool = Form(False),
-    the_time: datetime.time = Form(None),
+    task_time: datetime.time = Form(None),
     weekly_task_id: int = Form(...),
 ):
 
@@ -177,14 +177,14 @@ def weekly_task_execute(
         title,
         days,
         content,
-        the_time,
+        task_time,
         is_important,
         weekly_task_id=weekly_task_id,
     )
 
     if mode == "add":
         # creating the weekly task
-        created = create_weekly_task(user, weekly_task, session)
+        created = create_weekly_task(weekly_task, session)
         executed = created
 
     else:  # mode == "edit":
@@ -223,7 +223,7 @@ def weekly_task_failed(
     days: str = Cookie(...),
     is_important: bool = Cookie(False),
 ):
-    the_time = None
+    task_time = None
     if title == "None":
         title = None
     if content == "None":
@@ -233,7 +233,7 @@ def weekly_task_failed(
         title,
         days,
         content,
-        the_time,
+        task_time,
         is_important,
         id,
     )

app/templates/add_edit_weekly_task.html

@@ -58,8 +58,8 @@ <h1>Add Weekly Tasks</h1>
         </div>
 
         <div class="mb-3">
-            <label for="the_time" class="form-label">Time Of The Day:</label>
-            <input type="time" class="form-control" value="{{ weekly_task.the_time }}" id="the_time" name="the_time">
+            <label for="task_time" class="form-label">Time Of The Day:</label>
+            <input type="time" class="form-control" value="{{ weekly_task.task_time }}" id="task_time" name="task_time">
         </div>
 
         <div class="input-group">

app/templates/weekly_tasks_manager.html

@@ -16,7 +16,7 @@ <h1>Weekly Tasks</h1>
                 <!-- Task repeat days and time -->
                 <small>
                     <i><span class="text-decoration-underline">Every:</span> {{ weekly_task.get_days() }}</i>
-                    <i><span class="text-decoration-underline">at:</span> {{ weekly_task.the_time }} </i>
+                    <i><span class="text-decoration-underline">at:</span> {{ weekly_task.task_time }} </i>
                 </small>
                 <!-- End Task repeat days and time -->