Merge pull request #133 from hackolade/HCK-3954--hackolade-assignment…

…-fw-hackolade-issues FE: fix issue with recursive collection references
hackolade · Sep 8, 2023 · ef37c4f · ef37c4f
2 parents a6b1eb4 + 00c6d8a
commit ef37c4f
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 8 deletions.
diff --git a/forward_engineering/api.js b/forward_engineering/api.js
@@ -151,9 +151,9 @@ const convertJsonToAvro = (jsonSchema, schemaName) => {
 	const customProperties = getCustomProperties(getEntityLevelConfig(), jsonSchema);
 	const schema = convertSchema(jsonSchema);
 	const avroSchema = {
-		...(_.isString(schema) ? { type: schema } : schema),
+		...(!_.isString(schema) && schema),
 		name: schemaName,
-		type: 'record',
+		type: (_.isString(schema) ? schema : 'record'),
 		...customProperties,
 	};
 

diff --git a/forward_engineering/helpers/udtHelper.js b/forward_engineering/helpers/udtHelper.js
@@ -197,7 +197,7 @@ const convertCollectionReferences = entities => {
 			}
 
 			const definition = entities.find(entity => entity.jsonSchema.GUID === field.ref).jsonSchema;
-			const definitionName = definition.code || definition.collectionName;
+			const definitionName = definition.code || definition.collectionName || definition.name;
 
 			const subject = getConfluentSubjectName({
 				name: definitionName,
@@ -217,7 +217,7 @@ const convertCollectionReferences = entities => {
 
 			return {
 				...field,
-				$ref: `#/definitions/${definition.code || definition.collectionName}`,
+				$ref: `#/definitions/${definitionName}`,
 				default: field.nullable ? null : field.default,
 			};
 		});
@@ -235,20 +235,25 @@ const convertCollectionReferences = entities => {
 		return {
 			...entity,
 			jsonSchema,
-			references: filterReferencesByPath(references).map(reference => _.omit(reference, 'path')),
+			references: filterReferencesByPath(entity, references).map(reference => _.omit(reference, 'path')),
 		};
 	});
 
 	return topologicalSort(entitiesWithReferences);
 };
 
-const filterReferencesByPath = references => references.filter(currentReference => {
+const filterReferencesByPath = (entity, references) => references.filter(currentReference => {
+	const isRecursive = _.last(currentReference.path) === entity?.jsonSchema?.GUID;
+	if (isRecursive) {
+		return false;
+	}
+
 	const rootReference = references.find(reference => {
-		if (!reference.path || (reference.path.length >= currentReference.path.length)) {
+		if (!reference.path || (reference.path.length >= currentReference.path?.length)) {
 			return false;
 		}
 
-		return reference.path.every((path, index) => path === currentReference.path[index]);
+		return reference.path.every((path, index) => path === currentReference.path?.[index]);
 	});
 
 	return !rootReference;