Feature/public event #287

noam-y · 2021-02-14T22:25:59Z

a feature that supports describing an event as a public event. as a part of this definition, it will allow sending emails to all event participants and allow joining events on the event page.

…public attr to event model, a function that adds a user to existing event and test for that function.

…ntent given as a var, and also a func that sends email to all participants in event.

… backend yet...

…t creation. fixing tests. tests are not working properly yet!

…still bugs inside

… event participants.

…ll participants

…into feature/public_event

ivarshav · 2021-02-17T21:25:37Z

app/database/models.py

@@ -61,8 +61,8 @@ class Event(Base):
    color = Column(String, nullable=True)
    availability = Column(Boolean, default=True, nullable=False)
    invitees = Column(String)
+    is_public = Column(Boolean, default=False)


Event doesn't have "friends" option?

the meaning of friends is different- public event is meant to allow any user in the platform to join the event, just like the public events on facebook. so it means the owner's friends don't matter in this feature :)

Can you please explain what is the meaning of public/private event? is it like busy/free?
Thanks

a pubic event is event anyone can join. it means you don't need to be invited directly from the owner, you can join the event by yourself by clicking a button on event page

app/templates/event/eventview.html

ivarshav · 2021-02-17T21:26:55Z

tests/test_event.py

+
+
+@pytest.fixture
+def new_user(session):


maybe you can use existing fixtures?

Tried but didn't really find a proper user fixture inside the file. ill try going over the code again

There are enough user fixtures, use one of the others.

…n telegram

app/internal/email.py

codecov-io · 2021-02-19T12:09:49Z

Codecov Report

Merging #287 (71ee772) into develop (1048956) will decrease coverage by 0.38%.
The diff coverage is 56.00%.

@@             Coverage Diff             @@
##           develop     #287      +/-   ##
===========================================
- Coverage    98.01%   97.63%   -0.39%     
===========================================
  Files           68       68              
  Lines         2979     3002      +23     
===========================================
+ Hits          2920     2931      +11     
- Misses          59       71      +12

Impacted Files	Coverage Δ
app/routers/email.py	`100.00% <ø> (ø)`
app/internal/email.py	`84.00% <26.66%> (-16.00%)`	⬇️
app/database/models.py	`96.73% <100.00%> (+0.03%)`	⬆️
app/routers/event.py	`96.94% <100.00%> (+0.09%)`	⬆️

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 1048956...9cf15b1. Read the comment docs.

… efficient.

…ally

…ead of bool of whether emails were send. tried simple tests for it

…user

…sending is supposed to fail) and the second where event owner sends email

yammesicka

Great job! Please see my insights, and use precommit hooks to format your code automatically :)

app/routers/event.py

app/templates/eventview.html

…into feature/public_event

yammesicka

Most of the problems in this version could be resolved easily using git precommit hooks.
Please run black or git precommit hooks on this code and I'll check it again :)

app/internal/email.py

app/routers/event.py

yammesicka · 2021-02-23T20:35:10Z

app/internal/email.py

+    templates,
+)
+from app.database.models import Event, User, UserEvent
+from app.internal.utils import get_current_user


Please use Kobi's user system instead

app/routers/event.py

tests/test_email.py

Gonzom · 2021-02-24T06:16:51Z

tests/conftest.py

+@pytest.fixture
+def no_event_user(session):
+    """a user made for testing who doesn't own any event."""
+    user = create_user(
+        session=session,
+        username='new_test_username',
+        password='new_test_password',
+        email='[email protected]',
+        language_id='english'
+    )
+
+    return user


Don't create a new fixture, use one of the others.

i have to use several different users since i'm testing the use of the mailing list.

Gonzom · 2021-02-24T06:17:52Z

tests/conftest.py

+@pytest.fixture
+def event_owning_user(session):
+    """a user made for testing who already owns an event."""
+    user = create_user(
+        session=session,
+        username='new_test_username2',
+        password='new_test_password2',
+        email='[email protected]',
+        language_id='english'
+    )
+
+    data = {
+        'title': 'event_owning_user event',
+        'start': datetime.strptime('2021-05-05 14:59', '%Y-%m-%d %H:%M'),
+        'end': datetime.strptime('2021-05-05 15:01', '%Y-%m-%d %H:%M'),
+        'location': 'https://us02web.zoom.us/j/875384596',
+        'content': 'content',
+        'owner_id': user.id,
+    }
+
+    create_event(session, **data)
+
+    return user


Don't create a new fixture, use one of the others. You can use a user fixture and an event fixture in your code to create this.

i have to use several different users since i'm testing the use of the mailing list.

__

Gonzom · 2021-02-24T06:18:05Z

tests/conftest.py

+@pytest.fixture
+def user1(session):
+    """another user made for testing"""
+    user = create_user(
+        session=session,
+        username='user2user2',
+        password='verynicepass',
+        email='[email protected]',
+        language_id='english'
+    )
+    return user


Don't create a new user fixture, use one of the others.

i have to use several different users since i'm testing mailing list.

Gonzom · 2021-02-24T06:18:21Z

tests/conftest.py

+@pytest.fixture
+def event_example(session, event_owning_user):
+    data = {
+        'title': 'test event title',
+        'start': datetime.strptime('2021-05-05 14:59', '%Y-%m-%d %H:%M'),
+        'end': datetime.strptime('2021-05-05 15:01', '%Y-%m-%d %H:%M'),
+        'location': 'https://us02web.zoom.us/j/87538459r6',
+        'content': 'content',
+        'owner_id': event_owning_user.id,
+    }
+
+    event = create_event(session, **data)
+    return event


