Feature/shareable event #44

IdanPelled · 2021-01-13T20:03:51Z

Expand the user model and the event model
Add invitation model
Create in app shareable events
Create foundations for sending email invitations (export to .ics file)

…nto feature/shareable-event

app/utils/user.py

.gitignore

app/utils/utils.py

app/utils/user.py

app/internal/share_event.py

app/utils/config.py

app/utils/export.py

app/utils/invitation.py

.gitignore

app/utils/user.py

app/internal/share_event.py

app/main.py

codecov-io · 2021-01-16T15:44:43Z

Codecov Report

Merging #44 (3400fe9) into develop (17a43c6) will increase coverage by 1.23%.
The diff coverage is 100.00%.

@@             Coverage Diff              @@
##           develop       #44      +/-   ##
============================================
+ Coverage    98.76%   100.00%   +1.23%     
============================================
  Files           11        16       +5     
  Lines          243       424     +181     
============================================
+ Hits           240       424     +184     
+ Misses           3         0       -3

Impacted Files	Coverage Δ
app/database/database.py	`100.00% <ø> (ø)`
app/database/models.py	`100.00% <100.00%> (ø)`
app/internal/agenda_events.py	`100.00% <100.00%> (+6.25%)`	⬆️
app/internal/events.py	`100.00% <100.00%> (ø)`
app/internal/utils.py	`100.00% <100.00%> (ø)`
app/main.py	`100.00% <100.00%> (+5.88%)`	⬆️
app/routers/agenda.py	`100.00% <100.00%> (ø)`
app/routers/event.py	`100.00% <100.00%> (ø)`
app/routers/export.py	`100.00% <100.00%> (ø)`
app/routers/invitation.py	`100.00% <100.00%> (ø)`
... and 9 more

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update 17a43c6...3400fe9. Read the comment docs.

ivarshav · 2021-01-16T16:13:40Z

app/main.py



+@app.get("/invitations")
+def view_invitations(request: Request, db: Session = Depends(get_db)):


Would you like to create a specific route for invitations?

ivarshav · 2021-01-16T16:15:12Z

app/utils/export.py

@@ -0,0 +1,103 @@
+from datetime import datetime


What is the difference between files under internal/ and utils/ folders?

+1. Maybe should be under app/routers/export.py?

ivarshav · 2021-01-16T16:18:57Z

tests/conftest.py

+from sqlalchemy.orm import Session, sessionmaker
+
+from app.database.models import Event, Invitation, User, Base
+


Consider: create a separate db_entities conftest file.
As far as I know, this is how you reference the other files:
pytest_plugins = ['module1', 'module2']
(stackoverflow answer)

yammesicka · 2021-01-16T17:47:42Z

app/internal/share_event.py

@@ -0,0 +1,85 @@
+from typing import List, Dict, Union


I believe this file should be in app/routers/share.py?

https://fastapi.tiangolo.com/tutorial/bigger-applications/

yammesicka · 2021-01-16T17:49:54Z

app/main.py

        "request": request,
        "username": current_username,
-        "events": upcouming_events
+        "events": upcoming_events


Add trailing ,

yammesicka · 2021-01-16T17:51:34Z

app/utils/export.py

@@ -0,0 +1,103 @@
+from datetime import datetime


+1. Maybe should be under app/routers/export.py?

app/utils/invitation.py

app/utils/user.py

yammesicka · 2021-01-17T01:37:12Z

Please change the PR to merge into PythonFreeCourse:develop

ivarshav · 2021-01-17T18:16:46Z

tests/conftest.py

+        email='test.email@gmail.com',
+    )
+    yield test_user
+    delete_instance(session, test_user)


I like that you thought of the concept of DRY :)
Personally, I prefer to read tests with their logic as clear as possible - it's easier to understand what is going on in the test, and when.
So, I'm not sure if delete_instance function is more useful or more helps tests to be ambiguous :)
What do you think?

app/internal/agenda_events.py

yammesicka · 2021-01-20T00:40:03Z

app/internal/agenda_events.py

+        end: Optional[date]) -> List[Event]:
+    """filter events by a time frame."""
+
+    return [


To match the behavior of the original filter, I might use yield from (event for ...)

yammesicka · 2021-01-20T00:41:44Z

app/internal/utils.py

+    return False
+
+
+def get_all_user_events(session: Session, user_id: int) -> List[Event]:


This should prolly be in the routers/user.py file

yammesicka · 2021-01-20T06:15:15Z

tests/conftest.py



-@pytest.fixture
+@pytest.fixture(scope="session")


Nicely done

yammesicka · 2021-01-20T06:44:03Z

app/routers/export.py

+    """Adds an optional field if it exists."""
+
+    if user_event.location:
+        data += [('location', user_event.location)]


Prefer .append to use the current list and not create a new one :)

yammesicka · 2021-01-20T06:46:19Z

app/routers/user.py

