Skip to content

Commit

Permalink
add upcoming and past true in event/me
Browse files Browse the repository at this point in the history
  • Loading branch information
@jefer94
jefer94 committed Jul 18, 2024
1 parent f28a491 commit 34e968d
Show file tree
Hide file tree
Showing 2 changed files with 298 additions and 6 deletions.
295 changes: 290 additions & 5 deletions breathecode/events/tests/urls/tests_me.py
View file
Original file line number Diff line number Diff line change
@@ -1,11 +1,10 @@
import re
from datetime import datetime
from unittest.mock import MagicMock, call, patch
from datetime import datetime, timedelta
from unittest.mock import MagicMock, patch

from django.urls.base import reverse_lazy
from django.utils import timezone

from breathecode.events.caches import EventCache
from breathecode.utils.api_view_extensions.api_view_extension_handlers import APIViewExtensionHandlers

from ..mixins.new_events_tests_case import EventTestCase

Expand Down Expand Up @@ -148,7 +147,7 @@ def get_serializer(


def extract_starting_at(d):
return datetime.strptime(str(d.starting_at), "%Y-%m-%d %H:%M:%S%z")
return d.starting_at.isoformat()


class AcademyEventTestSuite(EventTestCase):
Expand Down Expand Up @@ -301,6 +300,292 @@ def test_one_item__academy_visible(self):
self.assertEqual(json, expected)
self.assertEqual(response.status_code, 200)

"""
🥆🥆🥆 Upcoming=true
"""

@patch("django.db.models.signals.pre_delete.send_robust", MagicMock(return_value=None))
@patch("breathecode.admissions.signals.student_edu_status_updated.send_robust", MagicMock(return_value=None))
def test_upcoming_true__two_events__ends_in_the_past(self):
cases = [
(
{
"academy_id": 1,
"cohort_id": None,
"syllabus_id": None,
},
{
"academy_id": 1,
"allow_shared_creation": False,
"icon_url": "https://www.google.com",
},
{
"academy_id": 1,
},
),
(
{
"academy_id": 4,
"cohort_id": None,
"syllabus_id": None,
},
{
"academy_id": 3,
"allow_shared_creation": True,
"icon_url": "https://www.google.com",
},
{
"academy_id": 4,
},
),
]
self.headers(academy=1)
url = reverse_lazy("events:me") + f"?upcoming=true"
for event_type_visibility_setting, event_type, cohort in cases:
model = self.bc.database.create(
user=1,
event=[
{
"starting_at": timezone.now() - timedelta(hours=2),
"ending_at": timezone.now() - timedelta(hours=1),
},
{
"starting_at": timezone.now() - timedelta(hours=3),
"ending_at": timezone.now() - timedelta(hours=2),
},
],
event_kwargs={"status": "ACTIVE"},
event_type=event_type,
academy=2,
cohort=cohort,
cohort_user=1,
event_type_visibility_setting=event_type_visibility_setting,
)
self.client.force_authenticate(model.user)

response = self.client.get(url)
json = response.json()
ordered_events = sorted(model.event, key=extract_starting_at)
expected = []
expected = sorted(expected, key=lambda d: d["starting_at"])

self.assertEqual(json, expected)
self.assertEqual(response.status_code, 200)

@patch("django.db.models.signals.pre_delete.send_robust", MagicMock(return_value=None))
@patch("breathecode.admissions.signals.student_edu_status_updated.send_robust", MagicMock(return_value=None))
def test_upcoming_true__two_events__ends_in_the_future(self):
cases = [
(
{
"academy_id": 1,
"cohort_id": None,
"syllabus_id": None,
},
{
"academy_id": 1,
"allow_shared_creation": False,
"icon_url": "https://www.google.com",
},
{
"academy_id": 1,
},
),
(
{
"academy_id": 4,
"cohort_id": None,
"syllabus_id": None,
},
{
"academy_id": 3,
"allow_shared_creation": True,
"icon_url": "https://www.google.com",
},
{
"academy_id": 4,
},
),
]
self.headers(academy=1)
url = reverse_lazy("events:me") + f"?upcoming=true"
for event_type_visibility_setting, event_type, cohort in cases:
model = self.bc.database.create(
user=1,
event=[
{
"starting_at": timezone.now() + timedelta(hours=1),
"ending_at": timezone.now() + timedelta(hours=2),
},
{
"starting_at": timezone.now() + timedelta(hours=2),
"ending_at": timezone.now() + timedelta(hours=3),
},
],
event_kwargs={"status": "ACTIVE"},
event_type=event_type,
academy=2,
cohort=cohort,
cohort_user=1,
event_type_visibility_setting=event_type_visibility_setting,
)
self.client.force_authenticate(model.user)

response = self.client.get(url)
json = response.json()
ordered_events = sorted(model.event, key=extract_starting_at)
expected = [
get_serializer(self, event, model.event_type, model.user, model.academy[0], model.city)
for event in reversed(model.event)
]
expected = sorted(expected, key=lambda d: d["starting_at"])

self.assertEqual(json, expected)
self.assertEqual(response.status_code, 200)

"""
🥆🥆🥆 Past=true
"""

@patch("django.db.models.signals.pre_delete.send_robust", MagicMock(return_value=None))
@patch("breathecode.admissions.signals.student_edu_status_updated.send_robust", MagicMock(return_value=None))
def test_past_true__two_events__ends_in_the_past(self):
cases = [
(
{
"academy_id": 1,
"cohort_id": None,
"syllabus_id": None,
},
{
"academy_id": 1,
"allow_shared_creation": False,
"icon_url": "https://www.google.com",
},
{
"academy_id": 1,
},
),
(
{
"academy_id": 4,
"cohort_id": None,
"syllabus_id": None,
},
{
"academy_id": 3,
"allow_shared_creation": True,
"icon_url": "https://www.google.com",
},
{
"academy_id": 4,
},
),
]
self.headers(academy=1)
url = reverse_lazy("events:me") + f"?past=true"
for event_type_visibility_setting, event_type, cohort in cases:
model = self.bc.database.create(
user=1,
event=[
{
"starting_at": timezone.now() - timedelta(hours=2),
"ending_at": timezone.now() - timedelta(hours=1),
},
{
"starting_at": timezone.now() - timedelta(hours=3),
"ending_at": timezone.now() - timedelta(hours=2),
},
],
event_kwargs={"status": "ACTIVE"},
event_type=event_type,
academy=2,
cohort=cohort,
cohort_user=1,
event_type_visibility_setting=event_type_visibility_setting,
)
self.client.force_authenticate(model.user)

response = self.client.get(url)
json = response.json()
ordered_events = sorted(model.event, key=extract_starting_at)
expected = [
get_serializer(self, event, model.event_type, model.user, model.academy[0], model.city)
for event in reversed(model.event)
]
expected = sorted(expected, key=lambda d: d["starting_at"])

self.assertEqual(json, expected)
self.assertEqual(response.status_code, 200)

@patch("django.db.models.signals.pre_delete.send_robust", MagicMock(return_value=None))
@patch("breathecode.admissions.signals.student_edu_status_updated.send_robust", MagicMock(return_value=None))
def test_past_true__two_events__ends_in_the_future(self):
cases = [
(
{
"academy_id": 1,
"cohort_id": None,
"syllabus_id": None,
},
{
"academy_id": 1,
"allow_shared_creation": False,
"icon_url": "https://www.google.com",
},
{
"academy_id": 1,
},
),
(
{
"academy_id": 4,
"cohort_id": None,
"syllabus_id": None,
},
{
"academy_id": 3,
"allow_shared_creation": True,
"icon_url": "https://www.google.com",
},
{
"academy_id": 4,
},
),
]
self.headers(academy=1)
url = reverse_lazy("events:me") + f"?past=true"
for event_type_visibility_setting, event_type, cohort in cases:
model = self.bc.database.create(
user=1,
event=[
{
"starting_at": timezone.now() + timedelta(hours=1),
"ending_at": timezone.now() + timedelta(hours=2),
},
{
"starting_at": timezone.now() + timedelta(hours=2),
"ending_at": timezone.now() + timedelta(hours=3),
},
],
event_kwargs={"status": "ACTIVE"},
event_type=event_type,
academy=2,
cohort=cohort,
cohort_user=1,
event_type_visibility_setting=event_type_visibility_setting,
)
self.client.force_authenticate(model.user)

response = self.client.get(url)
json = response.json()
ordered_events = sorted(model.event, key=extract_starting_at)
expected = []
expected = sorted(expected, key=lambda d: d["starting_at"])

self.assertEqual(json, expected)
self.assertEqual(response.status_code, 200)

"""
🥆🥆🥆 Cohort hunter
"""
Expand Down
9 changes: 8 additions & 1 deletion breathecode/events/views.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -249,7 +249,7 @@ def get(self, request, event_id=None):
serializer = EventBigSerializer(single_event, many=False)
return Response(serializer.data)

items = Event.objects.filter(event_type__in=items, status="ACTIVE").order_by("starting_at")
items = Event.objects.filter(event_type__in=items, status="ACTIVE")
lookup = {}

online_event = self.request.GET.get("online_event", "")
Expand All @@ -258,6 +258,13 @@ def get(self, request, event_id=None):
elif online_event == "false":
lookup["online_event"] = False

if self.request.GET.get("upcoming", "") == "true":
lookup["ending_at__gte"] = timezone.now()

elif self.request.GET.get("past", "") == "true":
lookup["starting_at__lte"] = timezone.now()

items = items.order_by("starting_at")
items = items.filter(**lookup)
items = handler.queryset(items)
serializer = EventBigSerializer(items, many=True)
Expand Down

0 comments on commit 34e968d

Please sign in to comment.