Don't create a new event fixture, use one of the others.

Gonzom · 2021-02-24T06:19:04Z

tests/test_event.py

+
+
+@pytest.fixture
+def new_user(session):


There are enough user fixtures, use one of the others.

…ndar into feature/public_event

…into feature/public_event

noam-y added 13 commits February 11, 2021 14:48

basic restoration of code from a deleted branch. includes- adding is_…

5ef6469

…public attr to event model, a function that adds a user to existing event and test for that function.

added 2 functions- one to send an adaptable email, with email body co…

885a843

…ntent given as a var, and also a func that sends email to all participants in event.

added front end button to allow users to join event, not connected to…

1f4b084

… backend yet...

adding testing fixtures

8e0d1ee

adding working user and event fixture, adding is_public param to even…

5a8adeb

…t creation. fixing tests. tests are not working properly yet!

subtle changes for debugging add_user_to_event failing tests.

59532d6

added something that prevents adding null event_id to userevent objects.

235c4b2

fixed a small bug that made one of the tests fail

d32ca25

added func that send email to participants given event id- there are …

ef0f679

…still bugs inside

email not working- last commit before rebuild

c6477a5

merged changes

b7cc686

merged with current changes + added one func that sends emails to all…

540f1bf

… event participants.

improved documentation

49ac8e7

noam-y changed the base branch from main to develop February 14, 2021 22:26

noam-y added 3 commits February 15, 2021 00:34

adds feature that makes sure only the event owner can send email to a…

e111110

…ll participants

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

573cd2b

…into feature/public_event

merged changes w pulled code

847eb09

ivarshav reviewed Feb 17, 2021

View reviewed changes

app/templates/event/eventview.html Outdated Show resolved Hide resolved

ivarshav reviewed Feb 17, 2021

View reviewed changes

yammesicka and others added 5 commits February 18, 2021 16:12

Merge branch 'develop' into feature/public_event

b9d6016

merging conflicts

e715f4c

merge with code

14fc7e2

trying to add is_public feature to telegram create event bot

f515361

creating more changes to enable public feature on create event func o…

e4f2ee0

…n telegram

ivarshav reviewed Feb 18, 2021

View reviewed changes

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

noam-y added 3 commits February 18, 2021 20:29

last chance to add telegram feature- will be deleted soon...

9ffa3ea

reverting changes made on telegram

e8571f1

merging changes from pulled code

05c90a1

noam-y added 7 commits February 19, 2021 15:55

changed email sending function to depend on send function so its more…

71ee772

… efficient.

moving user and event fixtures to conftest.py so we can use them glob…

9cf15b1

…ally

changing mailing list sender to return the number of emails sent inst…

70be019

…ead of bool of whether emails were send. tried simple tests for it

making test to assert failure of sending mailing list with no logged …

1bc712c

…user

merging conflicts

f371ce1

splitting mailing list send to 2 tests- one where no user is logged (…

05310b7

…sending is supposed to fail) and the second where event owner sends email

small pep changes

c02ffd0

yammesicka requested changes Feb 21, 2021

View reviewed changes

app/routers/event.py Outdated Show resolved Hide resolved

app/routers/event.py Outdated Show resolved Hide resolved

app/routers/event.py Outdated Show resolved Hide resolved

app/templates/eventview.html Outdated Show resolved Hide resolved

noam-y added 2 commits February 21, 2021 19:15

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

8a58f78

…into feature/public_event

deleting some visual comments according to yam's commends + hooks

b6ff758

yammesicka requested changes Feb 23, 2021

View reviewed changes

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

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

app/internal/email.py Show resolved Hide resolved

app/routers/event.py Outdated Show resolved Hide resolved

trying to add precommit hooks

093881b

yammesicka requested changes Feb 24, 2021

View reviewed changes

Gonzom reviewed Feb 24, 2021

View reviewed changes

noam-y added 7 commits February 25, 2021 15:39

merge conflicts

7b4ee13

Merge branch 'feature/public_event' of https://github.com/noam-y/cale…

986b43b

…ndar into feature/public_event

finally merged conflicts

cf5b771

added guards and small changes

76db81a

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

9bbed18

…into feature/public_event

first try of adding koby's user system to event mailing list send

94c4a32

moving user fixtures from conftest to user_fixtures.

b08636e

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Feature/public event #287

Feature/public event #287

noam-y commented Feb 14, 2021

ivarshav Feb 17, 2021

noam-y Feb 18, 2021

ivarshav Feb 18, 2021

noam-y Feb 19, 2021

ivarshav Feb 17, 2021

noam-y Feb 19, 2021

Gonzom Feb 24, 2021

codecov-io commented Feb 19, 2021 •

edited

Loading

yammesicka left a comment

yammesicka left a comment

yammesicka Feb 23, 2021

Gonzom Feb 24, 2021

noam-y Feb 25, 2021

Gonzom Feb 24, 2021

noam-y Feb 25, 2021

Gonzom Feb 24, 2021

noam-y Feb 25, 2021

Gonzom Feb 24, 2021

Gonzom Feb 24, 2021



		@pytest.fixture
		def new_user(session):



		@pytest.fixture
		def new_user(session):

Feature/public event #287

Are you sure you want to change the base?

Feature/public event #287

Conversation

noam-y commented Feb 14, 2021

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

codecov-io commented Feb 19, 2021 • edited Loading

Codecov Report

yammesicka left a comment

Choose a reason for hiding this comment

yammesicka left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

codecov-io commented Feb 19, 2021 •

edited

Loading