Feature/restore deleted events

app/database/models.py

@@ -111,6 +111,7 @@ class Event(Base):
         back_populates="events",
     )
     comments = relationship("Comment", back_populates="event")
+    deleted_date = Column(DateTime)
 
     # PostgreSQL
     if PSQL_ENVIRONMENT:

app/internal/restore_events.py

@@ -0,0 +1,60 @@
+from datetime import datetime, timedelta
+
+from typing import List
+
+from app.database.models import Event, UserEvent
+from app.dependencies import Session
+
+
+def delete_events_after_optionals_num_days(days: int, session: Session):
+    """
+    Delete events permanently after 30 days
+
+    Args:
+        days: number of days to delete from
+        session: db session
+    Returns:
+        None
+    """
+    date_to_delete = datetime.now() - timedelta(days=days)
+
+    user_events_ids_to_be_deleted = (
+        session.query(UserEvent)
+        .join(Event)
+        .filter(Event.deleted_date < date_to_delete)
+        .all()
+    )
+
+    for id_to_be_deleted in user_events_ids_to_be_deleted:
+        (
+            session.query(UserEvent)
+            .filter(UserEvent.id == id_to_be_deleted.id)
+            .delete()
+        )
+
+    session.query(Event).filter(Event.deleted_date < date_to_delete).delete()
+    session.commit()
+
+
+def get_events_ids_to_restored(events_data: List) -> List[str]:
+    """
+    Get the event ids that need to be restored
+
+    Args:
+        events_data: List df events
+
+    Returns:
+        Events id
+    """
+    ids = []
+    check_name = "check"
+    check_on_value = "on"
+
+    is_checkbox_is_on = False
+    for element, element_value in events_data:
+        if is_checkbox_is_on:
+            ids.append(element_value)
+            is_checkbox_is_on = False
+        if element == check_name and element_value == check_on_value:
+            is_checkbox_is_on = True
+    return ids

app/main.py

@@ -16,8 +16,10 @@
     STATIC_PATH,
     templates,
 )
+
 from app.internal import daily_quotes, json_data_loader
 from app.internal.languages import set_ui_language
+from app.internal.restore_events import delete_events_after_optionals_num_days
 from app.internal.security.ouath2 import auth_exception_handler
 from app.routers.salary import routes as salary
 from app.utils.extending_openapi import custom_openapi
@@ -130,12 +132,17 @@ async def swagger_ui_redirect():
 for router in routers_to_include:
     app.include_router(router)
 
+DAYS = 30
+
 
 # TODO: I add the quote day to the home page
 # until the relevant calendar view will be developed.
 @app.get("/", include_in_schema=False)
 @logger.catch()
 async def home(request: Request, db: Session = Depends(get_db)):
+    # delete permanently events after 30 days
+
+    delete_events_after_optionals_num_days(DAYS, next(get_db()))
     quote = daily_quotes.get_quote_of_day(db)
     return templates.TemplateResponse(
         "index.html",

app/routers/event.py

@@ -44,7 +44,6 @@
     "category_id": (int, type(None)),
 }
 
