udata 10.0.9.dev33959__py2.py3-none-any.whl → 10.0.9.dev33978__py2.py3-none-any.whl

udata/core/organization/api.py

@@ -242,7 +242,10 @@ class OrgContactAPI(API):
 
 requests_parser = api.parser()
 requests_parser.add_argument(
-    "status", type=str, help="If provided, only return requests ith a given status", location="args"
+    "status", type=str, help="If provided, only return requests in a given status", location="args"
+)
+requests_parser.add_argument(
+    "user", type=str, help="If provided, only return requests for this user", location="args"
 )
 
 
@@ -255,8 +258,24 @@ class MembershipRequestAPI(API):
     @api.marshal_list_with(request_fields)
     def get(self, org):
         """List membership requests for a given organization"""
-        OrganizationPrivatePermission(org).test()
         args = requests_parser.parse_args()
+        if args["user"]:
+            if not current_user.is_authenticated or (
+                str(current_user.id) != args["user"]
+                and not OrganizationPrivatePermission(org).can()
+            ):
+                api.abort(
+                    403,
+                    "You can only access your own membership requests or the one of your organizations.",
+                )
+            if args["status"]:
+                return [
+                    r
+                    for r in org.requests
+                    if (r.status == args["status"] and str(r.user.id) == args["user"])
+                ]
+            return [r for r in org.requests if str(r.user.id) == args["user"]]
+        OrganizationPrivatePermission(org).test()
         if args["status"]:
             return [r for r in org.requests if r.status == args["status"]]
         else:

udata/tests/api/test_organizations_api.py

@@ -276,6 +276,42 @@ class MembershipAPITest:
         response = api.get(url_for("api.request_membership", org=organization))
         assert403(response)
 
