Feature/restore deleted events

app/database/models.py

@@ -84,6 +84,7 @@ class Event(Base):
         "UserEvent", cascade="all, delete", 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,35 @@
+from datetime import datetime, timedelta
+from typing import List
+
+from app.database.models import Event, UserEvent
+
+
+def delete_events_after_optionals_num_days(days, session):
+    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]:
+    ids = []
+    check_element_name = 'check'
+    check_element_on_value = 'on'
+
+    is_checkbox_element_is_on = False
+    for element, element_value in events_data:
+        if is_checkbox_element_is_on:
+            ids.append(element_value)
+            is_checkbox_element_is_on = False
+        if (element == check_element_name
+                and element_value == check_element_on_value):
+            is_checkbox_element_is_on = True
+    return ids

app/main.py

@@ -4,6 +4,7 @@
 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.utils.extending_openapi import custom_openapi
 from app.routers.salary import routes as salary
@@ -101,6 +102,10 @@ async def swagger_ui_redirect():
 @app.get("/", include_in_schema=False)
 @logger.catch()
 async def home(request: Request, db: Session = Depends(get_db)):
+    # delete permanently events after 30 days
+    days = 30
+    delete_events_after_optionals_num_days(days, next(get_db()))
+
     quote = daily_quotes.quote_per_day(db)
     return templates.TemplateResponse("index.html", {
         "request": request,

app/routers/event.py

@@ -22,7 +22,6 @@
 from app.internal.emotion import get_emotion
 from app.internal.utils import create_model, get_current_user
 
-
 EVENT_DATA = Tuple[Event, List[Dict[str, str]], str, str]
 TIME_FORMAT = '%Y-%m-%d %H:%M'
 START_FORMAT = '%A, %d/%m/%Y %H:%M'
@@ -304,8 +303,8 @@ def sort_by_date(events: List[Event]) -> List[Event]:
 
 def get_attendees_email(session: Session, event: Event):
     return (
-        session.query(User.email).join(UserEvent)
-        .filter(UserEvent.events == event).all()
+        (session.query(User.email).join(UserEvent).
+         filter(UserEvent.events == event).all())
     )
 
 
@@ -321,11 +320,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,12 @@
 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.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.restore_events import get_events_ids_to_restored
 
 PICTURE_EXTENSION = config.PICTURE_EXTENSION
 PICTURE_SIZE = config.AVATAR_SIZE
@@ -194,3 +195,39 @@ 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)):
+    data = await request.form()
+    events_ids_to_restored = get_events_ids_to_restored(data._list)
+
+    # TODO: Add user.id instead 1
+    restore_del_events = (session.query(Event).
+                          filter(Event.owner_id == 1,
+                                 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)

app/static/dayview.css

@@ -1,49 +1,49 @@
 
 :root {
-  --primary: #30465D;
-  --primary-variant: #FFDE4D;
-  --secondary: #EF5454;
-  --borders: #E7E7E7;
-  --borders-variant: #F7F7F7;
+    --primary: #30465D;
+    --primary-variant: #FFDE4D;
+    --secondary: #EF5454;
+    --borders: #E7E7E7;
+    --borders-variant: #F7F7F7;
 }
 
 html {
-  font-family: 'Assistant', sans-serif;
-  text-align: center;
+    font-family: 'Assistant', sans-serif;
+    text-align: center;
 }
 
 #toptab {
-  background-color: var(--primary);
+    background-color: var(--primary);
 }
 
 .schedule {
-  display: grid;
-  grid-template-rows: 1;
+    display: grid;
+    grid-template-rows: 1;
 }
 
 .times {
-  margin-top: 0.65em;
-  grid-row: 1 / -1;
-  grid-column: 1 / -1;
-  z-index: 40;
+    margin-top: 0.65em;
+    grid-row: 1 / -1;
+    grid-column: 1 / -1;
+    z-index: 40;
 }
 
 .baselines {
-  grid-row: 1 / -1;
-  grid-column: 1 / -1;
-  z-index: 38;
+    grid-row: 1 / -1;
+    grid-column: 1 / -1;
+    z-index: 38;
 }
 
 .eventgrid {
-  grid-row: 1 / -1;
-  grid-column: 1 / -1;
-  display: grid;
-  grid-template-rows: repeat(100, 0.375rem);
-  z-index: 39;
+    grid-row: 1 / -1;
+    grid-column: 1 / -1;
+    display: grid;
+    grid-template-rows: repeat(100, 0.375rem);
+    z-index: 39;
 }
 
 .hourbar {
-  margin-top: -1px;
+    margin-top: -1px;
 }
 
 .event {
@@ -60,7 +60,7 @@ html {
 }
 
 .title_size_Xsmall {
-  font-size: 0.4em;
+    font-size: 0.4em;
 }
 
 .title_size_tiny {
@@ -70,40 +70,46 @@ html {
 }
 
 .actiongrid {
-  grid-row: 1 / -1;
-  grid-column: 1 / -1;
-  display: grid;
-  grid-template-rows: repeat(100, 0.375rem);
-  z-index: 42;
+    grid-row: 1 / -1;
+    grid-column: 1 / -1;
+    display: grid;
+    grid-template-rows: repeat(100, 0.375rem);
+    z-index: 42;
 }
 
 .action-icon {
-  visibility: hidden;
+    visibility: hidden;
 }
 
 .action-continer:hover {
-  border-top: 1px dashed var(--borders);
-  border-bottom: 1px dashed var(--borders);
-  transition: 0.3;
+    border-top: 1px dashed var(--borders);
+    border-bottom: 1px dashed var(--borders);
+    transition: 0.3;
 }
 
 .action-continer:hover .action-icon {
-  visibility: visible;
+    visibility: visible;
 }
 
 .week-view-title {
     font-size: 2em;
 }
 
 .zodiac-sign {
-  position: fixed;
-  right: 1.2em;
-  top: 1.6em;
-  padding-right: 0.4em;
-  padding-left: 0.4em;
-  padding-bottom: 0.2em;
-  border: solid 0.1px var(--primary);
-  background-color: var(--borders-variant);
-  border-radius: 50px;
-  box-shadow: 1px 1px 2px #999;
+    position: fixed;
+    right: 1.2em;
+    top: 1.6em;
+    padding-right: 0.4em;
+    padding-left: 0.4em;
+    padding-bottom: 0.2em;
+    border: solid 0.1px var(--primary);
+    background-color: var(--borders-variant);
+    border-radius: 50px;
+    box-shadow: 1px 1px 2px #999;
+}
+
+.deleted_event {
+    text-decoration: line-through;
+    border: 2px dotted black;
+    background-color: #80808057 !important;
 }