Feature/event patterns

app/database/models.py

@@ -57,10 +57,9 @@ class Event(Base):
     end = Column(DateTime, nullable=False)
     content = Column(String)
     location = Column(String)
-    color = Column(String, nullable=True)
+    invitees = Column(String)
 
     owner_id = Column(Integer, ForeignKey("users.id"))
-    invitees = Column(String)
     color = Column(String, nullable=True)
     category_id = Column(Integer, ForeignKey("categories.id"))
 

app/internal/event.py

@@ -1,8 +1,10 @@
 import logging
 import re
+from typing import List, Set
 
 from email_validator import EmailSyntaxError, validate_email
 from fastapi import HTTPException
+from sqlalchemy.orm import Session
 from starlette.status import HTTP_400_BAD_REQUEST
 
 from app.database.models import Event
@@ -16,25 +18,69 @@ def raise_if_zoom_link_invalid(location):
                             detail="VC type with no valid zoom link")
 
 
-def get_invited_emails(invited_from_form):
+def get_invited_emails(invited_from_form: str) -> List[str]:
     invited_emails = []
     for invited_email in invited_from_form.split(','):
         invited_email = invited_email.strip()
         try:
             validate_email(invited_email, check_deliverability=False)
-            invited_emails.append(invited_email)
         except EmailSyntaxError:
-            logging.error(f'{invited_email} is not a valid email address')
+            logging.exception(f'{invited_email} is not a valid email address')
+            continue
+        invited_emails.append(invited_email)
 
     return invited_emails
 
 
-def get_uninvited_regular_emails(session, owner_id, title, invited_emails):
-    regular_invitees = set()
+def get_uninvited_regular_emails(session: Session,
+                                 owner_id: int,
+                                 title: str,
+                                 invited_emails: List[str]) -> Set[str]:
     invitees_query = session.query(Event).with_entities(Event.invitees)
     similar_events_invitees = invitees_query.filter(Event.owner_id == owner_id,
                                                     Event.title == title).all()
+    regular_invitees = set()
     for record in similar_events_invitees:
-        regular_invitees.update(record[0].split(','))
+        if record:
+            regular_invitees.update(record[0].split(','))
 
     return regular_invitees - set(invited_emails)
+
+
+def check_diffs(checked_event: Event,
+                all_events: List[Event]):
+    """Returns the repeated events and the week difference"""
+    diffs = []
+    for event in all_events:
+        start_delta = checked_event.start - event.start
+        end_delta = checked_event.end - event.end
+
+        # The current event is before the new event and they take the same time
+        if start_delta.total_seconds() > 0 and start_delta == end_delta:
+            # Difference is in multiple of 7 days
+            if start_delta.seconds == 0 and start_delta.days % 7 == 0:
+                diffs.append(int(start_delta.days / 7))
+
+    return diffs
+
+
+def find_pattern(session, event):
+    all_events_with_same_name = session.query(Event).filter(
+        Event.owner_id == event.owner_id, Event.title == event.title).all()
+
+    return check_diffs(event, all_events_with_same_name)
+
+
+def get_messages(session: Session,
+                 event: Event,
+                 uninvited_contacts: List[str]) -> List[str]:
+    messages = []
+    if uninvited_contacts:
+        messages.append(f'Forgot to invite '
+                        f'{", ".join(uninvited_contacts)} maybe?')
+
+    pattern = find_pattern(session, event)
+    for weeks_diff in pattern:
+        messages.append(f'Same event happened {weeks_diff} weeks before too. '
+                        f'Want to create another one {weeks_diff} after too?')
+    return messages

app/routers/event.py

@@ -12,7 +12,7 @@
 from app.database.models import Event, User, UserEvent
 from app.dependencies import get_db, logger, templates
 from app.internal.event import (
-    get_invited_emails, get_uninvited_regular_emails,
+    get_invited_emails, get_messages, get_uninvited_regular_emails,
     raise_if_zoom_link_invalid,
 )
 from app.internal.utils import create_model
@@ -73,11 +73,11 @@ async def create_new_event(request: Request, session=Depends(get_db)):
 
     event = create_event(session, title, start, end, owner_id, content,
                          location, invited_emails, category_id=category_id)
-    message = ''
-    if uninvited_contacts:
-        message = f'Forgot to invite {", ".join(uninvited_contacts)} maybe?'
+
+    messages = get_messages(session, event, uninvited_contacts)
     return RedirectResponse(router.url_path_for('eventview', event_id=event.id)
-                            + f'?{message}', status_code=status.HTTP_302_FOUND)
+                            + f'messages={"---".join(messages)}',
+                            status_code=status.HTTP_302_FOUND)
 
 
 @router.get("/{event_id}")
