feat: handled new rules

Author: raphael-goetz

adapter/rest/src/.env

@@ -2,4 +2,4 @@ PORT=8081
 REDIS_URL=redis://localhost:6379
 RABBITMQ_URL=amqp://localhost:5672
 AQUILA_URL=http://localhost:8080
-IS_STATIC=true
+IS_STATIC=false

adapter/rest/src/queue/mod.rs

@@ -8,7 +8,7 @@ pub mod queue {
     use std::{collections::HashMap, sync::Arc, time::Duration};
     use tokio::sync::Mutex;
     use tucana::shared::{Struct, Value};
-    use validator::{resolver::flow_resolver::resolve_flow, verify_flow};
+    use validator::verify_flow;
 
     use crate::store::store::check_flow_exists;
 
@@ -88,31 +88,16 @@ pub mod queue {
                 }
             }
         }
-        // Determine which flow to use based on request body
-        let flow_to_use = if let Some(body) = &request.body {
-            // Verify flow
+
+        if let Some(body) = &request.body {
+            // Verify the rules of a Flow - this is only possible if a body exists
             if let Err(err) = verify_flow(flow.clone(), body.clone()) {
                 return Some(HttpResponse::bad_request(err.to_string(), HashMap::new()));
             }
-
-            // Resolve flow
-            let mut resolvable_flow = flow.clone();
-            match resolve_flow(&mut resolvable_flow, body.clone()) {
-                Ok(resolved_flow) => resolved_flow,
-                Err(_) => {
-                    return Some(HttpResponse::internal_server_error(
-                        "Internal Server Error".to_string(),
-                        HashMap::new(),
-                    ))
-                }
-            }
-        } else {
-            // Use original flow if no body
-            flow
-        };
+        }
 
         // Serialize flow
-        let json_flow = match serde_json::to_string(&flow_to_use) {
+        let json_flow = match serde_json::to_string(&flow) {
             Ok(string) => string,
             Err(err) => {
                 return Some(HttpResponse::internal_server_error(

crates/validator/src/lib.rs

@@ -1,4 +1,3 @@
-pub mod resolver;
 mod rules;
 
 use rules::{
@@ -40,7 +39,7 @@ pub fn verify_flow(flow: Flow, body: Value) -> Result<(), DataTypeRuleError> {
 }
 
 //Verifies the rules on the datatype of the body thats given
-pub fn verify_data_type_rules(
+fn verify_data_type_rules(
     body: Value,
     data_type: DataType,
     availabe_data_types: &Vec<DataType>,
@@ -98,9 +97,8 @@ pub fn verify_data_type_rules(
                     }
                 };
             }
-            _ => {
-                todo!("Implement missing configs. (Question: should I skip input and return rule?)")
-            }
+            // Draco dont checks Node Rules (Input/Return Type Rules!)
+            _ => continue,
         }
     }
 
@@ -111,7 +109,7 @@ pub fn verify_data_type_rules(
     }
 }
 
-pub fn get_data_type_by_id(data_types: &Vec<DataType>, str_id: &String) -> Option<DataType> {
+fn get_data_type_by_id(data_types: &Vec<DataType>, str_id: &String) -> Option<DataType> {
     let id = str_id.parse::<i32>().unwrap_or(1211);
 
     data_types