refactor

Signed-off-by: mgorsk1 <[email protected]>

ingestion/src/metadata/utils/fqn.py

@@ -192,17 +192,32 @@ def _(
 
 @fqn_build_registry.add(DatabaseSchema)
 def _(
-    _: Optional[OpenMetadata],  # ES Search not enabled for Schemas
+    metadata: Optional[OpenMetadata],  # ES Search not enabled for Schemas
     *,
     service_name: str,
-    database_name: str,
+    database_name: Optional[str],
     schema_name: str,
-) -> str:
-    if not service_name or not database_name or not schema_name:
-        raise FQNBuildingException(
-            f"Args should be informed, but got service=`{service_name}`, db=`{database_name}`, schema=`{schema_name}`"
+    skip_es_search: bool = True,
+    fetch_multiple_entities: bool = False,
+) -> Union[Optional[str], Optional[List[str]]]:
+    entity: Optional[Union[DatabaseSchema, List[DatabaseSchema]]] = None
+
+    if not skip_es_search:
+        entity = search_database_schema_from_es(
+            metadata=metadata,
+            database_name=database_name,
+            schema_name=schema_name,
+            fetch_multiple_entities=fetch_multiple_entities,
+            service_name=service_name,
         )
-    return _build(service_name, database_name, schema_name)
+
+    if not entity and database_name:
+        fqn = _build(service_name, database_name, schema_name)
+        return [fqn] if fetch_multiple_entities else fqn
+    if entity and fetch_multiple_entities:
+        return [str(table.fullyQualifiedName.__root__) for table in entity]
+    if entity:
+        return str(entity.fullyQualifiedName.__root__)
 
 
 @fqn_build_registry.add(Database)
@@ -273,7 +288,6 @@ def _(_: Optional[OpenMetadata], *, table_fqn: str) -> str:
 
 @fqn_build_registry.add(Topic)
 def _(
-    _: Optional[OpenMetadata],  # ES Index not necessary for Topic FQN building
     metadata: Optional[OpenMetadata],
     *,
     service_name: str,