Skip to content

Commit 585bb96

Browse files
authored
Search submissions with status pending accepted in the schedule builder (#4581)
1 parent 6b43dee commit 585bb96

2 files changed

Lines changed: 16 additions & 2 deletions

File tree

backend/api/schedule/queries/search_events_for_schedule.py

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,10 @@ def search_events_for_schedule(
1919
) -> SearchEventsForScheduleResult:
2020
proposals = (
2121
SubmissionModel.objects.for_conference(conference_id)
22-
.accepted()
22+
.filter(
23+
Q(status=SubmissionModel.STATUS.accepted)
24+
| Q(pending_status=SubmissionModel.STATUS.accepted)
25+
)
2326
.filter(
2427
Q(title__icontains=query)
2528
| Q(speaker__full_name__icontains=query)

backend/api/schedule/tests/test_search_events_for_schedule.py

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,6 +61,14 @@ def test_search(
6161
speaker__name="John Doe",
6262
)
6363

64+
submission_2 = SubmissionFactory(
65+
conference=conference,
66+
status=Submission.STATUS.proposed,
67+
pending_status=Submission.STATUS.accepted,
68+
title=LazyI18nString({"en": "TDD talk", "it": ""}),
69+
speaker__name="John Doe",
70+
)
71+
6472
SubmissionFactory(
6573
conference=conference,
6674
status=Submission.STATUS.accepted,
@@ -91,10 +99,13 @@ def test_search(
9199
assert not response.get("errors")
92100
data = response["data"]
93101

94-
assert len(data["searchEventsForSchedule"]["results"]) == 2
102+
assert len(data["searchEventsForSchedule"]["results"]) == 3
95103
assert {"__typename": "Submission", "id": str(submission_1.hashid)} in data[
96104
"searchEventsForSchedule"
97105
]["results"]
98106
assert {"__typename": "Keynote", "id": str(keynote_1.id)} in data[
99107
"searchEventsForSchedule"
100108
]["results"]
109+
assert {"__typename": "Submission", "id": str(submission_2.hashid)} in data[
110+
"searchEventsForSchedule"
111+
]["results"]

0 commit comments

Comments
 (0)