udata 10.0.9.dev33939__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/core/spatial/api.py

@@ -54,7 +54,9 @@ class SuggestZonesAPI(API):
     def get(self):
         """Geospatial zones suggest endpoint using mongoDB contains"""
         args = suggest_parser.parse_args()
-        geozones = GeoZone.objects(Q(name__icontains=args["q"]) | Q(code__icontains=args["q"]))
+        geozones = GeoZone.objects(
+            Q(name__icontains=args["q"]) | Q(code__icontains=args["q"]) | Q(id__icontains=args["q"])
+        )
 
         # We're manually sorting based on zone level int (cause we don't have the int value directly in mongo document)
         level_id_to_int_level = {level.id: level.admin_level for level in GeoLevel.objects()}

udata/core/spatial/tests/test_api.py

@@ -75,6 +75,17 @@ class SpatialApiTest(APITestCase):
             self.assertIn("level", suggestion)
             self.assertIn("name-test", suggestion["name"])
 
+    def test_suggest_zones_on_id(self):
+        """It should suggest zones based on its id"""
+        zone = GeoZoneFactory()
+        for _ in range(2):
+            GeoZoneFactory()
+
+        response = self.get(url_for("api.suggest_zones"), qs={"q": zone.id})
+        self.assert200(response)
+
+        self.assertEqual(response.json[0]["id"], zone["id"])
+
     def test_suggest_zones_sorted(self):
         """It should suggest zones based on its name"""
         country_level = GeoLevelFactory(id="country", name="country", admin_level=10)