CR fixes

Author: Ap1234567

app/internal/event.py

@@ -1,13 +1,40 @@
 import re
 
+from email_validator import validate_email, EmailSyntaxError
 from fastapi import HTTPException
 
 from starlette.status import HTTP_400_BAD_REQUEST
 
+from app.database.models import Event
+
 ZOOM_REGEX = re.compile(r'https://.*?\.zoom.us/[a-z]/.[^.,\b\s]+')
 
 
 def validate_zoom_link(location):
     if ZOOM_REGEX.search(location) is None:
         raise HTTPException(status_code=HTTP_400_BAD_REQUEST,
                             detail="VC type with no valid zoom link")
+
+
+def get_invited_emails(invited_from_form):
+    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:
+            pass
+
+    return invited_emails
+
+
+def get_uninvited_regular_emails(session, owner_id, title, invited_emails):
+    regular_invitees = set()
+    for record in session.query(Event).\
+            with_entities(Event.invitees).\
+            filter(Event.owner_id == owner_id, Event.title == title).all():
+        for email in record[0].split(','):
+            regular_invitees.add(email)
+
+    return regular_invitees.difference(set(invited_emails))

app/routers/event.py

@@ -1,4 +1,3 @@
-import re
 from datetime import datetime as dt
 from operator import attrgetter
 from typing import List
@@ -13,12 +12,10 @@
 from app.database.models import User
 from app.database.models import UserEvent
 from app.dependencies import templates
-from app.internal.event import validate_zoom_link
+from app.internal.event import validate_zoom_link, get_invited_emails, get_uninvited_regular_emails
 from app.internal.utils import create_model
 from app.routers.user import create_user
 
-VALID_MAIL_REGEX = re.compile(r'^\S+@\S+\.\S+$')
-
 
 router = APIRouter(
     prefix="/event",
@@ -49,27 +46,17 @@ async def create_new_event(request: Request, session=Depends(get_db)):
     is_zoom = location_type == 'vc_url'
     location = data['location']
 
-    invitees = []
-    for invited_mail in data['invited'].split(','):
-        invited_mail = invited_mail.strip()
-        if VALID_MAIL_REGEX.fullmatch(invited_mail):
-            invitees.append(invited_mail)
-
-    regular_invitees = set()
-    for record in session.query(Event).\
-            with_entities(Event.invitees).\
-            filter(Event.owner_id == owner_id, Event.title == title).all():
-        for email in record[0].split(','):
-            regular_invitees.add(email)
-
-    uninvited_contacts = regular_invitees.difference(set(invitees))
+    invited_emails = get_invited_emails(data['invited'])
+    uninvited_contacts = get_uninvited_regular_emails(session, owner_id, title, invited_emails)
 
     if is_zoom:
         validate_zoom_link(location)
 
     event = create_event(session, title, start, end, owner_id, content,
-                         location, invitees)
-    message = f'Forgot to invite {", ".join(uninvited_contacts)} maybe?'
+                         location, invited_emails)
+    message = ''
+    if uninvited_contacts:
+        message = f'Forgot to invite {", ".join(uninvited_contacts)} maybe?'
     return RedirectResponse(f'/event/view/{event.id}?message={message}',
                             status_code=HTTP_303_SEE_OTHER)
 
@@ -86,10 +73,9 @@ def create_event(db, title, start, end, owner_id, content=None,
                  location=None, invitees=None):
     """Creates an event and an association."""
 
+    invitees_concatenated = ''
     if invitees:
-        invitees_str = ','.join(invitees)
-    else:
-        invitees_str = ''
+        invitees_concatenated = ','.join(invitees)
 
     event = create_model(
         db, Event,
@@ -99,7 +85,7 @@ def create_event(db, title, start, end, owner_id, content=None,
         content=content,
         owner_id=owner_id,
         location=location,
-        invitees=invitees_str
+        invitees=invitees_concatenated
     )
     create_model(
         db, UserEvent,

requirements.txt

@@ -7,6 +7,7 @@ chardet==4.0.0
 click==7.1.2
 colorama==0.4.4
 coverage==5.3.1
+email-validator==1.1.2
 fastapi==0.63.0
 fastapi_mail==0.3.3.1
 faker==5.6.2
@@ -49,4 +50,4 @@ uvicorn==0.13.3
 watchgod==0.6
 websockets==8.1
 wsproto==1.0.0
-zipp==3.4.0
+zipp==3.4.0

tests/test_event.py

@@ -63,7 +63,8 @@ def test_eventedit_post_correct(self, event_test_client, user):
         response = event_test_client.post("/event/edit",
                                           data=CORRECT_EVENT_FORM_DATA)
         assert response.status_code == HTTP_303_SEE_OTHER
-        assert '/event/view/' in response.headers['location']
+        assert event_test_client.app.url_path_for('eventview', id=1) in \
+               response.headers['location']
 
     def test_eventedit_post_wrong(self, event_test_client, user):
         response = event_test_client.post("/event/edit",