queryer merger test progress

src/validator/mod.rs

@@ -4,7 +4,6 @@ pub mod context;
 pub mod error;
 pub mod result;
 pub mod rules;
-pub mod util;
 
 pub use context::ValidationContext;
 pub use error::ValidationError;
@@ -46,11 +45,7 @@ impl Validator {
     }
   }
 
-  pub fn validate(
-    &self,
-    schema_id: &str,
-    instance: &Value,
-  ) -> Result<ValidationResult, ValidationError> {
+  pub fn validate(&self, schema_id: &str, instance: &Value) -> crate::drop::Drop {
     if let Some(schema) = self.db.schemas.get(schema_id) {
       let ctx = ValidationContext::new(
         &self.db,
@@ -61,13 +56,37 @@ impl Validator {
         false,
         false,
       );
-      ctx.validate_scoped()
+      match ctx.validate_scoped() {
+        Ok(result) => {
+          if result.is_valid() {
+            crate::drop::Drop::success()
+          } else {
+            let errors: Vec<crate::drop::Error> = result
+              .errors
+              .into_iter()
+              .map(|e| crate::drop::Error {
+                code: e.code,
+                message: e.message,
+                details: crate::drop::ErrorDetails { path: e.path },
+              })
+              .collect();
+            crate::drop::Drop::with_errors(errors)
+          }
+        }
+        Err(e) => crate::drop::Drop::with_errors(vec![crate::drop::Error {
+          code: e.code,
+          message: e.message,
+          details: crate::drop::ErrorDetails { path: e.path },
+        }]),
+      }
     } else {
-      Err(ValidationError {
+      crate::drop::Drop::with_errors(vec![crate::drop::Error {
         code: "SCHEMA_NOT_FOUND".to_string(),
         message: format!("Schema {} not found", schema_id),
-        path: "".to_string(),
-      })
+        details: crate::drop::ErrorDetails {
+          path: "".to_string(),
+        },
+      }])
     }
   }
 }