udata 10.8.1.dev36640__py2.py3-none-any.whl → 10.8.1.dev36703__py2.py3-none-any.whl

udata/core/discussions/api.py

@@ -130,6 +130,7 @@ discussion_page_fields = api.model("DiscussionPage", fields.pager(discussion_fie
 parser = api.parser()
 sorting_keys: list[str] = ["created", "title", "closed", "discussion.posted_on"]
 sorting_choices: list[str] = sorting_keys + ["-" + k for k in sorting_keys]
+parser.add_argument("q", type=str, location="args", help="The search query")
 parser.add_argument(
     "sort",
     type=str,
@@ -331,6 +332,11 @@ class DiscussionsAPI(API):
             discussions = discussions(closed=None)
         elif args["closed"] is True:
             discussions = discussions(closed__ne=None)
+
+        if args["q"]:
+            phrase_query = " ".join([f'"{elem}"' for elem in args["q"].split(" ")])
+            discussions = discussions.search_text(phrase_query).order_by("$text_score")
+
         discussions = discussions.order_by(args["sort"])
         return discussions.paginate(args["page"], args["page_size"])
 

udata/core/discussions/models.py

@@ -82,8 +82,18 @@ class Discussion(SpamMixin, Linkable, db.Document):
     extras = db.ExtrasField()
 
     meta = {
-        "indexes": ["user", "subject", "-created"],
+        "indexes": [
+            {
+                "fields": ["$title", "$discussion.content"],
+                "default_language": "french",
+                "weights": {"title": 10, "discussion.content": 5},
+            },
+            "user",
+            "subject",
+            "-created",
+        ],
         "ordering": ["-created"],
+        "auto_create_index_on_save": True,
     }
 
     @property

udata/mongo/slug_fields.py

@@ -172,21 +172,38 @@ def populate_slug(instance, field):
     # Ensure uniqueness
     if field.unique:
         base_slug = slug
-        index = 1
         qs = instance.__class__.objects
         if previous:
             qs = qs(id__ne=previous.id)
 
-        def exists(s):
-            return qs(**{field.db_field: s}).clear_cls_query().limit(1).count(True) > 0
+        def exists(slug):
+            return qs(**{field.db_field: slug}).clear_cls_query().limit(1).count(True) > 0
 
-        while exists(slug):
-            # keep space for index suffix, trim slug if needed
+        def get_existing_slug_suffixes(slug):
+            qs_suffix = qs(slug__regex=f"^{slug}-\d*$").clear_cls_query().only(field.db_field)
+            return [getattr(obj, field.db_field) for obj in qs_suffix]
+
+        def trim_base_slug(base_slug, index):
             slug_overflow = len("{0}-{1}".format(base_slug, index)) - field.max_length
             if slug_overflow >= 1:
                 base_slug = base_slug[:-slug_overflow]
-            slug = "{0}-{1}".format(base_slug, index)
-            index += 1
+            return base_slug
+
+        if exists(base_slug):
+            # We'll iterate to get the first free slug suffix
+            index = 1
+            existing_slugs = None
+            while True:
+                # Keep space for index suffix, trim slug if needed
+                trimmed_slug = trim_base_slug(base_slug, index)
+                # Find all existing slugs with suffixes
+                if existing_slugs is None or trimmed_slug != base_slug:
+                    base_slug = trimmed_slug
+                    existing_slugs = set(sorted(get_existing_slug_suffixes(base_slug)))
+                slug = "{0}-{1}".format(base_slug, index)
+                if slug not in existing_slugs:
+                    break
+                index += 1
 
         if is_uuid(slug):
             slug = "{0}-uuid".format(slug)

udata/tests/test_discussions.py

@@ -422,6 +422,45 @@ class DiscussionsTest(APITestCase):
 
         self.assertEqual(len(response.json["data"]), len(discussions))
 
+    def test_list_discussions_search(self):
+        user = self.login()
+        dataset = DatasetFactory()
+
+        discussion_a = DiscussionFactory(
+            user=user,
+            subject=dataset,
+            title="discussion a",
+            discussion=[
+                Message(posted_by=user, content="another message"),
+                Message(posted_by=user, content="a message with something"),
+            ],
+        )
+        discussion_b = DiscussionFactory(
+            user=user,
+            subject=dataset,
+            title="something in title",
+            discussion=[
+                Message(posted_by=user, content="another message"),
+                Message(posted_by=user, content="there is a problem"),
+            ],
+        )
+        DiscussionFactory(
+            user=user,
+            subject=dataset,
+            title="discussion c",
+            discussion=[
+                Message(posted_by=user, content="some text"),
+                Message(posted_by=user, content="and another"),
+            ],
+        )
+
+        response = self.get(url_for("api.discussions", q="something"))
+        self.assert200(response)
+
+        self.assertEqual(len(response.json["data"]), 2)
+        self.assertEqual(discussion_b.title, response.json["data"][0]["title"])
+        self.assertEqual(discussion_a.title, response.json["data"][1]["title"])
+
     def assertIdIn(self, json_data: dict, id_: str) -> None:
         for item in json_data:
             if item["id"] == id_:

{udata-10.8.1.dev36640.dist-info → udata-10.8.1.dev36703.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: udata
-Version: 10.8.1.dev36640
+Version: 10.8.1.dev36703
 Summary: Open data portal
 Home-page: https://github.com/opendatateam/udata
 Author: Opendata Team
@@ -142,6 +142,8 @@ It is collectively taken care of by members of the
 
 ## Current (in progress)
 
+- Fix user deletion performances issues [#3388](https://github.com/opendatateam/udata/pull/3388)
+- Add search to discussions [#3384](https://github.com/opendatateam/udata/pull/3384)
 - Separate metrics for opened discussions [#3370](https://github.com/opendatateam/udata/pull/3370)
 
 ## 10.8.0 (2025-07-22)

{udata-10.8.1.dev36640.dist-info → udata-10.8.1.dev36703.dist-info}/RECORD

@@ -117,13 +117,13 @@ udata/core/dataset/tasks.py,sha256=6FzeLzJRQxzq7sBLUE8H8ZGLByix2EDOzGAsA8FteX8,1
 udata/core/dataset/transport.py,sha256=ihCXirY1dZjOfXKbf9HRCJTfIOc75rM1McwbeGjsW6A,1296
 udata/core/discussions/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 udata/core/discussions/actions.py,sha256=kjdBLDIeu0yWTSxQGgOpN1WoxUqbMygn4SiBk_S9T5I,1051
-udata/core/discussions/api.py,sha256=TrcSFyU6_fPpGr0X5AoqF0NA3stdc_NCltSl0hUwaN8,12986
+udata/core/discussions/api.py,sha256=m2a_jLBL4dQejXfjjC3GJFpc-cDT32T8X6ka5LgwyPU,13259
 udata/core/discussions/constants.py,sha256=8crl2Lmkv9dmJe4KACM0JJcpoHePmGtmvI6ixfvukhc,277
 udata/core/discussions/csv.py,sha256=vIuMPJBrAOQmQ4P9SSY1wun0Av1qOE7i0TlQi-Vy7iU,772
 udata/core/discussions/factories.py,sha256=CgQaUmmyDu90XtyBsqXVa-TmZMrN7Dwuu1Cnr5wNrVc,350
 udata/core/discussions/forms.py,sha256=sR8tFBIBh-Rbx9VPzFzG1N54QY1y7UrdeboQ_60gXXQ,1265
 udata/core/discussions/metrics.py,sha256=WMalLO9GEHXlqE2WbZX-HQUpvte6cRwuHuoL96QwWSg,354
-udata/core/discussions/models.py,sha256=cwe9uqihpjG6mZ0lfnHpPHC8mkQjGPhK5FkT9lZZR5E,5909
+udata/core/discussions/models.py,sha256=NrP_MjgTRMMJpa0d_vL28ElJUQ-J5l0Cs3qHxCsHzds,6202
 udata/core/discussions/notifications.py,sha256=5MuoZDPmmvkloZ3i8I6TELgE1KXZ_cB9QiDerFBD9dM,1052
 udata/core/discussions/permissions.py,sha256=VY2_PEsazz1fBgCX9-K-_spRgxUoNY4HuNDShqZjw6E,1583
 udata/core/discussions/signals.py,sha256=tJ83RJIsBAny08Q6IDwehE6lDDRf6ynIFCl0WqnayoU,543
@@ -385,7 +385,7 @@ udata/mongo/engine.py,sha256=KdvaQnpw6un47CHpu3q9PYWwTtovVmsKZK_k1DmN48M,2552
 udata/mongo/errors.py,sha256=SpTMAc_aNIfGkqyXGCbTlIAmYxU86rGM_NtIYaB642c,472
 udata/mongo/extras_fields.py,sha256=FfyVvRkpLn4pUeCqwI33NBJblHOywGlnA05RCEZ-ugs,4139
 udata/mongo/queryset.py,sha256=yIECtsmdDAk_KqbLm0pFzWdon_1ybODfjRdThBdbjac,3939
-udata/mongo/slug_fields.py,sha256=zif1aRHajBfP0BitYq8KivcSJKa14KViz97mNrH3iVE,6665
+udata/mongo/slug_fields.py,sha256=XdfjLyjnsVse3p64k10Zcp_iMUH5AwYlCNzbDQaa-FA,7496
 udata/mongo/taglist_field.py,sha256=RPi8DlgMEMK1wk8hbQDLAyH2GnzZCfNpWXQsllxPB6g,1371
 udata/mongo/url_field.py,sha256=UmUr9c5SxDFDpS5QsRTq2pKcCTOr1SoB4UITwNjtuaI,1345
 udata/mongo/uuid_fields.py,sha256=tuQ3zs_BnQHjaiKSIYv43jxvYtOvRLw9nP5CQ3fcMks,482
@@ -616,7 +616,7 @@ udata/tests/test_activity.py,sha256=x-pDK6VW9wAG0uxYRZQ3DWTRjfCU729iaMGMJb1rWYU,
 udata/tests/test_api_fields.py,sha256=9ta1IU8GvmYof1Xg0Avvh0s5WF7-1VmW-fi2Vine99I,12273
 udata/tests/test_cors.py,sha256=b_pyxKeIyqhnsXxXryPf4d0V0QxaLQ1P_VjY89Q_j3g,3233
 udata/tests/test_dcat_commands.py,sha256=fDAnAjkja8AXw_qzaAWnVTgglkBAvK2mjPMHUCtqrrU,919
-udata/tests/test_discussions.py,sha256=gZyoq9MbJPm8x-M1M9PWWbBPlC9Ur-m-ojEwQB3dHXo,46319
+udata/tests/test_discussions.py,sha256=a2yBGfOSm93w8zP2s2gXy51LGniiZ0lbrej0uuXNd2E,47685
 udata/tests/test_i18n.py,sha256=u60344JNRG_8s0t89ghXtQ1FbF4TayEHBzuBFxqnQ_Y,3152
 udata/tests/test_linkchecker.py,sha256=W8jrwKYXM8wWXZFjiaBwpWGRBhZ8bsSHGHzL9voDN7U,10218
 udata/tests/test_mail.py,sha256=f-8meP9r1Xrz0eOTsvmdynoV9OFHLwwMr7XM5WWv_gk,4182
@@ -740,9 +740,9 @@ udata/translations/pt/LC_MESSAGES/udata.mo,sha256=9sCd1MUKvtVP_sOXvK-G5v4PfWkkdA
 udata/translations/pt/LC_MESSAGES/udata.po,sha256=-eJptz9s63rjkdm-3HJi_2t70pyv3-8EuXBn-B2qI_4,48419
 udata/translations/sr/LC_MESSAGES/udata.mo,sha256=qduXntHWe__KaUxJ4JwwyGG3eSgYb1auGdNax0lS49c,29169
 udata/translations/sr/LC_MESSAGES/udata.po,sha256=6QCuLMCRjgyAvu9U7i0P19ae8fm_uStfmxHLqUO9EoY,55394
-udata-10.8.1.dev36640.dist-info/LICENSE,sha256=V8j_M8nAz8PvAOZQocyRDX7keai8UJ9skgmnwqETmdY,34520
-udata-10.8.1.dev36640.dist-info/METADATA,sha256=09ovPjM9enlJxdkG0ajSRop1JGNSNbGv4HCzXxsf5JU,151896
-udata-10.8.1.dev36640.dist-info/WHEEL,sha256=Kh9pAotZVRFj97E15yTA4iADqXdQfIVTHcNaZTjxeGM,110
-udata-10.8.1.dev36640.dist-info/entry_points.txt,sha256=ETvkR4r6G1duBsh_V_fGWENQy17GTFuobi95MYBAl1A,498
-udata-10.8.1.dev36640.dist-info/top_level.txt,sha256=39OCg-VWFWOq4gCKnjKNu-s3OwFlZIu_dVH8Gl6ndHw,12
-udata-10.8.1.dev36640.dist-info/RECORD,,
+udata-10.8.1.dev36703.dist-info/LICENSE,sha256=V8j_M8nAz8PvAOZQocyRDX7keai8UJ9skgmnwqETmdY,34520
+udata-10.8.1.dev36703.dist-info/METADATA,sha256=xqzLUlzajkcp361rwUbD_SDIJaLheSWjc1fFU61vvm4,152078
+udata-10.8.1.dev36703.dist-info/WHEEL,sha256=Kh9pAotZVRFj97E15yTA4iADqXdQfIVTHcNaZTjxeGM,110
+udata-10.8.1.dev36703.dist-info/entry_points.txt,sha256=ETvkR4r6G1duBsh_V_fGWENQy17GTFuobi95MYBAl1A,498
+udata-10.8.1.dev36703.dist-info/top_level.txt,sha256=39OCg-VWFWOq4gCKnjKNu-s3OwFlZIu_dVH8Gl6ndHw,12
+udata-10.8.1.dev36703.dist-info/RECORD,,