revert visible_by_user change, change description

Author: ThibaudDauce

udata/core/dataset/api.py

@@ -308,7 +308,9 @@ class DatasetListAPI(API):
     def get(self):
         """List or search all datasets"""
         args = dataset_parser.parse()
-        datasets = Dataset.objects.visible_by_user(current_user)
+        datasets = Dataset.objects.visible_by_user(
+            current_user, Q(published_at__ne=None, archived=None, deleted=None)
+        )
         datasets = dataset_parser.parse_filters(datasets, args)
         sort = args["sort"] or ("$text_score" if args["q"] else None) or DEFAULT_SORTING
         return datasets.order_by(sort).paginate(args["page"], args["page_size"])

udata/core/dataset/api_fields.py

@@ -353,7 +353,7 @@
             description="Is the dataset private (DEPRECATED: use published_at instead)"
         ),
         "published_at": fields.ISODateTime(
-            description="Publication date (null if unpublished/private)"
+            description="Last publication date, null if unpublished/private. Updated each time the dataset is republished."
         ),
         "tags": fields.List(fields.String),
         "badges": fields.List(

udata/core/dataset/apiv2.py

@@ -1,5 +1,6 @@
 import logging
 
+import mongoengine
 from flask import abort, request, url_for
 from flask_login import current_user
 from flask_restx import marshal
@@ -128,7 +129,7 @@
             description="Is the dataset private (DEPRECATED: use published_at instead)"
         ),
         "published_at": fields.ISODateTime(
-            description="Publication date (null if unpublished/private)"
+            description="Last publication date, null if unpublished/private. Updated each time the dataset is republished."
         ),
         "tags": fields.List(fields.String),
         "badges": fields.List(
@@ -320,7 +321,9 @@ class DatasetListAPI(API):
     def get(self):
         """List or search all datasets"""
         args = dataset_parser.parse()
-        datasets = Dataset.objects.exclude("resources").visible_by_user(current_user)
+        datasets = Dataset.objects.exclude("resources").visible_by_user(
+            current_user, mongoengine.Q(published_at__ne=None, archived=None, deleted=None)
+        )
         datasets = dataset_parser.parse_filters(datasets, args)
         sort = args["sort"] or ("$text_score" if args["q"] else None) or DEFAULT_SORTING
         return datasets.order_by(sort).paginate(args["page"], args["page_size"])

udata/core/dataset/models.py

@@ -345,10 +345,6 @@ def visible(self):
     def hidden(self):
         return self(db.Q(published_at=None) | db.Q(deleted__ne=None) | db.Q(archived__ne=None))
 
-    def visible_by_user(self, user):
-        return super().visible_by_user(
-            user, db.Q(published_at__ne=None, archived=None, deleted=None)
-        )
 
     def with_badge(self, kind):
         return self(badges__kind=kind)

udata/tests/api/test_datasets_api.py

@@ -878,6 +878,33 @@ def test_dataset_api_update_private(self):
         dataset.reload()
         self.assertEqual(dataset.private, True)
 
+    def test_dataset_api_update_published_at(self):
+        """It should allow setting published_at to control visibility"""
+        user = self.login()
+        dataset = DatasetFactory(owner=user)
+        original_published_at = dataset.published_at
+        assert dataset.private is False
+        assert dataset.published_at is not None
+
+        # Setting published_at to None makes the dataset private
+        data = dataset.to_dict()
+        data["published_at"] = None
+        response = self.put(url_for("api.dataset", dataset=dataset), data)
+        self.assert200(response)
+        dataset.reload()
+        assert dataset.published_at is None
+        assert dataset.private is True
+
+        # Setting published_at to a date makes the dataset public
+        new_date = "2024-06-15T10:30:00"
+        data["published_at"] = new_date
+        response = self.put(url_for("api.dataset", dataset=dataset), data)
+        self.assert200(response)
+        dataset.reload()
+        assert dataset.published_at is not None
+        assert dataset.published_at.isoformat().startswith("2024-06-15")
+        assert dataset.private is False
+
     def test_dataset_api_update_new_resource_with_extras(self):
         """It should update a dataset with a new resource with extras"""
         user = self.login()