fix: removes unecessary data from transfer -- build-on-dev (#2241)

* fix: removes unecessary data from transfer

* fix: new user serializer passes only basic user info to frontend
-get history modified so that approved and disapproved statuses created by government are  excluded so that communications/status changes within government are not shown in network tab

* removes id from user basic serializer

backend/api/serializers/credit_transfer.py

@@ -18,8 +18,8 @@
     CreditTransferCommentSerializer
 from api.serializers.credit_transfer_content import \
     CreditTransferContentSerializer, CreditTransferContentSaveSerializer
-from api.serializers.user import MemberSerializer, UserSerializer
-from api.serializers.organization import OrganizationSerializer
+from api.serializers.user import UserBasicSerializer
+from api.serializers.organization import OrganizationNameSerializer
 from api.services.credit_transaction import calculate_insufficient_credits
 from api.services.send_email import notifications_credit_transfers
 
@@ -29,15 +29,15 @@ def get_update_user(self, obj):
         user_profile = UserProfile.objects.filter(username=obj.update_user)
 
         if user_profile.exists():
-            serializer = MemberSerializer(user_profile.first(), read_only=True)
+            serializer = UserBasicSerializer(user_profile.first(), read_only=True)
             return serializer.data
 
         return obj.update_user
 
     def get_create_user(self, obj):
         user_profile = UserProfile.objects.filter(username=obj.create_user)
         if user_profile.exists():
-            serializer = UserSerializer(user_profile.first(), read_only=True)
+            serializer = UserBasicSerializer(user_profile.first(), read_only=True)
             return serializer.data
         return obj.create_user
 
@@ -47,6 +47,8 @@ def get_history(self, obj):
             history = CreditTransferHistory.objects.filter(
                 transfer_id=obj.id)
         else:
+            create_user_subquery = UserProfile.objects.filter(organization__is_government=True).values_list('username', flat=True)
+
             history = CreditTransferHistory.objects.filter(
                 transfer_id=obj.id,
                 status__in=[
@@ -58,8 +60,8 @@ def get_history(self, obj):
                     CreditTransferStatuses.RESCIND_PRE_APPROVAL,
                     CreditTransferStatuses.REJECTED,
                     CreditTransferStatuses.VALIDATED
-                ])
-        serializer = CreditTransferHistorySerializer(history, many=True, read_only=True)
+                ]).exclude(create_user__in=create_user_subquery, status__in=[CreditTransferStatuses.APPROVED, CreditTransferStatuses.DISAPPROVED,])
+        serializer = CreditTransferHistorySerializer(history, many=True, read_only=True, context={'request': request})
         return serializer.data
 
 
@@ -97,11 +99,11 @@ class CreditTransferListSerializer(
         CreditTransferBaseSerializer
 ):
     history = SerializerMethodField()
-    credit_to = OrganizationSerializer()
+    credit_to = OrganizationNameSerializer()
     credit_transfer_content = CreditTransferContentSerializer(
         many=True, read_only=True
     )
-    debit_from = OrganizationSerializer()
+    debit_from = OrganizationNameSerializer()
     status = SerializerMethodField()
     update_user = SerializerMethodField()
 
@@ -128,11 +130,11 @@ class CreditTransferSerializer(
         CreditTransferBaseSerializer
 ):
     history = SerializerMethodField()
-    credit_to = OrganizationSerializer()
+    credit_to = OrganizationNameSerializer()
     credit_transfer_content = CreditTransferContentSerializer(
         many=True, read_only=True
     )
-    debit_from = OrganizationSerializer()
+    debit_from = OrganizationNameSerializer()
     status = SerializerMethodField()
     update_user = SerializerMethodField()
     sufficient_credits = SerializerMethodField()

backend/api/serializers/organization.py

@@ -9,6 +9,16 @@
     OrganizationLDVSalesSerializer
 from api.models.model_year import ModelYear
 
+class OrganizationNameSerializer(serializers.ModelSerializer):
+    """
+    Serializer for passing just the necessary info for credit transfers etc
+    """
+    class Meta:
+        model = Organization
+        fields = (
+            'name', 'short_name', 'is_government'
+        )
+
 
 class OrganizationSerializer(serializers.ModelSerializer):
     """

backend/api/serializers/user.py

@@ -5,7 +5,7 @@
 from api.models.role import Role
 from api.models.user_profile import UserProfile
 from api.services.user import update_roles, create_default_user_notification_settings
-from .organization import OrganizationSerializer
+from .organization import OrganizationSerializer, OrganizationNameSerializer
 from .permission import PermissionSerializer
 from .role import RoleSerializer
 
@@ -30,6 +30,17 @@ class Meta:
         )
 
 
+class UserBasicSerializer(serializers.ModelSerializer):
+    """
+    Serializer for the basic details of a user
+    """
+    organization = OrganizationNameSerializer(read_only=True)
+    class Meta:
+        model = UserProfile
+        fields = (
+            'display_name', 'organization'
+        )
+
 class UserSerializer(serializers.ModelSerializer):
     """
     Serializer for the full details of the User