Update reference resolvers for router

graph-data-processing/src/graphql/entities.rs

@@ -2,12 +2,12 @@ use async_graphql::SimpleObject;
 use models::data_collection_file_attachment;
 
 #[derive(Clone, Debug, PartialEq, SimpleObject)]
-#[graphql(name = "DataProcessing")]
+#[graphql(name = "DataProcessing", unresolvable)]
 pub struct DataProcessing {
-    /// An opaque unique identifier for the collected file attachment 
-    pub data_collection_file_attachment_id: u32, 
+    /// An opaque unique identifier for the collected file attachment
+    pub data_collection_file_attachment_id: u32,
     /// Full path where the processed image is stored
-    pub file_full_path: String, 
+    pub file_full_path: String,
 }
 
 impl From<data_collection_file_attachment::Model> for DataProcessing {
@@ -23,5 +23,5 @@ impl From<data_collection_file_attachment::Model> for DataProcessing {
 #[graphql(name = "Datasets", complex)]
 pub struct DataCollection {
     /// An opaque unique identifier for the data collection
-    pub data_collection_id: u32,
+    pub id: u32,
 }

graph-data-processing/src/graphql/mod.rs

@@ -2,11 +2,11 @@
 mod entities;
 
 use async_graphql::{
-    Context, ComplexObject, EmptyMutation, EmptySubscription, Object, Schema, SchemaBuilder,
+    ComplexObject, Context, EmptyMutation, EmptySubscription, Object, Schema, SchemaBuilder,
 };
-use entities::{DataProcessing, DataCollection};
-use sea_orm::{DatabaseConnection, EntityTrait, QueryFilter, ColumnTrait};
+use entities::{DataCollection, DataProcessing};
 use models::data_collection_file_attachment;
+use sea_orm::{ColumnTrait, DatabaseConnection, EntityTrait, QueryFilter};
 
 /// The GraphQL schema exposed by the service
 pub type RootSchema = Schema<Query, EmptyMutation, EmptySubscription>;
@@ -23,23 +23,26 @@ pub struct Query;
 #[ComplexObject]
 impl DataCollection {
     /// Fetched all the processed data from data collection during a session
-    async fn processed_data(&self, ctx: &Context<'_>) -> Result<Vec<DataProcessing>, async_graphql::Error> {
-    let database = ctx.data::<DatabaseConnection>()?;
-    Ok(data_collection_file_attachment::Entity::find()
-        .filter(data_collection_file_attachment::Column::DataCollectionId.eq(self.data_collection_id))
-        .all(database)
-        .await?
-        .into_iter()
-        .map(DataProcessing::from)
-        .collect())
+    async fn processed_data(
+        &self,
+        ctx: &Context<'_>,
+    ) -> Result<Vec<DataProcessing>, async_graphql::Error> {
+        let database = ctx.data::<DatabaseConnection>()?;
+        Ok(data_collection_file_attachment::Entity::find()
+            .filter(data_collection_file_attachment::Column::DataCollectionId.eq(self.id))
+            .all(database)
+            .await?
+            .into_iter()
+            .map(DataProcessing::from)
+            .collect())
     }
 }
 
 #[Object]
 impl Query {
     /// Reference datasets resolver for the router
     #[graphql(entity)]
-    async fn router_data_collection(&self, data_collection_id: u32) -> DataCollection {
-        DataCollection { data_collection_id }
+    async fn router_data_collection(&self, id: u32) -> DataCollection {
+        DataCollection { id }
     }
 }