@@ -87,12 +87,12 @@ async def eventview(request: Request, event_id: int,
     start_format = '%A, %d/%m/%Y %H:%M'
     end_format = ('%H:%M' if event.start.date() == event.end.date()
                   else start_format)
-    message = request.query_params.get('message', '')
+    messages = request.query_params.get('messages', '').split("---")
     return templates.TemplateResponse("event/eventview.html",
                                       {"request": request, "event": event,
                                        "start_format": start_format,
                                        "end_format": end_format,
-                                       "message": message})
+                                       "messages": messages})
 
 
 def by_id(db: Session, event_id: int) -> Event:

app/templates/event/eventview.html

@@ -11,6 +11,11 @@
   <div class="forgot-to-invite">
     <h2>{{ message }}</h2>
   </div>
+  <div class="messages">
+    {% for message in messages %}
+      <p>{{ message }}</p>
+    {% endfor %}
+  </div>
   <ul class="nav nav-tabs" id="event_view_nav" role="tablist">
     <li class="nav-item">
       <a class="nav-link active" id="eventdetails-tab" data-toggle="tab" href="#eventdetails" role="tab"

tests/test_event.py

@@ -16,8 +16,8 @@
 CORRECT_EVENT_FORM_DATA = {
     'title': 'test title',
     'start_date': '2021-01-28',
-    'start_time': '15:59',
-    'end_date': '2021-01-27',
+    'start_time': '12:59',
+    'end_date': '2021-01-28',
     'end_time': '15:01',
     'location_type': 'vc_url',
     'location': 'https://us02web.zoom.us/j/875384596',
@@ -58,6 +58,36 @@
     'invited': 'a@a.com,b@b.com,ccc'
 }
 
+WEEK_LATER_EVENT_FORM_DATA = {
+    'title': 'test title',
+    'start_date': '2021-02-04',
+    'start_time': '12:59',
+    'end_date': '2021-02-04',
+    'end_time': '15:01',
+    'location_type': 'vc_url',
+    'location': 'https://us02web.zoom.us/j/875384596',
+    'description': 'content',
+    'color': 'red',
+    'availability': 'busy',
+    'privacy': 'public',
+    'invited': 'a@a.com,b@b.com'
+}
+
+TWO_WEEKS_LATER_EVENT_FORM_DATA = {
+    'title': 'test title',
+    'start_date': '2021-02-11',
+    'start_time': '12:59',
+    'end_date': '2021-02-11',
+    'end_time': '15:01',
+    'location_type': 'vc_url',
+    'location': 'https://us02web.zoom.us/j/875384596',
+    'description': 'content',
+    'color': 'red',
+    'availability': 'busy',
+    'privacy': 'public',
+    'invited': 'a@a.com,b@b.com'
+}
+
 NONE_UPDATE_OPTIONS = [
     {}, {"test": "test"},
 ]
@@ -159,6 +189,29 @@ def test_eventedit_post_wrong(client, user):
     assert response.json()['detail'] == 'VC type with no valid zoom link'
 
 
+def test_eventedit_with_pattern(client, user):
+    response = client.post(client.app.url_path_for('create_new_event'),
+                           data=CORRECT_EVENT_FORM_DATA)
+    assert response.ok
+    assert response.status_code == status.HTTP_302_FOUND
+
+    response = client.post(client.app.url_path_for('create_new_event'),
+                           data=WEEK_LATER_EVENT_FORM_DATA)
+    assert response.ok
+    assert response.status_code == status.HTTP_302_FOUND
+    assert ('Same event happened 1 weeks before too. ' in
+            response.headers['location'].replace('+', ' '))
+
+    response = client.post(client.app.url_path_for('create_new_event'),
+                           data=TWO_WEEKS_LATER_EVENT_FORM_DATA)
+    assert response.ok
+    assert response.status_code == status.HTTP_302_FOUND
+    assert ('Same event happened 1 weeks before too. ' in
+            response.headers['location'].replace('+', ' '))
+    assert ('Same event happened 2 weeks before too. ' in
+            response.headers['location'].replace('+', ' '))
+
+
 @pytest.mark.parametrize("data", NONE_UPDATE_OPTIONS)
 def test_invalid_update(event, data, session):
     """