Add proposal code to session query parameters

DiamondLightSource · Apr 11, 2024 · 0ead0e3 · 0ead0e3
1 parent 655580b
commit 0ead0e3
Showing 1 changed file with 9 additions and 4 deletions.
diff --git a/sessions/src/graphql.rs b/sessions/src/graphql.rs
@@ -88,23 +88,28 @@ impl Query {
     async fn session(
         &self,
         ctx: &Context<'_>,
-        proposal: u32,
+        proposal_code: String,
+        proposal_number: u32,
         visit: u32,
     ) -> Result<Option<Session>, async_graphql::Error> {
         let database = ctx.data::<DatabaseConnection>()?;
         ctx.data::<OpaClient>()?
             .decide(OpaInput::new(
                 ctx,
-                OpaSessionParameters { proposal, visit },
+                OpaSessionParameters {
+                    proposal: proposal_number,
+                    visit,
+                },
             )?)
             .await?;
         info!("Retrieving session");
         Ok(bl_session::Entity::find()
             .find_also_related(proposal::Entity)
             .filter(
                 Condition::all()
-                    .add(bl_session::Column::VisitNumber.eq(visit))
-                    .add(proposal::Column::ProposalNumber.eq(proposal)),
+                    .add(proposal::Column::ProposalCode.eq(proposal_code))
+                    .add(proposal::Column::ProposalNumber.eq(proposal_number))
+                    .add(bl_session::Column::VisitNumber.eq(visit)),
             )
             .one(database)
             .await?