fix: refine codes

Author: halajohn

core/src/ten_manager/src/designer/graphs/nodes/add.rs

@@ -33,7 +33,7 @@ pub struct AddGraphNodeRequestPayload {
 
     pub name: String,
     pub addon: String,
-    pub extension_group: Option<String>,
+    pub extension_group: String,
     pub app: Option<String>,
 
     pub property: Option<serde_json::Value>,

core/src/ten_manager/src/designer/graphs/nodes/delete.rs

@@ -33,7 +33,7 @@ pub struct DeleteGraphNodeRequestPayload {
 
     pub name: String,
     pub addon: String,
-    pub extension_group: Option<String>,
+    pub extension_group: String,
     pub app: Option<String>,
 }
 
@@ -47,7 +47,7 @@ pub fn graph_delete_extension_node(
     pkg_name: String,
     addon: String,
     app: Option<String>,
-    extension_group: Option<String>,
+    extension_group: &str,
 ) -> Result<()> {
     // Find and remove the matching node.
     let original_nodes_len = graph.nodes.len();
@@ -56,7 +56,7 @@ pub fn graph_delete_extension_node(
             && node.type_and_name.name == pkg_name
             && node.addon == addon
             && node.app == app
-            && node.extension_group == extension_group)
+            && node.extension_group == Some(extension_group.to_string()))
     });
 
     // If no node was removed, return early.
