Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Dev/v3.0 #120

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.

Sign up for GitHub

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
wderocco8 merged 9 commits into from
Jan 28, 2025
Merged

Dev/v3.0 #120

Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
ae70f84
Merge pull request #104 from whyphi/staging
wderocco8 Aug 16, 2024
ad0c523
Merge pull request #107 from whyphi/staging
wderocco8 Aug 22, 2024
bd5bb89
Merge pull request #111 from whyphi/staging
wderocco8 Sep 4, 2024
d8fa1f9
Merge pull request #114 from whyphi/staging
wderocco8 Sep 13, 2024
805837f
Merge pull request #117 from whyphi/staging
wderocco8 Sep 14, 2024
59f6215
Merge pull request #119 from whyphi/staging
jinyoungbang Jan 21, 2025
8e0d679
fixed code case sensitivity and popped attendees
wderocco8 Jan 28, 2025
1d3d598
changed False to None
wderocco8 Jan 28, 2025
37a5730
added optional type for raw_event_code
wderocco8 Jan 28, 2025
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
13 changes: 10 additions & 3 deletions chalicelib/services/EventsRushService.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
import datetime
from chalicelib.s3 import s3
from chalicelib.utils import get_prev_image_version
from typing import Optional

class EventsRushService:
class BSONEncoder(json.JSONEncoder):
Expand Down Expand Up @@ -201,7 +202,7 @@ def get_rush_event(self, event_id: str, data: dict):
)

if hide_attendees:
event.pop("attendeesId", None)
event.pop("attendees", None)

if hide_code:
event.pop("code")
Expand All @@ -215,7 +216,13 @@ def checkin_rush(self, event_id: str, user_data: dict):
f"{self.collection_prefix}rush-event", event_id
)

code = user_data["code"]
raw_user_code: str = user_data.get("code", "")
user_code = raw_user_code.lower().strip()

raw_event_code: Optional[str] = event.get("code", None)
if raw_event_code:
event_code = raw_event_code.lower().strip()

user_data.pop("code")

# Parse the timestamp string to a datetime object
Expand All @@ -224,7 +231,7 @@ def checkin_rush(self, event_id: str, user_data: dict):
if datetime.datetime.now() > deadline:
raise UnauthorizedError("Event deadline has passed.")

if code != event["code"]:
if user_code != event_code:
raise UnauthorizedError("Invalid code.")

if any(d["email"] == user_data["email"] for d in event["attendees"]):
Expand Down
Loading