+    def test_applicant_can_get_their_membership_requests(self, api):
+        applicant = api.login()
+        membership_request = MembershipRequest(user=applicant, comment="test")
+        organization = OrganizationFactory(members=[], requests=[membership_request])
+
+        response = api.get(
+            url_for("api.request_membership", org=organization),
+            query_string={"user": str(applicant.id)},
+        )
+        assert200(response)
+
+    @pytest.mark.parametrize(
+        "searched_status",
+        [
+            "pending",
+            "accepted",
+            "refused",
+        ],
+    )
+    def test_applicant_can_get_their_membership_requests_with_status(
+        self, api, searched_status: str
+    ):
+        applicant = api.login()
+        membership_request = MembershipRequest(user=applicant, comment="test")
+        organization = OrganizationFactory(members=[], requests=[membership_request])
+        response = api.get(
+            url_for("api.request_membership", org=organization),
+            query_string={"user": str(applicant.id), "status": searched_status},
+        )
+        assert200(response)
+        requests = response.json
+        if searched_status == "pending":
+            assert len(requests) == 1
+        else:
+            assert len(requests) == 0
+
     def test_get_members_with_or_without_email(self, api):
         admin = Member(
             user=UserFactory(email="admin@example.org"), role="admin", since="2024-04-14"

{udata-10.0.9.dev33959.dist-info → udata-10.0.9.dev33978.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: udata
-Version: 10.0.9.dev33959
+Version: 10.0.9.dev33978
 Summary: Open data portal
 Home-page: https://github.com/opendatateam/udata
 Author: Opendata Team
@@ -147,6 +147,7 @@ It is collectively taken care of by members of the
 - Return harvesters's errors details only for super-admins [#3264](https://github.com/opendatateam/udata/pull/3264)
 - feat: topics list filtered by visible_by_user [#3265](https://github.com/opendatateam/udata/pull/3265)
 - Allow geozone suggest to check the id field [#3267](https://github.com/opendatateam/udata/pull/3267)
+- Allow a user to check its own membership requests [#3269](https://github.com/opendatateam/udata/pull/3269)
 
 ## 10.0.8 (2025-01-31)
 

{udata-10.0.9.dev33959.dist-info → udata-10.0.9.dev33978.dist-info}/RECORD

@@ -141,7 +141,7 @@ udata/core/metrics/signals.py,sha256=9mdJW__gR2GJT3huBr6HN2SDhKYJRgNbW9dnh48cAnU
 udata/core/metrics/tasks.py,sha256=_3L2g3blndBID66s_CauXEW2bDYathjd4HAAhYNVaOs,827
 udata/core/organization/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 udata/core/organization/activities.py,sha256=NY9pDzOVcdo2HZ-ax77lioiDGUZ8jpUguSLt_824saQ,1133
-udata/core/organization/api.py,sha256=Z8QHV8KE53nNv56qJhUq5OLo_F6dFyzxrTT9wJ3VAPo,17927
+udata/core/organization/api.py,sha256=ECHxNjsx6p1znSPrpdY_GEI0Oj4GvOZWKjT6NPwsnQs,18744
 udata/core/organization/api_fields.py,sha256=TCYTZkHme86KG2zZUyIEGr55W5PG-P9jLtph4jwxO8Y,7970
 udata/core/organization/apiv2.py,sha256=1HQRQNu8r5dKPOGdkQyYfn7romhOoZydd4ZVUA0tQIk,3169
 udata/core/organization/commands.py,sha256=DsRAtFDZvTciYNsUWumQWdn0jnNmKW-PwfIHUUZoBb8,1591
@@ -618,7 +618,7 @@ udata/tests/api/test_datasets_api.py,sha256=03bSBiw70js6qZ43kihDLTkD7ha3i50z5YED
 udata/tests/api/test_fields.py,sha256=OW85Z5MES5HeWOpapeem8OvR1cIcrqW-xMWpdZO4LZ8,1033
 udata/tests/api/test_follow_api.py,sha256=fccgVNfcqET221PPS3p7qzb9hpvbBBUGhV-l4UeOpyk,3352
 udata/tests/api/test_me_api.py,sha256=ZJKGH9fFv-4cSGcYAGd6IJA_PwPjVGIqWNy_DhFA8ms,13827
-udata/tests/api/test_organizations_api.py,sha256=-oSfxy3Wk0yi5cGKQfr-ctESFFsZXvb9Fh8S9Lt1dNU,36229
+udata/tests/api/test_organizations_api.py,sha256=jDCGw5BZ2Ps6S1xxp5hRi8XsrmR8DE22tflRPGtUYcc,37527
 udata/tests/api/test_reports_api.py,sha256=fCSz9NwMXBs6cxdXBVVI6y564AtovmZYw3xkgxQ9KE8,6217
 udata/tests/api/test_reuses_api.py,sha256=d8mtUrDURIfnUK-sLogvAP-rOID2FDJ0UVTM0ravQ-Q,24642
 udata/tests/api/test_swagger.py,sha256=eE6La9qdTYTIUFevRVPJgtj17Jq_8uOlsDwzCNR0LL8,760
@@ -712,9 +712,9 @@ udata/translations/pt/LC_MESSAGES/udata.mo,sha256=M42S33mIOlRa2Z-np3xY_KVC5K8Hrq
 udata/translations/pt/LC_MESSAGES/udata.po,sha256=Ywuy-wSaui9a5EYH2nB3_JWmR3UGXCR2KwOdX61g0BA,45082
 udata/translations/sr/LC_MESSAGES/udata.mo,sha256=n-a4aF62_JmXOj52_X-_zPbnNcDso_b7W3mKOOCrANw,29169
 udata/translations/sr/LC_MESSAGES/udata.po,sha256=ijd7U_rvSctNKejNOUR6hW5oWtX4ndlThHwtqfbYK1A,52057
-udata-10.0.9.dev33959.dist-info/LICENSE,sha256=V8j_M8nAz8PvAOZQocyRDX7keai8UJ9skgmnwqETmdY,34520
-udata-10.0.9.dev33959.dist-info/METADATA,sha256=MRXz94X29MxRwNTlvw9COpDhp0YKLX1NdZ1QMvlMFnU,140524
-udata-10.0.9.dev33959.dist-info/WHEEL,sha256=DZajD4pwLWue70CAfc7YaxT1wLUciNBvN_TTcvXpltE,110
-udata-10.0.9.dev33959.dist-info/entry_points.txt,sha256=3SKiqVy4HUqxf6iWspgMqH8d88Htk6KoLbG1BU-UddQ,451
-udata-10.0.9.dev33959.dist-info/top_level.txt,sha256=39OCg-VWFWOq4gCKnjKNu-s3OwFlZIu_dVH8Gl6ndHw,12
-udata-10.0.9.dev33959.dist-info/RECORD,,
+udata-10.0.9.dev33978.dist-info/LICENSE,sha256=V8j_M8nAz8PvAOZQocyRDX7keai8UJ9skgmnwqETmdY,34520
+udata-10.0.9.dev33978.dist-info/METADATA,sha256=QMaDuuBMgTAeaiImaPWFuTJ5XZcAyXQOadY2WzseAG4,140633
+udata-10.0.9.dev33978.dist-info/WHEEL,sha256=DZajD4pwLWue70CAfc7YaxT1wLUciNBvN_TTcvXpltE,110
+udata-10.0.9.dev33978.dist-info/entry_points.txt,sha256=3SKiqVy4HUqxf6iWspgMqH8d88Htk6KoLbG1BU-UddQ,451
+udata-10.0.9.dev33978.dist-info/top_level.txt,sha256=39OCg-VWFWOq4gCKnjKNu-s3OwFlZIu_dVH8Gl6ndHw,12
+udata-10.0.9.dev33978.dist-info/RECORD,,