Revert "Don't duplicate UserSchema schema, use"

This reverts commit 6f38b8c8fa.

backend/grant/user/models.py

@@ -248,9 +248,29 @@ class SelfUserSchema(ma.Schema):
 self_user_schema = SelfUserSchema()
 self_users_schema = SelfUserSchema(many=True)
 
-user_schema = SelfUserSchema(exclude=['email_address'])
-users_schema = SelfUserSchema(many=True, exclude=['email_address'])
 
+class UserSchema(ma.Schema):
+    class Meta:
+        model = User
+        # Fields to expose
+        fields = (
+            "title",
+            "social_medias",
+            "avatar",
+            "display_name",
+            "userid"
+        )
+
+    social_medias = ma.Nested("SocialMediaSchema", many=True)
+    avatar = ma.Nested("AvatarSchema")
+    userid = ma.Method("get_userid")
+
+    def get_userid(self, obj):
+        return obj.id
+
+
+user_schema = SelfUserSchema()
+users_schema = SelfUserSchema(many=True)
 
 class SocialMediaSchema(ma.Schema):
     class Meta: