vw_small

commit 84810f2bb22a161b7ef5b6e081acde5cadcfd155
parent a71359f647bf9f356dfad3d32e660f53c0e906e4
Author: Daniel García <dani-garcia@users.noreply.github.com>
Date:   Tue, 16 Mar 2021 18:10:23 +0100

Remove unnecessary fields from send access

Diffstat:
M
src/api/core/sends.rs
 | 
2
+-
M
src/db/models/send.rs
 | 
18
++++++++++++++++++

2 files changed, 19 insertions(+), 1 deletion(-)
diff --git a/src/api/core/sends.rs b/src/api/core/sends.rs
@@ -231,7 +231,7 @@ fn post_access(access_id: String, data: JsonUpcase<SendAccessData>, conn: DbConn
 
     send.save(&conn)?;
 
-    Ok(Json(send.to_json()))
+    Ok(Json(send.to_json_access()))
 }
 
 #[post("/sends/<send_id>/access/file/<file_id>", data = "<data>")]
diff --git a/src/db/models/send.rs b/src/db/models/send.rs
@@ -130,6 +130,24 @@ impl Send {
             "Object": "send",
         })
     }
+
+    pub fn to_json_access(&self) -> Value {
+        use crate::util::format_date;
+
+        let data: Value = serde_json::from_str(&self.data).unwrap_or_default();
+
+        json!({
+            "Id": self.uuid,
+            "Type": self.atype,
+
+            "Name": self.name,
+            "Text": if self.atype == SendType::Text as i32 { Some(&data) } else { None },
+            "File": if self.atype == SendType::File as i32 { Some(&data) } else { None },
+
+            "ExpirationDate": self.expiration_date.as_ref().map(format_date),
+            "Object": "send-access",
+        })
+    }
 }
 
 use crate::db::DbConn;