Fix meeting creation context bug

rcos · Nov 19, 2021 · ae76e48 · ae76e48
1 parent b3dbf1e
commit ae76e48
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 9 deletions.
diff --git a/graphql/rcos/meetings/creation/context.graphql b/graphql/rcos/meetings/creation/context.graphql
@@ -1,8 +1,11 @@
-query CreationContext($host: [uuid!]!, $semester_filter: semesters_bool_exp!) {
+query CreationContext($host: [uuid!]!, $today: date!, $include_semesters: [String!]!) {
     # Semesters in which a meeting can be created. This will be
     # all current and future semesters in ascending order.
     available_semesters: semesters(
-        where: $semester_filter,
+        where: {_or: [
+            {end_date: {_gte: $today}},
+            {semester_id: {_in: $include_semesters}}
+        ]},
         order_by: {start_date: asc}
     ) {
         semester_id

diff --git a/src/api/rcos/meetings/creation/context.rs b/src/api/rcos/meetings/creation/context.rs
@@ -25,13 +25,8 @@ impl CreationContext {
     ) -> Result<creation_context::ResponseData, TelescopeError> {
         send_query::<Self>(creation_context::Variables {
             host: host.map(|h| vec![h]).unwrap_or(vec![]),
-            semester_filter: serde_json::from_value(json!({
-                "_or": [
-                    { "end_date": { "_gte": Utc::today().naive_utc() }},
-                    { "semester_id": {"_in": include_semesters }}
-                ]
-            }))
-            .map_err(|_| TelescopeError::ise("Malformed semester filter in GraphQL query."))?,
+            today: Utc::today().naive_utc(),
+            include_semesters
         })
         .await
     }