From 54e98890907a9da51ae9957debb1b44b4c7a2973 Mon Sep 17 00:00:00 2001
From: Aaron <aaron.m.stricker@gmail.com>
Date: Wed, 6 Feb 2019 08:31:38 -0600
Subject: [PATCH] arbiter & related schema adjustments

---
 backend/grant/admin/views.py | 6 +++---
 backend/grant/user/models.py | 6 +++++-
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/backend/grant/admin/views.py b/backend/grant/admin/views.py
index ea763088..118a0161 100644
--- a/backend/grant/admin/views.py
+++ b/backend/grant/admin/views.py
@@ -11,7 +11,7 @@ from grant.proposal.models import (
     proposal_schema,
     user_proposal_contributions_schema,
 )
-from grant.user.models import User, users_schema, user_schema
+from grant.user.models import User, admin_users_schema, admin_user_schema
 from grant.rfp.models import RFP, admin_rfp_schema, admin_rfps_schema
 from grant.utils.admin import admin_auth_required, admin_is_authed, admin_login, admin_logout
 from grant.utils.enums import ProposalStatus
@@ -90,7 +90,7 @@ def delete_user(user_id):
 @admin_auth_required
 def get_users():
     users = User.query.all()
-    result = users_schema.dump(users)
+    result = admin_users_schema.dump(users)
     return result
 
 
@@ -100,7 +100,7 @@ def get_users():
 def get_user(id):
     user_db = User.query.filter(User.id == id).first()
     if user_db:
-        user = user_schema.dump(user_db)
+        user = admin_user_schema.dump(user_db)
         user_proposals = Proposal.query.filter(Proposal.team.any(id=user['userid'])).all()
         user['proposals'] = proposals_schema.dump(user_proposals)
         user_comments = Comment.get_by_user(user_db)
diff --git a/backend/grant/user/models.py b/backend/grant/user/models.py
index d7511b59..2b4cf2b2 100644
--- a/backend/grant/user/models.py
+++ b/backend/grant/user/models.py
@@ -244,7 +244,7 @@ class SelfUserSchema(ma.Schema):
     avatar = ma.Nested("AvatarSchema")
     userid = ma.Method("get_userid")
     email_verified = ma.Method("get_email_verified")
-    arbitrated_proposals = ma.Nested("Proposals", many=True, exclude=["arbitor"])
+    arbitrated_proposals = ma.Nested("ProposalSchema", many=True, exclude=["arbiter"])
 
     def get_userid(self, obj):
         return obj.id
@@ -256,6 +256,10 @@ class SelfUserSchema(ma.Schema):
 self_user_schema = SelfUserSchema()
 self_users_schema = SelfUserSchema(many=True)
 
+# differentiate from self, same for now
+admin_user_schema = self_user_schema
+admin_users_schema = self_users_schema
+
 
 class UserSchema(ma.Schema):
     class Meta: