add: minor changes

Author: IdanPelled

app/routers/event.py

@@ -51,5 +51,4 @@ def sort_by_date(events: List[Event]) -> List[Event]:
     """Sorts the events by the start of the event."""
 
     temp = events.copy()
-    temp.sort(key=attrgetter('start'))
-    return temp
+    return sorted(temp, key=attrgetter('start'))

app/routers/share.py

@@ -1,4 +1,4 @@
-from typing import List, Dict, Union
+from typing import List, Dict
 
 from sqlalchemy.orm import Session
 
@@ -18,30 +18,33 @@ def sort_emails(
     for participant in participants:
 
         if does_user_exist(email=participant, session=session):
-            emails['registered'].append(participant)
+            temp: list = emails['registered']
         else:
-            emails['unregistered'].append(participant)
+            temp: list = emails['unregistered']
+
+        temp.append(participant)
 
     return emails
 
 
 def send_email_invitation(
         participants: List[str],
         event: Event,
-):
+) -> bool:
     """Sends an email with an invitation."""
 
     ical_invitation = event_to_ical(event, participants)  # noqa: F841
     for _ in participants:
         # TODO: send email
         pass
+    return True
 
 
 def send_in_app_invitation(
         participants: List[str],
         event: Event,
         session: Session
-) -> Union[bool, None]:
+) -> bool:
     """Sends an in-app invitation for registered users."""
 
     for participant in participants:
@@ -53,8 +56,7 @@ def send_in_app_invitation(
 
         else:
             # if user tries to send to themselves.
-            session.rollback()
-            return None
+            return False
 
     session.commit()
     return True
@@ -74,12 +76,14 @@ def accept(invitation: Invitation, session: Session) -> None:
     save(association, session=session)
 
 
-def share(event: Event, participants: List[str], session: Session) -> None:
+def share(event: Event, participants: List[str], session: Session) -> bool:
     """Sends invitations to all event participants."""
 
     registered, unregistered = (
         sort_emails(participants, session=session).values()
     )
+    if send_email_invitation(unregistered, event):
+        if send_in_app_invitation(registered, event, session):
+            return True
+    return False
 
-    send_in_app_invitation(registered, event, session)
-    send_email_invitation(unregistered, event)

app/routers/user.py

@@ -50,9 +50,7 @@ def does_user_exist(
 def get_all_user_events(session: Session, user_id: int) -> List[Event]:
     """Returns all events that the user participants in."""
 
-    associations = (
-        session.query(UserEvent)
-        .filter(UserEvent.user_id == user_id)
-        .all()
+    return (
+        session.query(Event).join(UserEvent)
+        .filter(UserEvent.user_id == user_id).all()
     )
-    return [association.events for association in associations]

tests/test_event.py

@@ -1,18 +1,21 @@
+from starlette.status import HTTP_404_NOT_FOUND
+
+
 class TestEvent:
 
     def test_eventedit(self, client):
         response = client.get("/event/edit")
-        assert response.status_code == 200
+        assert response.ok
         assert b"Edit Event" in response.content
 
     def test_eventview_with_id(self, client):
         response = client.get("/event/view/1")
-        assert response.status_code == 200
+        assert response.ok
         assert b"View Event" in response.content
 
     def test_eventview_without_id(self, client):
         response = client.get("/event/view")
-        assert response.status_code == 404
+        assert response.status_code == HTTP_404_NOT_FOUND
 
     def test_repr(self, event):
         assert event.__repr__() == f'<Event {event.id}>'

tests/test_invitation.py

@@ -1,3 +1,4 @@
+from starlette.status import HTTP_302_FOUND
 from app.routers.invitation import get_all_invitations, get_invitation_by_id
 
 
@@ -7,7 +8,7 @@ class TestInvitations:
 
     def test_view_no_invitations(self, invitation_test_client):
         resp = invitation_test_client.get(self.URL)
-        assert resp.status_code == 200
+        assert resp.ok
         assert self.NO_INVITATIONS in resp.content
 
     def test_accept_invitations(
@@ -16,7 +17,7 @@ def test_accept_invitations(
         invitation = {"invite_id ": invitation.id}
         resp = invitation_test_client.post(
             self.URL, data=invitation)
-        assert resp.status_code == 302
+        assert resp.status_code == HTTP_302_FOUND
 
     def test_get_all_invitations_success(
             self, invitation, event, user, session

tests/test_share_event.py

@@ -6,14 +6,22 @@
 
 class TestShareEvent:
 
-    def test_share(self, user, event, session):
+    def test_share_success(self, user, event, session):
         participants = [user.email]
         share(event, participants, session)
         invitations = get_all_invitations(
             session=session, recipient_id=user.id
         )
         assert invitations != []
 
+    def test_share_failure(self, event, session):
+        participants = [event.owner.email]
+        share(event, participants, session)
+        invitations = get_all_invitations(
+            session=session, recipient_id=event.owner.id
+        )
+        assert invitations == []
+
     def test_sort_emails(self, user, session):
         # the user is being imported
         # so he will be created
@@ -30,7 +38,7 @@ def test_sort_emails(self, user, session):
     def test_send_in_app_invitation_success(
             self, user, sender, event, session
     ):
-        send_in_app_invitation([user.email], event, session=session)
+        assert send_in_app_invitation([user.email], event, session=session)
         invitation = get_all_invitations(session=session, recipient=user)[0]
         assert invitation.event.owner == sender
         assert invitation.recipient == user
@@ -39,7 +47,7 @@ def test_send_in_app_invitation_success(
     def test_send_in_app_invitation_failure(
             self, user, sender, event, session):
         assert (send_in_app_invitation(
-            [sender.email], event, session=session) is None)
+            [sender.email], event, session=session) is False)
 
     def test_send_email_invitation(self, user, event):
         send_email_invitation([user.email], event)