udata 10.0.6.dev32994__py2.py3-none-any.whl → 10.0.6.dev33070__py2.py3-none-any.whl

udata/core/dataset/tasks.py

@@ -123,7 +123,11 @@ def send_frequency_reminder(self):
 def update_datasets_reuses_metrics(self):
     all_datasets = Dataset.objects.visible().timeout(False)
     for dataset in all_datasets:
-        dataset.count_reuses()
+        try:
+            dataset.count_reuses()
+        except Exception as e:
+            log.error(f"Error for dataset {dataset} during reuses metrics update: {e}")
+            continue
 
 
 def get_queryset(model_cls):

udata/core/post/api.py

@@ -1,6 +1,7 @@
 from datetime import datetime
 
 from udata.api import API, api, fields
+from udata.auth import Permission as AdminPermission
 from udata.auth import admin_permission
 from udata.core.dataset.api_fields import dataset_fields
 from udata.core.reuse.models import Reuse
@@ -60,6 +61,13 @@ parser = api.page_parser()
 parser.add_argument(
     "sort", type=str, default="-created_at", location="args", help="The sorting attribute"
 )
+parser.add_argument(
+    "with_drafts",
+    type=bool,
+    default=False,
+    location="args",
+    help="`True` also returns the unpublished posts (only for super-admins)",
+)
 
 
 @ns.route("/", endpoint="posts")
@@ -70,11 +78,13 @@ class PostsAPI(API):
     def get(self):
         """List all posts"""
         args = parser.parse_args()
-        return (
-            Post.objects.published()
-            .order_by(args["sort"])
-            .paginate(args["page"], args["page_size"])
-        )
+
+        posts = Post.objects()
+
+        if not (AdminPermission().can() and args["with_drafts"]):
+            posts = posts.published()
+
+        return posts.order_by(args["sort"]).paginate(args["page"], args["page_size"])
 
     @api.doc("create_post")
     @api.secure(admin_permission)

udata/core/post/tests/test_api.py

@@ -15,14 +15,28 @@ class PostsAPITest:
 
     def test_post_api_list(self, api):
         """It should fetch a post list from the API"""
-        posts = PostFactory.create_batch(3)
-        posts.append(PostFactory(published=None))
+        PostFactory.create_batch(3)
+        draft = PostFactory(published=None)
 
         response = api.get(url_for("api.posts"))
         assert200(response)
         # Response should not contain the unpublished post
         assert len(response.json["data"]) == 3
 
+        api.login(AdminFactory())
+
+        response = api.get(url_for("api.posts"))
+        assert200(response)
+
+        assert len(response.json["data"]) == 3
+        assert str(draft.id) not in [post["id"] for post in response.json["data"]]
+
+        response = api.get(url_for("api.posts", with_drafts=True))
+        assert200(response)
+
+        assert len(response.json["data"]) == 4
+        assert str(draft.id) in [post["id"] for post in response.json["data"]]
+
     def test_post_api_get(self, api):
         """It should fetch a post from the API"""
         post = PostFactory()