feat: add put bso and post collection validator/extractors

src/db/params.rs

@@ -1,5 +1,5 @@
 //! Parameter types for database methods.
-use web::extractors::HawkIdentifier;
+use web::extractors::{BatchBsoBody, HawkIdentifier};
 
 macro_rules! data {
     ($name:ident {$($property:ident: $type:ty,)*}) => {
@@ -82,3 +82,14 @@ pub struct PostCollectionBso {
     pub payload: Option<String>,
     pub ttl: Option<u32>,
 }
+
+impl From<BatchBsoBody> for PostCollectionBso {
+    fn from(b: BatchBsoBody) -> PostCollectionBso {
+        PostCollectionBso {
+            id: b.id,
+            sortindex: b.sortindex,
+            payload: b.payload,
+            ttl: b.ttl,
+        }
+    }
+}

src/server/test.rs

@@ -234,6 +234,7 @@ fn put_bso() {
     let now = ms_since_epoch() as u64;
     test_endpoint_with_body! {
         PUT "/42/storage/bookmarks/wibble", BsoBody {
+            id: Some("wibble".to_string()),
             sortindex: Some(0),
             payload: Some("wibble".to_string()),
             ttl: Some(31536000),

src/web/error.rs

@@ -3,6 +3,7 @@
 use std::fmt;
 
 use actix_web::http::header::ToStrError;
+use actix_web::Error as ActixError;
 use base64::DecodeError;
 use failure::{Backtrace, Context, Fail, SyncFailure};
 use hawk::Error as ParseError;
@@ -120,6 +121,13 @@ impl From<ValidationErrorKind> for ApiError {
     }
 }
 
+impl From<ValidationErrorKind> for ActixError {
+    fn from(kind: ValidationErrorKind) -> Self {
+        let api_error: ApiError = kind.into();
+        api_error.into()
+    }
+}
+
 impl Serialize for ValidationError {
     fn serialize<S>(&self, serializer: S) -> Result<S::Ok, S::Error>
     where