Merge pull request #88 from mtseluiko/HCK-2823--hackolade-assignment-…

…model-definition-doc Hck 2823 hackolade assignment model definition doc
hackolade · Jan 4, 2023 · e19a058 · e19a058
2 parents 574dd8c + c1e2eee
commit e19a058
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/forward_engineering/helpers/convertJsonSchemaToAvro.js b/forward_engineering/helpers/convertJsonSchemaToAvro.js
@@ -36,7 +36,7 @@ const prepareSchema = schema => ({
 });
 
 const convertDescriptionToDoc = schema => {
-	const description = schema.refDescription || schema.description;
+	const description = (schema.$ref && schema.refDescription) || schema.description;
 	if (!description) {
 		return schema;
 	}

diff --git a/forward_engineering/helpers/udtHelper.js b/forward_engineering/helpers/udtHelper.js
@@ -69,10 +69,10 @@ const resolveSchemaUdt = schema => {
 
 	const typeFromUdt = getTypeFromUdt(type);
 	if (_.isArray(_.get(typeFromUdt, 'type'))) {
-		return { ...schema, ...typeFromUdt, name: schema.name };
+		return { ...schema, ...typeFromUdt, name: schema.name, doc: schema.doc };
 	}
 
-	return { ...schema, ...prepareTypeFromUDT(typeFromUdt), name: schema.name };
+	return { ...schema, ...prepareTypeFromUDT(typeFromUdt), name: schema.name, doc: schema.doc };
 };
 
 const isNativeType = type => {