From 68f1a8b5ff5a7dd68f4befeaea62e81b02ea7e3d Mon Sep 17 00:00:00 2001 From: Raj Patel Date: Thu, 5 Dec 2024 21:32:04 +0530 Subject: [PATCH] Expose organization user created timestamp in members endpoint --- kobo/apps/organizations/serializers.py | 6 ++---- kobo/apps/organizations/views.py | 8 ++++---- 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/kobo/apps/organizations/serializers.py b/kobo/apps/organizations/serializers.py index 52603b5fd8..418f2404b7 100644 --- a/kobo/apps/organizations/serializers.py +++ b/kobo/apps/organizations/serializers.py @@ -15,6 +15,7 @@ class OrganizationUserSerializer(serializers.ModelSerializer): + created = serializers.DateTimeField(format='%Y-%m-%dT%H:%M:%SZ') user = serializers.HyperlinkedRelatedField( queryset=get_user_model().objects.all(), lookup_field='username', @@ -25,9 +26,6 @@ class OrganizationUserSerializer(serializers.ModelSerializer): source='has_mfa_enabled', read_only=True ) url = serializers.SerializerMethodField() - date_joined = serializers.DateTimeField( - source='user.date_joined', format='%Y-%m-%dT%H:%M:%SZ' - ) user__username = serializers.ReadOnlyField(source='user.username') user__extra_details__name = serializers.ReadOnlyField( source='user.extra_details.data.name' @@ -45,7 +43,7 @@ class Meta: 'user__extra_details__name', 'role', 'user__has_mfa_enabled', - 'date_joined', + 'created', 'user__is_active' ] diff --git a/kobo/apps/organizations/views.py b/kobo/apps/organizations/views.py index b8677f7b97..1785713601 100644 --- a/kobo/apps/organizations/views.py +++ b/kobo/apps/organizations/views.py @@ -312,7 +312,7 @@ class OrganizationMemberViewSet(viewsets.ModelViewSet): > "user__name": "Foo Bar", > "role": "owner", > "user__has_mfa_enabled": true, - > "date_joined": "2024-08-11T12:36:32Z", + > "created": "2024-08-11T12:36:32Z", > "user__is_active": true > }, > { @@ -324,7 +324,7 @@ class OrganizationMemberViewSet(viewsets.ModelViewSet): > "user__name": "John Doe", > "role": "admin", > "user__has_mfa_enabled": false, - > "date_joined": "2024-10-21T06:38:45Z", + > "created": "2024-10-21T06:38:45Z", > "user__is_active": true > } > ] @@ -353,7 +353,7 @@ class OrganizationMemberViewSet(viewsets.ModelViewSet): > "user__name": "Foo Bar", > "role": "owner", > "user__has_mfa_enabled": true, - > "date_joined": "2024-08-11T12:36:32Z", + > "created": "2024-08-11T12:36:32Z", > "user__is_active": true > } @@ -389,7 +389,7 @@ class OrganizationMemberViewSet(viewsets.ModelViewSet): > "user__name": "Foo Bar", > "role": "admin", > "user__has_mfa_enabled": true, - > "date_joined": "2024-08-11T12:36:32Z", + > "created": "2024-08-11T12:36:32Z", > "user__is_active": true > }