+
+def does_user_exist(
+        session: Session,
+        *_, user_id=None,


You can use just plain * (without giving it a name)

PureDreamer · 2021-01-20T11:02:42Z

app/database/models.py

    description = Column(String, default="Happy new user!")
    avatar = Column(String, default="profile.png")
-
    is_active = Column(Boolean, default=True)


I think it would be wiser to set it as False if its about being connected to the calendar

app/internal/agenda_events.py

app/config.py

yammesicka · 2021-01-22T02:58:49Z

app/internal/events.py

+from app.database.models import Event
+
+
+def sort_by_date(events: List[Event]) -> List[Event]:


I think we should add /sort to event.py in routers

app/internal/agenda_events.py

.gitignore

tests/test_event.py

tests/test_share_event.py

tests/test_invitation.py

app/routers/share.py

app/routers/invitation.py

app/routers/user.py

yammesicka · 2021-01-23T20:43:00Z

app/routers/event.py

+def sort_by_date(events: List[Event]) -> List[Event]:
+    """Sorts the events by the start of the event."""
+
+    temp = events.copy()


No need to, sorted already makes a copy of it

yammesicka · 2021-01-23T20:49:04Z

app/routers/share.py

+    for participant in participants:
+
+        if does_user_exist(email=participant, session=session):
+            temp: list = emails['registered']


List[] (of what?)

yammesicka · 2021-01-23T20:52:24Z

app/routers/share.py

+    """Sends invitations to all event participants."""
+
+    registered, unregistered = (
+        sort_emails(participants, session=session).values()


Prefer explicitly asking the dictionary, in case the sort_emails will change and the order will be tempered:

emails = sort_email(...) registered, unregistered = emails['registered'], emails['unregistered']

yammesicka · 2021-01-23T20:53:54Z

tests/test_home.py

+
+    def test_get_page(self, client):
+        resp = client.get(self.URL)
+        assert resp.status_code == 200


IdanPelled added 7 commits January 12, 2021 15:40

update ORM and added export for an event

8928b17

update ORM and added export for an event

79874a7

Merge branch 'main' of https://github.com/PythonFreeCourse/calendar i…

bc53da7

…nto feature/shareable-event

Added in app shareable events

8f4e690

upstream merge

25d1b80

docs: add type annotation and fix folder structure

8fb1035

docs: add type annotation and fix folder structure

149b571

ivarshav reviewed Jan 13, 2021

View reviewed changes

app/utils/user.py Outdated Show resolved Hide resolved

yammesicka requested changes Jan 14, 2021

View reviewed changes

ivarshav reviewed Jan 14, 2021

View reviewed changes

app/utils/user.py Outdated Show resolved Hide resolved

docs: fix documentation

be96e5d

Gonzom reviewed Jan 15, 2021

View reviewed changes

app/internal/share_event.py Outdated Show resolved Hide resolved

app/main.py Outdated Show resolved Hide resolved

IdanPelled added 3 commits January 16, 2021 00:19

add: tests

9b2a861

add: timezone support

aa654ac

add: session management

5227c11

fix bug

56877c6

ivarshav reviewed Jan 16, 2021

View reviewed changes

yammesicka requested changes Jan 16, 2021

View reviewed changes

IdanPelled added 2 commits January 16, 2021 22:02

split conftest file

eda3c31

split conftest file

c24830a

ivarshav mentioned this pull request Jan 17, 2021

Feat/Basic Email use #61

Merged

IdanPelled changed the base branch from main to develop January 17, 2021 12:44

move "utils" folder into "internal" folder

69f81e1

ivarshav reviewed Jan 17, 2021

View reviewed changes

IdanPelled added 2 commits January 18, 2021 18:22

change file structure

0dc1ae6

Merge branch 'develop' into feature/shareable-event

868ba44

IdanPelled added 8 commits January 19, 2021 22:43

feat: enable invited users to view events

3883d5e

Merge branch 'develop into feature/shareable-event

e39c43d

feat: flake8 changes

6add784

fix: requirements bug

cccd7b7

fix: requirements bug

5faf0ba

feat: flake8 changes

bdd4d8b

add: tests

d629a25

feat: flake8 changes

046162d

yammesicka requested changes Jan 20, 2021

View reviewed changes

IdanPelled added 2 commits January 20, 2021 10:04

add: tests

0bcbff8

feat: flake8 changes

9462602

PureDreamer reviewed Jan 20, 2021

View reviewed changes

IdanPelled added 5 commits January 20, 2021 14:02

edit: file structure

053b156

edit: file structure

7684719

feat: add route tests

8b97c29

fix: test bug

ba09ff0

Merge branch 'develop' into feature/shareable-event

44f30a0

yammesicka closed this Jan 21, 2021

yammesicka deleted the branch PythonFreeCourse:develop January 21, 2021 02:36

yammesicka reopened this Jan 21, 2021

yammesicka reviewed Jan 21, 2021

View reviewed changes

app/config.py Outdated Show resolved Hide resolved

remove: config.py

3400fe9

yammesicka requested changes Jan 22, 2021

View reviewed changes

fix: type annotation

e0c75f5

yammesicka requested changes Jan 22, 2021

View reviewed changes

IdanPelled added 2 commits January 22, 2021 18:01

add: minor changes

3ec5f37

feat: flake8 changes

b9198d5

yammesicka reviewed Jan 23, 2021

View reviewed changes

yammesicka requested changes Jan 23, 2021

View reviewed changes

yammesicka merged commit ab45a02 into PythonFreeCourse:develop Jan 23, 2021



		@app.get("/invitations")
		def view_invitations(request: Request, db: Session = Depends(get_db)):

		from sqlalchemy.orm import Session, sessionmaker

		from app.database.models import Event, Invitation, User, Base

		return False


		def get_all_user_events(session: Session, user_id: int) -> List[Event]:

		from app.database.models import Event


		def sort_by_date(events: List[Event]) -> List[Event]:



		@pytest.fixture
		@pytest.fixture(scope="session")

Feature/shareable event #44

Feature/shareable event #44

Uh oh!

Conversation

IdanPelled commented Jan 13, 2021

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

codecov-io commented Jan 16, 2021 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Codecov Report

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

yammesicka commented Jan 17, 2021

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Choose a reason for hiding this comment

Uh oh!

codecov-io commented Jan 16, 2021 •

edited

Loading