-
 router = APIRouter(
     prefix="/event",
     tags=["event"],
@@ -464,6 +463,7 @@ def get_attendees_email(session: Session, event: Event):
 def get_participants_emails_by_event(db: Session, event_id: int) -> List[str]:
     """Returns a list of all the email address of the event invited users,
     by event id."""
+
     return [
         email[0]
         for email in db.query(User.email)
@@ -477,11 +477,14 @@ def get_participants_emails_by_event(db: Session, event_id: int) -> List[str]:
 
 def _delete_event(db: Session, event: Event):
     try:
+        # TODO: Check if user activate the restore deleted events feature
+
         # Delete event
-        db.delete(event)
+        # db.delete(event)
+        event.deleted_date = dt.now()
 
         # Delete user_event
-        db.query(UserEvent).filter(UserEvent.event_id == event.id).delete()
+        # db.query(UserEvent).filter(UserEvent.event_id == event.id).delete()
 
         db.commit()
 

app/routers/profile.py

@@ -8,11 +8,15 @@
 from sqlalchemy.exc import SQLAlchemyError
 
 from app import config
-from app.database.models import User
+from app.database.models import User, Event
 from app.dependencies import get_db, MEDIA_PATH, templates, GOOGLE_ERROR
+from app.internal.security.dependancies import current_user, schema
 from app.internal.on_this_day_events import get_on_this_day_events
-from app.internal.import_holidays import (get_holidays_from_file,
-                                          save_holidays_to_db)
+from app.internal.import_holidays import (
+    get_holidays_from_file,
+    save_holidays_to_db,
+)
+from app.internal.restore_events import get_events_ids_to_restored
 from app.internal.privacy import PrivacyKinds
 
 PICTURE_EXTENSION = config.PICTURE_EXTENSION
@@ -27,20 +31,21 @@
 
 def get_placeholder_user():
     return User(
-        username='new_user',
-        email='[email protected]',
-        password='1a2s3d4f5g6',
-        full_name='My Name',
+        username="new_user",
+        email="[email protected]",
+        password="1a2s3d4f5g6",
+        full_name="My Name",
         language_id=1,
-        telegram_id='',
+        telegram_id="",
     )
 
 
 @router.get("/")
 async def profile(
-        request: Request,
-        session=Depends(get_db),
-        new_user=Depends(get_placeholder_user)):
+    request: Request,
+    session=Depends(get_db),
+    new_user=Depends(get_placeholder_user),
+):
     # Get relevant data from database
     upcoming_events = range(5)
     user = session.query(User).filter_by(id=1).first()
@@ -49,28 +54,41 @@ async def profile(
         session.commit()
         user = session.query(User).filter_by(id=1).first()
 
-    signs = ['Aries', 'Taurus', 'Gemini', 'Cancer', 'Leo',
-             'Virgo', 'Libra', 'Scorpio', 'Sagittarius',
-             'Capricorn', 'Aquarius', 'Pisces']
+    signs = [
+        "Aries",
+        "Taurus",
+        "Gemini",
+        "Cancer",
+        "Leo",
+        "Virgo",
+        "Libra",
+        "Scorpio",
+        "Sagittarius",
+        "Capricorn",
+        "Aquarius",
+        "Pisces",
+    ]
     on_this_day_data = get_on_this_day_events(session)
 
-    return templates.TemplateResponse("profile.html", {
-        "request": request,
-        "user": user,
-        "events": upcoming_events,
-        "signs": signs,
-        "google_error": GOOGLE_ERROR,
-        "on_this_day_data": on_this_day_data,
-        "privacy": PrivacyKinds
-    })
+    return templates.TemplateResponse(
+        "profile.html",
+        {
+            "request": request,
+            "user": user,
+            "events": upcoming_events,
+            "signs": signs,
+            "google_error": GOOGLE_ERROR,
+            "on_this_day_data": on_this_day_data,
+            "privacy": PrivacyKinds,
+        },
+    )
 
 
 @router.post("/update_user_fullname")
-async def update_user_fullname(
-        request: Request, session=Depends(get_db)):
+async def update_user_fullname(request: Request, session=Depends(get_db)):
     user = session.query(User).filter_by(id=1).first()
     data = await request.form()
-    new_fullname = data['fullname']
+    new_fullname = data["fullname"]
 
     # Update database
     user.full_name = new_fullname
@@ -81,11 +99,10 @@ async def update_user_fullname(
 
 
 @router.post("/update_user_email")
-async def update_user_email(
-        request: Request, session=Depends(get_db)):
+async def update_user_email(request: Request, session=Depends(get_db)):
     user = session.query(User).filter_by(id=1).first()
     data = await request.form()
-    new_email = data['email']
+    new_email = data["email"]
 
     # Update database
     user.email = new_email
@@ -96,11 +113,10 @@ async def update_user_email(
 
 
 @router.post("/update_user_description")
-async def update_profile(
-        request: Request, session=Depends(get_db)):
+async def update_profile(request: Request, session=Depends(get_db)):
     user = session.query(User).filter_by(id=1).first()
     data = await request.form()
-    new_description = data['description']
+    new_description = data["description"]
 
     # Update database
     user.description = new_description
@@ -112,7 +128,9 @@ async def update_profile(
 
 @router.post("/upload_user_photo")
 async def upload_user_photo(
-        file: UploadFile = File(...), session=Depends(get_db)):
+    file: UploadFile = File(...),
+    session=Depends(get_db),
+):
     user = session.query(User).filter_by(id=1).first()
     pic = await file.read()
 
@@ -127,11 +145,10 @@ async def upload_user_photo(
 
 
 @router.post("/update_telegram_id")
-async def update_telegram_id(
-        request: Request, session=Depends(get_db)):
+async def update_telegram_id(request: Request, session=Depends(get_db)):
     user = session.query(User).filter_by(id=1).first()
     data = await request.form()
-    new_telegram_id = data['telegram_id']
+    new_telegram_id = data["telegram_id"]
 
     # Update database
     user.telegram_id = new_telegram_id
@@ -142,13 +159,10 @@ async def update_telegram_id(
 
 
 @router.post("/privacy")
-async def update_calendar_privacy(
-        request: Request,
-        session=Depends(get_db)
-):
+async def update_calendar_privacy(request: Request, session=Depends(get_db)):
     user = session.query(User).filter_by(id=1).first()
     data = await request.form()
-    new_privacy = data['privacy']
+    new_privacy = data["privacy"]
 
     # Update database
     user.privacy = new_privacy
@@ -160,9 +174,12 @@ async def update_calendar_privacy(
 
 @router.get("/holidays/import")
 def import_holidays(request: Request):
-    return templates.TemplateResponse("import_holidays.html", {
-        "request": request,
-    })
+    return templates.TemplateResponse(
+        "import_holidays.html",
+        {
+            "request": request,
+        },
+    )
 
 
 async def process_image(image, user):
@@ -185,8 +202,7 @@ def get_image_crop_area(width, height):
 
 
 @router.post("/holidays/update")
-async def update(
-        file: UploadFile = File(...), session=Depends(get_db)):
+async def update(file: UploadFile = File(...), session=Depends(get_db)):
     icsfile = await file.read()
     holidays = get_holidays_from_file(icsfile.decode(), session)
     try:
@@ -196,3 +212,41 @@ async def update(
     finally:
         url = router.url_path_for("profile")
         return RedirectResponse(url=url, status_code=HTTP_302_FOUND)
+
+
+@router.get("/restore_events")
+async def restore_events(request: Request, session=Depends(get_db)):
+    # TODO: Add user.id instead 1
+    deleted_events = (
+        session.query(Event.id, Event.title, Event.start, Event.end)
+        .filter(Event.owner_id == 1, Event.deleted_date.isnot(None))
+        .all()
+    )
+
+    return templates.TemplateResponse(
+        "restore_events.html",
+        {"request": request, "deleted_events": deleted_events},
+    )
+
+
+@router.post("/restore_events")
+async def restore_events_post(
+    request: Request,
+    session=Depends(get_db),
+    user: schema.CurrentUser = Depends(current_user),
+):
+    data = await request.form()
+    events_ids_to_restored = get_events_ids_to_restored(data._list)
+
+    restore_del_events = (
+        session.query(Event)
+        .filter(Event.owner_id == user.user_id, Event.deleted_date.isnot(None))
+        .filter(Event.id.in_(events_ids_to_restored))
+        .all()
+    )
+
+    for del_event in restore_del_events:
+        del_event.deleted_date = None
+
+    session.commit()
+    return RedirectResponse(url="restore_events", status_code=HTTP_302_FOUND)