These expire-datasets changes were somehow missing

digitalmethodsinitiative · Feb 9, 2022 · 1d64408 · 1d64408
1 parent 1e89883
commit 1d64408
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/backend/workers/expire_datasets.py b/backend/workers/expire_datasets.py
@@ -43,7 +43,7 @@ def work(self):
 		# and now find datasets that have their expiration date set
 		# individually
 		cutoff = int(time.time())
-		datasets += self.db.fetchall("SELECT key FROM datasets WHERE parameters::json->>'expires-after' IS NOT NULL AND (parameters::json->>'expires-after')::int > %s", (cutoff,))
+		datasets += self.db.fetchall("SELECT key FROM datasets WHERE parameters::json->>'expires-after' IS NOT NULL AND (parameters::json->>'expires-after')::int < %s", (cutoff,))
 
 		# we instantiate the dataset, because its delete() method does all
 		# the work (e.g. deleting child datasets) for us

diff --git a/common/lib/dataset.py b/common/lib/dataset.py
@@ -98,6 +98,9 @@ def __init__(self, parameters={}, key=None, job=None, data=None, db=None, parent
 			self.parameters = json.loads(self.data["parameters"])
 			self.is_new = False
 		else:
+			if hasattr(config, "EXPIRE_DATASETS") and config.EXPIRE_DATASETS and not parent:
+				parameters["expires-after"] = int(time.time() + config.EXPIRE_DATASETS)
+
 			self.data = {
 				"key": self.key,
 				"query": self.get_label(parameters, default=type),