Flush model origin in ingest_flush to clean before schema changes

BuloZB · Apr 14, 2021 · f5f9340 · f5f9340
1 parent 69d63a6
commit f5f9340
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 3 deletions.
diff --git a/aleph/logic/aggregator.py b/aleph/logic/aggregator.py
@@ -2,6 +2,7 @@
 from ftmstore import get_dataset
 
 log = logging.getLogger(__name__)
+MODEL_ORIGIN = "model"
 
 
 def get_aggregator_name(collection):

diff --git a/aleph/logic/collections.py b/aleph/logic/collections.py
@@ -12,11 +12,10 @@
 from aleph.index import xref as xref_index
 from aleph.index import entities as entities_index
 from aleph.logic.notifications import publish, flush_notifications
-from aleph.logic.documents import ingest_flush
+from aleph.logic.documents import ingest_flush, MODEL_ORIGIN
 from aleph.logic.aggregator import get_aggregator
 
 log = logging.getLogger(__name__)
-MODEL_ORIGIN = "model"
 
 
 def create_collection(data, authz, sync=False):

diff --git a/aleph/logic/documents.py b/aleph/logic/documents.py
@@ -5,14 +5,15 @@
 from aleph.core import db, archive, settings
 from aleph.model import Document
 from aleph.queues import ingest_entity
-from aleph.logic.aggregator import get_aggregator
+from aleph.logic.aggregator import get_aggregator, MODEL_ORIGIN
 
 log = logging.getLogger(__name__)
 
 
 def ingest_flush(collection, entity_id=None):
     """Clear entity fragments generated by the ingest process."""
     aggregator = get_aggregator(collection)
+    aggregator.delete(entity_id=entity_id, origin=MODEL_ORIGIN)
     for stage in settings.INGEST_PIPELINE:
         aggregator.delete(entity_id=entity_id, origin=stage)