DFIQ fix (#1209)

yeti-platform · Dec 23, 2024 · ab645c3 · ab645c3
1 parent 3f832fb
commit ab645c3
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 7 deletions.
diff --git a/core/database_arango.py b/core/database_arango.py
@@ -414,7 +414,7 @@ def save(
         # TODO: Override this if we decide to implement YetiTagModel
         if hasattr(self, "tags"):
             yeti_object.get_tags()
-        if self._collection_name != "auditlog":
+        if self._collection_name not in ("auditlog", "timeline"):
             try:
                 event = message.ObjectEvent(type=event_type, yeti_object=yeti_object)
                 producer.publish_event(event)

diff --git a/core/schemas/dfiq.py b/core/schemas/dfiq.py
@@ -54,12 +54,12 @@ def read_from_data_directory(
         with open(file, "r") as f:
             try:
                 dfiq_object = DFIQBase.from_yaml(f.read())
+                db_dfiq = None
+                if dfiq_object.uuid:
+                    db_dfiq = DFIQBase.find(uuid=dfiq_object.uuid)
+                if not db_dfiq and dfiq_object.dfiq_id:
+                    db_dfiq = DFIQBase.find(dfiq_id=dfiq_object.dfiq_id)
                 if not overwrite:
-                    db_dfiq = None
-                    if dfiq_object.uuid:
-                        db_dfiq = DFIQBase.find(uuid=dfiq_object.uuid)
-                    if not db_dfiq and dfiq_object.dfiq_id:
-                        db_dfiq = DFIQBase.find(dfiq_id=dfiq_object.dfiq_id)
                     if db_dfiq:
                         incoming_v = Version(dfiq_object.dfiq_version)
                         if incoming_v > Version(LATEST_SUPPORTED_DFIQ_VERSION):

diff --git a/plugins/feeds/public/dfiq.py b/plugins/feeds/public/dfiq.py
@@ -41,7 +41,7 @@ def run(self):
             return
         for directory in extra_dirs.split(","):
             logging.info("Processing extra directory %s", directory)
-            dfiq.read_from_data_directory(directory)
+            dfiq.read_from_data_directory(directory, "DFIQFeed")
 
 
 taskmanager.TaskManager.register_task(DFIQFeed)