Fixes #13595 - Consolidate changes by a user in a single session to a…

… single change
open-metadata · Nov 17, 2023 · 63988ee · 63988ee
1 parent 962cb78
commit 63988ee
Show file tree

Hide file tree

Showing 49 changed files with 986 additions and 1,283 deletions.
diff --git a/ingestion/src/metadata/ingestion/ometa/mixins/glossary_mixin.py b/ingestion/src/metadata/ingestion/ometa/mixins/glossary_mixin.py
diff --git a/ingestion/src/metadata/ingestion/ometa/mixins/patch_mixin.py b/ingestion/src/metadata/ingestion/ometa/mixins/patch_mixin.py
@@ -15,6 +15,7 @@
 """
 import json
 import traceback
+from copy import deepcopy
 from typing import Dict, List, Optional, Type, TypeVar, Union
 
 import jsonpatch
@@ -123,6 +124,12 @@ def patch(self, entity: Type[T], source: T, destination: T) -> Optional[T]:
             Updated Entity
         """
         try:
+            # remove change descriptions from entities
+            if source.changeDescription is not None:
+                source.changeDescription = None
+            if destination.changeDescription is not None:
+                destination.changeDescription = None
+
             # Get the difference between source and destination
             patch = jsonpatch.make_patch(
                 json.loads(source.json(exclude_unset=True, exclude_none=True)),
@@ -342,12 +349,10 @@ def patch_owner(
             )
             return None
 
-        source.owner = instance.owner
-
-        destination = source.copy(deep=True)
+        destination = deepcopy(instance)
         destination.owner = owner
 
-        return self.patch(entity=entity, source=source, destination=destination)
+        return self.patch(entity=entity, source=instance, destination=destination)
 
     def patch_column_tags(
         self,

diff --git a/ingestion/src/metadata/ingestion/ometa/ometa_api.py b/ingestion/src/metadata/ingestion/ometa/ometa_api.py
@@ -36,7 +36,6 @@
 from metadata.ingestion.ometa.mixins.dashboard_mixin import OMetaDashboardMixin
 from metadata.ingestion.ometa.mixins.data_insight_mixin import DataInsightMixin
 from metadata.ingestion.ometa.mixins.es_mixin import ESMixin
-from metadata.ingestion.ometa.mixins.glossary_mixin import GlossaryMixin
 from metadata.ingestion.ometa.mixins.ingestion_pipeline_mixin import (
     OMetaIngestionPipelineMixin,
 )
@@ -97,7 +96,6 @@ class OpenMetadata(
     OMetaTableMixin,
     OMetaTopicMixin,
     OMetaVersionMixin,
-    GlossaryMixin,
     OMetaServiceMixin,
     ESMixin,
     OMetaServerMixin,