aboutsummaryrefslogtreecommitdiffstats
path: root/rust/src/endpoints.rs
diff options
context:
space:
mode:
authorBryan Newbold <bnewbold@robocracy.org>2019-01-11 16:18:20 -0800
committerBryan Newbold <bnewbold@robocracy.org>2019-01-11 16:18:20 -0800
commit99373d8662b63cc50d30a0a9b277a558f8c3ccc9 (patch)
treea9f7c38bc3d9a0f04013a84d2ce325077415dd59 /rust/src/endpoints.rs
parent39ea4f451543822bd6e525cfac252363b78cc6ec (diff)
downloadfatcat-99373d8662b63cc50d30a0a9b277a558f8c3ccc9.tar.gz
fatcat-99373d8662b63cc50d30a0a9b277a558f8c3ccc9.zip
implement since/before ordering for range requests
Diffstat (limited to 'rust/src/endpoints.rs')
-rw-r--r--rust/src/endpoints.rs8
1 files changed, 4 insertions, 4 deletions
diff --git a/rust/src/endpoints.rs b/rust/src/endpoints.rs
index 77f70ce0..33c4bc3e 100644
--- a/rust/src/endpoints.rs
+++ b/rust/src/endpoints.rs
@@ -752,9 +752,9 @@ impl Api for Server {
.transaction(|| {
let editor_id = FatcatId::from_str(&editor_id)?;
let limit = cmp::min(100, limit.unwrap_or(20)) as u64;
- let row =
+ let rows =
Editgroup::db_get_range_for_editor(&conn, editor_id, limit, since, before)?;
- Ok(row.into_iter().map(|eg| eg.into_model_partial()).collect())
+ Ok(rows.into_iter().map(|(eg, cl)| eg.into_model_partial(cl.map(|v| v.id))).collect())
})
.map_err(|e: Error| FatcatError::from(e))
{
@@ -893,7 +893,7 @@ impl Api for Server {
let limit = cmp::min(100, limit.unwrap_or(20)) as u64;
let row = Editgroup::db_get_range_reviewable(&conn, limit, since, before)?;
let mut editgroups: Vec<Editgroup> =
- row.into_iter().map(|eg| eg.into_model_partial()).collect();
+ row.into_iter().map(|eg| eg.into_model_partial(None)).collect();
if let Some(expand) = expand {
let expand = ExpandFlags::from_str(&expand)?;
for eg in editgroups.iter_mut() {
@@ -991,7 +991,7 @@ impl Api for Server {
};
editgroup
.db_update(&conn, editgroup_id, submit)
- .map(|eg| eg.into_model_partial())
+ .map(|eg| eg.into_model_partial(None)) // can't update an accepted editgroup
})
.map_err(|e: Error| FatcatError::from(e))
{