Merge branch 'develop' into feature/billing

weni-ai · Aug 6, 2021 · cc408b3 · cc408b3
2 parents 498168d + f6d94ac
commit cc408b3
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/weni/api/v1/account/views.py b/weni/api/v1/account/views.py
@@ -154,7 +154,7 @@ def change_language(self, request, **kwargs):  # pragma: no cover
             ],
         )
 
-        return Response()
+        return Response({"language": user.language})
 
 
 class SearchUserViewSet(mixins.ListModelMixin, GenericViewSet):  # pragma: no cover

diff --git a/weni/api/v1/organization/views.py b/weni/api/v1/organization/views.py
@@ -3,7 +3,7 @@
 from django_filters.rest_framework import DjangoFilterBackend
 from rest_framework import mixins
 from rest_framework.decorators import action
-from rest_framework.filters import SearchFilter
+from rest_framework.filters import SearchFilter, OrderingFilter
 from rest_framework.generics import get_object_or_404
 from rest_framework.permissions import IsAuthenticated
 from rest_framework.response import Response
@@ -100,7 +100,7 @@ class OrganizationAuthorizationViewSet(
     serializer_class = OrganizationAuthorizationSerializer
     filter_class = OrganizationAuthorizationFilter
     lookup_fields = ["organization__uuid", "user__id"]
-    filter_backends = [DjangoFilterBackend, SearchFilter]
+    filter_backends = [DjangoFilterBackend, SearchFilter, OrderingFilter]
     search_fields = [
         "=user__first_name",
         "^user__first_name",
@@ -115,6 +115,8 @@ class OrganizationAuthorizationViewSet(
         "^user__email",
         "$user__email",
     ]
+    ordering = ["-user__first_name"]
+
     permission_classes = [IsAuthenticated]
 
     def get_object(self):