Skip to content

Add basic update event #100

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 19 commits into from
Jan 27, 2021
Merged
Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
19 commits
Select commit Hold shift + click to select a range
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
77 changes: 76 additions & 1 deletion app/routers/event.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,11 @@
from fastapi import APIRouter, Request
from datetime import datetime
from typing import Dict, Optional, Set

from app.database.models import Event
from app.dependencies import templates
from fastapi import APIRouter, Request
from sqlalchemy import exc
from sqlalchemy.orm import Session

router = APIRouter(
prefix="/event",
Expand All @@ -19,3 +24,73 @@ async def eventedit(request: Request):
async def eventview(request: Request, id: int):
return templates.TemplateResponse("event/eventview.html",
{"request": request, "event_id": id})


def get_event_by_id(db: Session, event_id: int) -> Event:
"""Select event by id"""
return db.query(Event).filter(Event.id == event_id).first()


# copy from michael ben david
def check_validation(start_time: datetime, end_time: datetime) -> bool:
"""Check if the start time is earlier than the end time"""

if start_time < end_time:
return True
return False


def get_column_names_event(db: Session) -> Set:
result = db.execute("select * from events")
return {col for col in result.keys()}


def check_date_valitation(old_event: Event, event_update: Event):
""" Checks if the time change is possible"""
try:
if not check_validation(event_update.start, event_update.end):
return False
except TypeError:
try:
if event_update.start and not event_update.end:
if not check_validation(event_update.start, old_event.end):
return False
elif not check_validation(old_event.start, event_update.end):
return False
except TypeError:
return False
return True


def update_event(event_id: int, event_items: Dict, db: Session
) -> Optional[Event]:
# To do: Check if the user is the owner of the event.
if not bool(event_items):
return None
event_items.pop('id', None)
event_items.pop('owner_id', None)

try:
old_event = get_event_by_id(db=db, event_id=event_id)
except AttributeError: # Problem connecting to db
return None

if old_event is None: # No such event number.
return None

column_names = get_column_names_event(db)
for key in event_items.keys():
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You can leave out the .keys

if key not in column_names:
return None

update = Event(**event_items)
if not check_date_valitation(old_event, update):
return None
try:
db.query(Event).filter(Event.id == event_id).update(
event_items, synchronize_session=False)
db.commit()
# To do: Sending emails and reset.
except (AttributeError, exc.SQLAlchemyError):
return None
return get_event_by_id(db=db, event_id=event_id)
4 changes: 2 additions & 2 deletions tests/conftest.py
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import datetime

import pytest
from app.database.database import Base, SessionLocal, engine
from app.database.database import Base, engine
from app.database.models import Event, User
from app.main import app
from app.routers import profile
Expand Down Expand Up @@ -32,7 +32,7 @@ def client():
@pytest.fixture
def session():
Base.metadata.create_all(bind=engine)
session = SessionLocal()
session = TestingSessionLocal()
yield session
session.close()
Base.metadata.drop_all(bind=engine)
Expand Down
50 changes: 46 additions & 4 deletions tests/test_event.py
Original file line number Diff line number Diff line change
@@ -1,22 +1,64 @@
from fastapi.testclient import TestClient
from datetime import datetime

import pytest
from app.database.models import Event
from app.main import app
from app.routers.event import update_event

# this is fallback for those who's not getting
# the client in the function - FYI YAM.
from fastapi.testclient import TestClient
client = TestClient(app)

DATA_UPDATE_OPTIONS = [
{}, {"test": "test"}, {"start": "20.01.2020"},
{"start": datetime(2020, 2, 2), "end": datetime(2020, 1, 1)},
{"start": datetime(2030, 2, 2)}, {"end": datetime(1990, 1, 1)},
{"start": "2020-02-02", "end": "2021-12-21"},
]


def test_eventedit():
def test_eventedit(client):
response = client.get("/event/edit")
assert response.status_code == 200
assert b"Edit Event" in response.content


def test_eventview_with_id():
def test_eventview_with_id(client):
response = client.get("/event/view/1")
assert response.status_code == 200
Copy link
Contributor

@ivarshav ivarshav Jan 22, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please use starlette.status for status code, also below

assert b"View Event" in response.content


def test_eventview_without_id():
def test_eventview_without_id(client):
response = client.get("/event/view")
assert response.status_code == 404


@pytest.mark.parametrize("data", DATA_UPDATE_OPTIONS)
def test_invalid_update(data, event, session):
assert update_event(1, data, session) is None


def test_successful_update(event, session):
data = {
"title": "successful",
"start": datetime(2021, 1, 20),
"end": datetime(2021, 1, 21),
}
assert type(update_event(1, data, session)) == Event
assert "successful" in update_event(1, data, session).title


def test_update_db_close(event):
data = {
"title": "Problem connecting to db",
}
assert update_event(1, data, db=None) is None


def test_update_event_does_not_exist(event, session):
data = {
"content": "An update test for an event does not exist"
}
assert update_event(5, data, db=session) is None