Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

FE: fixed forward-engineering of default and symboldDefault values of enum #155

Merged
merged 2 commits into from
Mar 26, 2024
Merged

FE: fixed forward-engineering of default and symboldDefault values of enum #155

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6c55543
FE: fixed forward-engineering of default and symboldDefault values of…
Vitalii4as Mar 25, 2024
ba35087
Improved code readability
Vitalii4as Mar 26, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 12 additions & 2 deletions forward_engineering/helpers/convertJsonSchemaToAvro.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -206,7 +206,13 @@ const convertMultiple = schema => {
return typeSchema;
}

return simplifySchema({ ..._.omit(typeSchema, GENERAL_ATTRIBUTES), type: typeSchema.type });
const redundantAttributes =
typeSchema.type === 'enum' ? _.without(GENERAL_ATTRIBUTES, 'default') : GENERAL_ATTRIBUTES;

return simplifySchema({
..._.omit(typeSchema, redundantAttributes),
type: typeSchema.type,
});
}

const fieldType = type.type || getTypeFromReference(type) || DEFAULT_TYPE;
Expand Down Expand Up @@ -304,7 +310,7 @@ const handleField = (name, field) => {
return resolveFieldDefaultValue({
name: prepareName(name),
type: _.isArray(typeSchema.type) ? typeSchema.type : typeSchema,
default: !_.isUndefined(defaultValue) ? defaultValue : typeSchema?.default,
default: !_.isUndefined(defaultValue) || typeSchema?.type === 'enum' ? defaultValue : typeSchema?.default,
doc: field.$ref ? refDescription : description,
order,
aliases,
Expand All @@ -319,6 +325,10 @@ const resolveFieldDefaultValue = (field, type) => {
return field;
}

if(udtItem.schema.type === 'enum') {
return field;
}

const defaultValue = field.default || udtItem.schema.default;

return {
Expand Down
2 changes: 1 addition & 1 deletion forward_engineering/helpers/udtHelper.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -123,7 +123,7 @@ const resolveSymbolDefaultValue = udtItem => {

return {
..._.omit(udtItem, 'symbolDefault'),
default: udtItem.symbolDefault,
default: udtItem.default ?? udtItem.symbolDefault,
};
};

Expand Down
Loading