Merge branch 'feature/new-profile-form-fields' into develop

courses/reports/serializers.py

@@ -29,7 +29,21 @@ class UserInDetailSerializer(serializers.ModelSerializer):
             'topics_created',
             'number_of_likes',
             'comments_created',
+            'living_area', 
+            'gender', 
+            'race', 
+            'birth_date',
+            'city',
+            
         ))
+    city = serializers.SlugRelatedField(
+            many=False,
+            read_only=True,
+            slug_field='display_name'
+        )
+    gender = serializers.CharField(source='get_gender_display')
+    race = serializers.CharField(source='get_race_display')
+    living_area = serializers.CharField(source='get_living_area_display')
 
     comments_created = serializers.SerializerMethodField()
     topics_created = serializers.SerializerMethodField()