Merge pull request #1627 from gtech-mulearn/dev

department and graduation year fix
gtech-mulearn · Nov 28, 2023 · 8d51b4f · 8d51b4f
2 parents 0ddaec4 + 54e3366
commit 8d51b4f
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/api/dashboard/campus/campus_views.py b/api/dashboard/campus/campus_views.py
@@ -121,6 +121,8 @@ def get(self, request):
                 karma=F("wallet_user__karma"),
                 level=F("user_lvl_link_user__level__name"),
                 join_date=F("created_at"),
+                department=F('user_organization_link_user__department__title'),
+                graduation_year=F("user_organization_link_user__graduation_year")
             ))
 
         paginated_queryset = CommonUtils.get_paginated_queryset(

diff --git a/api/dashboard/campus/serializers.py b/api/dashboard/campus/serializers.py
@@ -23,7 +23,6 @@ class CampusDetailsSerializer(serializers.ModelSerializer):
     rank = serializers.SerializerMethodField()
 
     lead = serializers.SerializerMethodField()
-    department = serializers.CharField(source="department.title")
 
     class Meta:
         model = UserOrganizationLink
@@ -38,8 +37,6 @@ class Meta:
             "active_members",
             "rank",
             "lead",
-            "graduation_year",
-            "department"
         ]
 
     def get_lead(self, obj):
@@ -124,6 +121,8 @@ class CampusStudentDetailsSerializer(serializers.Serializer):
     join_date = serializers.CharField()
     email = serializers.CharField()
     mobile = serializers.CharField()
+    graduation_year = serializers.CharField()
+    department = serializers.CharField()
 
     class Meta:
         fields = ("user_id", "email", "mobile", "fullname", "karma", "muid", "rank", "level", "join_date")