core,server: changed reponse type for graphman unassign/reassign graphql api

Author: shiyasmohd

core/graphman/src/commands/deployment/unassign.rs

@@ -52,8 +52,8 @@ pub fn load_assigned_deployment(
     {
         Some(_) => Ok(AssignedDeployment { site }),
         None => Err(UnassignDeploymentError::AlreadyUnassigned(format!(
-            "{:?}",
-            deployment
+            "{}",
+            deployment.as_str()
         ))),
     }
 }

core/graphman/src/deployment.rs

@@ -31,6 +31,19 @@ pub enum DeploymentSelector {
     All,
 }
 
+impl DeploymentSelector {
+    pub fn as_str(&self) -> String {
+        match self {
+            DeploymentSelector::Name(name) => name.clone(),
+            DeploymentSelector::Subgraph { hash, shard } => {
+                format!("[Hash:{}, Shard:{:?}]", hash, shard)
+            }
+            DeploymentSelector::Schema(schema) => schema.clone(),
+            DeploymentSelector::All => "All".to_string(),
+        }
+    }
+}
+
 #[derive(Clone, Debug)]
 pub enum DeploymentVersionSelector {
     Current,

server/graphman/src/resolvers/deployment_mutation.rs

@@ -11,6 +11,7 @@ use graph_store_postgres::graphman::GraphmanStore;
 use crate::entities::DeploymentSelector;
 use crate::entities::EmptyResponse;
 use crate::entities::ExecutionId;
+use crate::entities::Response;
 use crate::resolvers::context::GraphmanContext;
 
 mod pause;
@@ -34,7 +35,7 @@ impl DeploymentMutation {
 
         pause::run(&ctx, &deployment)?;
 
-        Ok(EmptyResponse::new(None))
+        Ok(EmptyResponse::new())
     }
 
     /// Resumes a deployment that has been previously paused.
@@ -48,7 +49,7 @@ impl DeploymentMutation {
 
         resume::run(&ctx, &deployment)?;
 
-        Ok(EmptyResponse::new(None))
+        Ok(EmptyResponse::new())
     }
 
     /// Pauses a deployment and resumes it after a delay.
@@ -75,13 +76,16 @@ impl DeploymentMutation {
         &self,
         ctx: &Context<'_>,
         deployment: DeploymentSelector,
-    ) -> Result<EmptyResponse> {
+    ) -> Result<Response> {
         let ctx = GraphmanContext::new(ctx)?;
         let deployment = deployment.try_into()?;
 
         unassign::run(&ctx, &deployment)?;
 
-        Ok(EmptyResponse::new(None))
+        Ok(Response::new(
+            true,
+            format!("Unassigned {}", deployment.as_str()),
+        ))
     }
 
     /// Assign or reassign a deployment
@@ -90,7 +94,7 @@ impl DeploymentMutation {
         ctx: &Context<'_>,
         deployment: DeploymentSelector,
         node: String,
-    ) -> Result<EmptyResponse> {
+    ) -> Result<Response> {
         let ctx = GraphmanContext::new(ctx)?;
         let deployment = deployment.try_into()?;
         let node = NodeId::new(node.clone()).map_err(|()| anyhow!("illegal node id `{}`", node))?;
@@ -99,9 +103,12 @@ impl DeploymentMutation {
         let mirror = catalog::Mirror::primary_only(ctx.primary_pool);
         let count = mirror.assignments(&node)?.len();
         if count == 1 {
-            Ok(EmptyResponse::new(Some(format!("warning: this is the only deployment assigned to '{}'. Are you sure it is spelled correctly?",node.as_str()))))
+            Ok(Response::new(true,format!("warning: this is the only deployment assigned to '{}'. Are you sure it is spelled correctly?",node.as_str())))
         } else {
-            Ok(EmptyResponse::new(None))
+            Ok(Response::new(
+                true,
+                format!("Ressigned {} to {}", deployment.as_str(), node.as_str()),
+            ))
         }
     }
 }