msrd0/deprecated-gotham-restful
1
0
Fork 0
mirror of https://gitlab.com/msrd0/gotham-restful.git synced 2025-02-23 04:52:28 +00:00
Code Issues Releases Activity Actions

fix bug: required is now properly populated

Browse source
This commit is contained in:
Dominic 2019-10-01 18:03:44 +02:00
parent 3427fb4c6f
commit a4185a5665
Signed by: msrd0
GPG key ID: DCC8C247452E98F9
1 changed files with 14 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
src/helper.rs
View file

@ -40,17 +40,26 @@ macro_rules! rest_struct {
$( $(
{ {
let mut schema = <$field_ty>::to_schema(); let mut schema = <$field_ty>::to_schema();
if schema.nullable
{
schema.nullable = false;
schema.name = schema.name.map(|name|
if name.ends_with("OrNull") {
name[..(name.len()-6)].to_string()
} else { name });
}
else
{
required.push(stringify!($field_id).to_string());
}
if let Some(name) = schema.name.clone() if let Some(name) = schema.name.clone()
{ {
properties.insert( properties.insert(
stringify!($field_id).to_string(), stringify!($field_id).to_string(),
ReferenceOr::Reference { reference: format!("#/components/schemas/{}", name) } ReferenceOr::Reference { reference: format!("#/components/schemas/{}", name) }
); );
if schema.nullable
{
required.push(stringify!($field_id).to_string());
schema.nullable = false;
}
dependencies.insert(name, schema); dependencies.insert(name, schema);
} }
else else