From 19eb1641eece9f03ca193417cdf244efc1a9da8a Mon Sep 17 00:00:00 2001 From: Bryan Newbold Date: Sun, 27 May 2018 14:45:07 -0700 Subject: swagger spec: body -> entity --- rust/src/api_server.rs | 94 +++++++++++++++++++++++++------------------------- 1 file changed, 47 insertions(+), 47 deletions(-) (limited to 'rust/src/api_server.rs') diff --git a/rust/src/api_server.rs b/rust/src/api_server.rs index fc304fb7..bde73da5 100644 --- a/rust/src/api_server.rs +++ b/rust/src/api_server.rs @@ -54,10 +54,10 @@ macro_rules! wrap_entity_handlers { fn $post_fn( &self, - body: models::$model, + entity: models::$model, _context: &Context, ) -> Box + Send> { - let ret = match self.$post_handler(body) { + let ret = match self.$post_handler(entity) { Ok(edit) => $post_resp::CreatedEntity(edit), Err(Error(ErrorKind::Diesel(e), _)) => @@ -374,10 +374,10 @@ impl Server { work_row2entity(Some(ident), rev) } - fn container_post_handler(&self, body: models::ContainerEntity) -> Result { + fn container_post_handler(&self, entity: models::ContainerEntity) -> Result { let conn = self.db_pool.get().expect("db_pool error"); let editor_id = 1; // TODO: auth - let editgroup_id = match body.editgroup_id { + let editgroup_id = match entity.editgroup_id { None => get_or_create_editgroup(editor_id, &conn).expect("current editgroup"), Some(param) => param as i64, }; @@ -392,22 +392,22 @@ impl Server { INSERT INTO container_edit (editgroup_id, ident_id, rev_id) VALUES ($7, (SELECT ident.id FROM ident), (SELECT rev.id FROM rev)) RETURNING *", - ).bind::(body.name) - .bind::, _>(body.publisher) - .bind::, _>(body.issnl) - .bind::, _>(body.abbrev) - .bind::, _>(body.coden) - .bind::, _>(body.extra) + ).bind::(entity.name) + .bind::, _>(entity.publisher) + .bind::, _>(entity.issnl) + .bind::, _>(entity.abbrev) + .bind::, _>(entity.coden) + .bind::, _>(entity.extra) .bind::(editgroup_id) .get_result(&conn)?; edit.to_model() } - fn creator_post_handler(&self, body: models::CreatorEntity) -> Result { + fn creator_post_handler(&self, entity: models::CreatorEntity) -> Result { let conn = self.db_pool.get().expect("db_pool error"); let editor_id = 1; // TODO: auth - let editgroup_id = match body.editgroup_id { + let editgroup_id = match entity.editgroup_id { None => get_or_create_editgroup(editor_id, &conn).expect("current editgroup"), Some(param) => param as i64, }; @@ -422,19 +422,19 @@ impl Server { INSERT INTO creator_edit (editgroup_id, ident_id, rev_id) VALUES ($4, (SELECT ident.id FROM ident), (SELECT rev.id FROM rev)) RETURNING *", - ).bind::(body.full_name) - .bind::, _>(body.orcid) - .bind::, _>(body.extra) + ).bind::(entity.full_name) + .bind::, _>(entity.orcid) + .bind::, _>(entity.extra) .bind::(editgroup_id) .get_result(&conn)?; edit.to_model() } - fn file_post_handler(&self, body: models::FileEntity) -> Result { + fn file_post_handler(&self, entity: models::FileEntity) -> Result { let conn = self.db_pool.get().expect("db_pool error"); let editor_id = 1; // TODO: auth - let editgroup_id = match body.editgroup_id { + let editgroup_id = match entity.editgroup_id { None => get_or_create_editgroup(editor_id, &conn).expect("current editgroup"), Some(param) => param as i64, }; @@ -450,15 +450,15 @@ impl Server { INSERT INTO file_edit (editgroup_id, ident_id, rev_id) VALUES ($6, (SELECT ident.id FROM ident), (SELECT rev.id FROM rev)) RETURNING *", - ).bind::, _>(body.size) - .bind::, _>(body.sha1) - .bind::, _>(body.md5) - .bind::, _>(body.url) - .bind::, _>(body.extra) + ).bind::, _>(entity.size) + .bind::, _>(entity.sha1) + .bind::, _>(entity.md5) + .bind::, _>(entity.url) + .bind::, _>(entity.extra) .bind::(editgroup_id) .get_result(&conn)?; - let _releases: Option> = match body.releases { + let _releases: Option> = match entity.releases { None => None, Some(release_list) => { if release_list.len() == 0 { @@ -483,10 +483,10 @@ impl Server { edit.to_model() } - fn work_post_handler(&self, body: models::WorkEntity) -> Result { + fn work_post_handler(&self, entity: models::WorkEntity) -> Result { let conn = self.db_pool.get().expect("db_pool error"); let editor_id = 1; // TODO: auth - let editgroup_id = match body.editgroup_id { + let editgroup_id = match entity.editgroup_id { None => get_or_create_editgroup(editor_id, &conn).expect("current editgroup"), Some(param) => param as i64, }; @@ -502,24 +502,24 @@ impl Server { INSERT INTO work_edit (editgroup_id, ident_id, rev_id) VALUES ($3, (SELECT ident.id FROM ident), (SELECT rev.id FROM rev)) RETURNING *", - ).bind::, _>(body.work_type) - .bind::, _>(body.extra) + ).bind::, _>(entity.work_type) + .bind::, _>(entity.extra) .bind::(editgroup_id) .get_result(&conn)?; edit.to_model() } - fn release_post_handler(&self, body: models::ReleaseEntity) -> Result { + fn release_post_handler(&self, entity: models::ReleaseEntity) -> Result { let conn = self.db_pool.get().expect("db_pool error"); let editor_id = 1; // TODO: auth - let editgroup_id = match body.editgroup_id { + let editgroup_id = match entity.editgroup_id { None => get_or_create_editgroup(editor_id, &conn).expect("current editgroup"), Some(param) => param as i64, }; - let work_id = uuid::Uuid::parse_str(&body.work_id).expect("invalid UUID"); - let container_id: Option = match body.container_id { + let work_id = uuid::Uuid::parse_str(&entity.work_id).expect("invalid UUID"); + let container_id: Option = match entity.container_id { Some(id) => Some(uuid::Uuid::parse_str(&id).expect("invalid UUID")), None => None, }; @@ -534,23 +534,23 @@ impl Server { INSERT INTO release_edit (editgroup_id, ident_id, rev_id) VALUES ($13, (SELECT ident.id FROM ident), (SELECT rev.id FROM rev)) RETURNING *", - ).bind::(body.title) - .bind::, _>(body.release_type) + ).bind::(entity.title) + .bind::, _>(entity.release_type) .bind::, _>( - body.date.map(|v| v.naive_utc().date())) - .bind::, _>(body.doi) - .bind::, _>(body.isbn13) - .bind::, _>(body.volume) - .bind::, _>(body.pages) - .bind::, _>(body.issue) + entity.date.map(|v| v.naive_utc().date())) + .bind::, _>(entity.doi) + .bind::, _>(entity.isbn13) + .bind::, _>(entity.volume) + .bind::, _>(entity.pages) + .bind::, _>(entity.issue) .bind::(work_id) .bind::, _>(container_id) - .bind::, _>(body.publisher) - .bind::, _>(body.extra) + .bind::, _>(entity.publisher) + .bind::, _>(entity.extra) .bind::(editgroup_id) .get_result(&conn)?; - let _refs: Option> = match body.refs { + let _refs: Option> = match entity.refs { None => None, Some(ref_list) => { if ref_list.len() == 0 { @@ -576,7 +576,7 @@ impl Server { } }; - let _contribs: Option> = match body.contribs { + let _contribs: Option> = match entity.contribs { None => None, Some(contrib_list) => { if contrib_list.len() == 0 { @@ -813,16 +813,16 @@ impl Api for Server { fn editgroup_post( &self, - body: models::Editgroup, + entity: models::Editgroup, _context: &Context, ) -> Box + Send> { let conn = self.db_pool.get().expect("db_pool error"); let row: EditgroupRow = insert_into(editgroup::table) .values(( - editgroup::editor_id.eq(body.editor_id as i64), - editgroup::description.eq(body.description), - editgroup::extra_json.eq(body.extra), + editgroup::editor_id.eq(entity.editor_id as i64), + editgroup::description.eq(entity.description), + editgroup::extra_json.eq(entity.extra), )) .get_result(&conn) .expect("error creating edit group"); -- cgit v1.2.3