Implement spec-compliant error responses

FuelLabs · Dec 13, 2023 · 829fa86 · 829fa86
1 parent 3a380b9
commit 829fa86
Showing 1 changed file with 13 additions and 4 deletions.
diff --git a/packages/fuel-indexer-api-server/src/uses.rs b/packages/fuel-indexer-api-server/src/uses.rs
@@ -60,16 +60,25 @@ pub(crate) async fn query_graph(
             let dynamic_schema =
                 fuel_indexer_graphql::dynamic::build_dynamic_schema(&schema)?;
             let user_query = req.0.query.clone();
-            let response = fuel_indexer_graphql::query::execute(
+            match fuel_indexer_graphql::query::execute(
                 req.into_inner(),
                 dynamic_schema,
                 user_query,
                 pool,
                 schema,
             )
-            .await?;
-            let data = serde_json::json!({ "data": response });
-            Ok(axum::Json(data))
+            .await
+            {
+                Ok(response) => {
+                    let data = serde_json::json!({"data": response});
+                    Ok(axum::Json(data))
+                }
+                Err(e) => {
+                    let data =
+                        serde_json::json!({"errors": [{"message": e.to_string()}]});
+                    Ok(axum::Json(data))
+                }
+            }
         }
         Err(_e) => Err(ApiError::Http(HttpError::NotFound(format!(
             "The graph '{namespace}.{identifier}' was not found."