@@ -167,7 +167,7 @@ pub async fn delete_graph_node_endpoint(
         request_payload.name.clone(),
         request_payload.addon.clone(),
         request_payload.app.clone(),
-        request_payload.extension_group.clone(),
+        &request_payload.extension_group,
     ) {
         let error_response = ErrorResponse {
             status: Status::Fail,
@@ -183,7 +183,7 @@ pub async fn delete_graph_node_endpoint(
         graph_info,
         &request_payload.name,
         &request_payload.addon,
-        request_payload.extension_group.as_deref(),
+        &request_payload.extension_group,
         request_payload.app.as_deref(),
     );
 
@@ -202,7 +202,7 @@ fn update_property_json_if_needed(
     graph_info: &mut GraphInfo,
     node_name: &str,
     addon: &str,
-    extension_group: Option<&str>,
+    extension_group: &str,
     app: Option<&str>,
 ) {
     // Try to find the belonging package info
@@ -222,7 +222,7 @@ fn update_property_json_if_needed(
                 name: node_name.to_string(),
             },
             addon: addon.to_string(),
-            extension_group: extension_group.map(String::from),
+            extension_group: Some(extension_group.to_string()),
             app: app.map(String::from),
             property: None,
         };

core/src/ten_manager/src/designer/graphs/nodes/mod.rs

@@ -178,7 +178,7 @@ pub fn update_graph_node_in_property_all_fields(
     graph_info: &mut GraphInfo,
     node_name: &str,
     addon_name: &str,
-    extension_group_name: &Option<String>,
+    extension_group_name: &str,
     app_uri: &Option<String>,
     property: &Option<serde_json::Value>,
     action: GraphNodeUpdateAction,
@@ -193,7 +193,7 @@ pub fn update_graph_node_in_property_all_fields(
                 name: node_name.to_string(),
             },
             addon: addon_name.to_string(),
-            extension_group: extension_group_name.clone(),
+            extension_group: Some(extension_group_name.to_string()),
             app: app_uri.clone(),
             property: property.clone(),
         };

core/src/ten_manager/src/designer/graphs/nodes/property/update.rs

@@ -33,7 +33,7 @@ pub struct UpdateGraphNodePropertyRequestPayload {
 
     pub name: String,
     pub addon: String,
-    pub extension_group: Option<String>,
+    pub extension_group: String,
     pub app: Option<String>,
 
     pub property: Option<serde_json::Value>,
@@ -52,7 +52,8 @@ fn update_node_property_in_graph(
     let graph_node = graph_info.graph.nodes.iter_mut().find(|node| {
         node.type_and_name.name == request_payload.name
             && node.addon == request_payload.addon
-            && node.extension_group == request_payload.extension_group
+            && node.extension_group
+                == Some(request_payload.extension_group.clone())
             && node.app == request_payload.app
     });
 

core/src/ten_manager/src/designer/graphs/nodes/replace.rs

@@ -99,7 +99,21 @@ pub async fn replace_graph_node_endpoint(
 
     // Replace the addon and property of the graph node.
     let graph_node = graph_node.unwrap();
-    let extension_group = graph_node.extension_group.clone();
+
+    let extension_group =
+        if let Some(extension_group) = &graph_node.extension_group {
+            extension_group.to_string()
+        } else {
+            let error_response = ErrorResponse {
+                status: Status::Fail,
+                message: "The replacing extension node does not belong to any \
+                          extension group"
+                    .to_string(),
+                error: None,
+            };
+            return Ok(HttpResponse::BadRequest().json(error_response));
+        };
+
     graph_node.addon = request_payload.addon.clone();
     graph_node.property = request_payload.property.clone();
 

core/src/ten_manager/src/designer/template_pkgs/mod.rs

@@ -44,9 +44,15 @@ pub struct GetTemplateRequestPayload {
     pub language: TemplateLanguage,
 }
 
+#[derive(Serialize, Deserialize, Debug)]
+pub struct GetTemplateResponsePayload {
+    pub pkg_name: String,
+    pub pkg_version: String,
+}
+
 #[derive(Serialize, Deserialize, Debug)]
 pub struct GetTemplateResponseData {
-    pub template_name: Vec<String>,
+    pub templates: Vec<GetTemplateResponsePayload>,
 }
 
 pub async fn get_template_endpoint(
@@ -85,13 +91,16 @@ pub async fn get_template_endpoint(
     match result {
         Ok(packages) => {
             // Extract the package names from the PkgRegistryInfo structs.
-            let template_names: Vec<String> = packages
+            let templates: Vec<GetTemplateResponsePayload> = packages
                 .iter()
-                .map(|pkg| pkg.basic_info.type_and_name.name.clone())
+                .map(|pkg| GetTemplateResponsePayload {
+                    pkg_name: pkg.basic_info.type_and_name.name.clone(),
+                    pkg_version: pkg.basic_info.version.to_string(),
+                })
                 .collect();
 
             // Handle case where no packages were found.
-            if template_names.is_empty() {
+            if templates.is_empty() {
                 let error_message = format!(
                     "Unsupported template combination: pkg_type={}, \
                      language={}",
@@ -109,7 +118,7 @@ pub async fn get_template_endpoint(
 
             let response = ApiResponse {
                 status: Status::Ok,
-                data: GetTemplateResponseData { template_name: template_names },
+                data: GetTemplateResponseData { templates },
                 meta: None,
             };
 

core/src/ten_manager/src/graph/nodes/add.rs

@@ -12,23 +12,34 @@ use ten_rust::{
 };
 
 /// Checks if a node exists in the graph.
-fn check_node_exist(
+fn check_extension_node_exist(
     graph: &Graph,
     app: &Option<String>,
     extension: &str,
+    extension_group: &str,
 ) -> Result<()> {
-    // Validate that source node exists.
-    let src_node_exists = graph
-        .nodes
-        .iter()
-        .any(|node| node.type_and_name.name == extension && node.app == *app);
+    // Validate that extension node exists.
+    let node_exists = graph.nodes.iter().any(|node| {
+        node.type_and_name.name == extension
+            && node.app == *app
+            && node.extension_group == Some(extension_group.to_string())
+    });
 
-    if src_node_exists {
+    if node_exists {
+        if let Some(app) = app {
+            return Err(anyhow::anyhow!(
+                "Node with app '{}' and extension group '{}' and extension \
+                 '{}' already exists in the graph",
+                app,
+                extension_group,
+                extension
+            ));
+        }
         return Err(anyhow::anyhow!(
-            "Node with extension '{}' and app '{:?}' already exists in the \
-             graph",
-            extension,
-            app
+            "Node with extension group '{}' and extension '{}' already exists \
+             in the graph",
+            extension_group,
+            extension
         ));
     }
 
@@ -40,10 +51,10 @@ pub fn graph_add_extension_node(
     pkg_name: &str,
     addon: &str,
     app: &Option<String>,
-    extension_group: &Option<String>,
+    extension_group: &str,
     property: &Option<serde_json::Value>,
 ) -> Result<()> {
-    check_node_exist(graph, app, pkg_name)?;
+    check_extension_node_exist(graph, app, pkg_name, extension_group)?;
 
     // Store the original state in case validation fails.
     let original_graph = graph.clone();
@@ -55,7 +66,7 @@ pub fn graph_add_extension_node(
             name: pkg_name.to_string(),
         },
         addon: addon.to_string(),
-        extension_group: extension_group.clone(),
+        extension_group: Some(extension_group.to_string()),
         app: app.clone(),
         property: property.clone(),
     };

core/src/ten_manager/tests/test_case/designer/graphs/nodes/add.rs

@@ -74,7 +74,7 @@ mod tests {
             graph_id: Uuid::new_v4(),
             name: "test_node".to_string(),
             addon: "test_addon".to_string(),
-            extension_group: None,
+            extension_group: "custom_group".to_string(),
             app: Some("http://test-app-uri.com".to_string()),
             property: None,
         };
@@ -147,7 +147,7 @@ mod tests {
             graph_id: graph_id_clone,
             name: "test_node".to_string(),
             addon: "test_addon".to_string(),
-            extension_group: None,
+            extension_group: "custom_group".to_string(),
             app: Some(localhost().to_string()),
             property: None,
         };
@@ -225,7 +225,7 @@ mod tests {
             graph_id: graph_id_clone,
             name: "test_node".to_string(),
             addon: "test_addon".to_string(),
-            extension_group: None,
+            extension_group: "custom_group".to_string(),
             app: Some("http://example.com:8000".to_string()),
             property: None,
         };
@@ -303,7 +303,7 @@ mod tests {
             graph_id: graph_id_clone,
             name: "test_node".to_string(),
             addon: "test_addon".to_string(),
-            extension_group: None,
+            extension_group: "custom_group".to_string(),
             app: None,
             property: None,
         };
@@ -413,7 +413,7 @@ mod tests {
             graph_id: graph_id_clone,
             name: "new_node".to_string(),
             addon: "new_addon".to_string(),
-            extension_group: None,
+            extension_group: "b".to_string(),
             app: None,
             property: None,
         };
@@ -525,7 +525,6 @@ mod tests {
 
         let designer_state = Arc::new(designer_state);
 
-        // First add a node, then delete it.
         // Setup the add endpoint.
         let app_add = test::init_service(
             App::new().app_data(web::Data::new(designer_state.clone())).route(
@@ -540,7 +539,7 @@ mod tests {
             graph_id: graph_id_clone,
             name: "test_delete_node".to_string(),
             addon: "test_addon".to_string(),
-            extension_group: None,
+            extension_group: "custom_group".to_string(),
             app: Some("http://example.com:8000".to_string()),
             property: Some(serde_json::json!({
                 "test_property": "test_value_for_delete"
@@ -673,7 +672,7 @@ mod tests {
             graph_id: graph_id_clone,
             name: "test_delete_node".to_string(),
             addon: "test_addon".to_string(),
-            extension_group: None,
+            extension_group: "custom_group".to_string(),
             app: Some("http://example.com:8000".to_string()),
             property: Some(serde_json::json!({
                 "test_property": 13

core/src/ten_manager/tests/test_case/designer/graphs/nodes/delete.rs

@@ -76,7 +76,7 @@ mod tests {
             graph_id: Uuid::new_v4(),
             name: "test_node".to_string(),
             addon: "test_addon".to_string(),
-            extension_group: None,
+            extension_group: "custom_group".to_string(),
             app: Some("http://test-app-uri.com".to_string()),
         };
 
@@ -151,7 +151,7 @@ mod tests {
             graph_id: graph_id_clone,
             name: "non_existent_node".to_string(),
             addon: "test_addon".to_string(),
-            extension_group: None,
+            extension_group: "custom_group".to_string(),
             app: Some("http://example.com:8000".to_string()),
         };
 
@@ -257,7 +257,7 @@ mod tests {
             graph_id: graph_id_clone,
             name: "test_delete_node".to_string(),
             addon: "test_addon".to_string(),
-            extension_group: None,
+            extension_group: "custom_group".to_string(),
             app: Some("http://example.com:8000".to_string()),
             property: Some(serde_json::json!({
                 "test_property": "test_value_for_delete"
@@ -308,7 +308,7 @@ mod tests {
             graph_id: graph_id_clone,
             name: "test_delete_node".to_string(),
             addon: "test_addon".to_string(),
-            extension_group: None,
+            extension_group: "custom_group".to_string(),
             app: Some("http://example.com:8000".to_string()),
         };