tanner/spaceport
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Expose reported transactions on GET /transactions/

Browse Source
This commit is contained in:
Tanner Collin 2020-01-31 23:46:59 +00:00
parent 8296295937
commit 7d3d06033d
3 changed files with 23 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
apiserver/apiserver/api/serializers.py
View File

@ -44,7 +44,7 @@ class TransactionSerializer(serializers.ModelSerializer):
'Unmatched Member', 'Unmatched Member',
'Unmatched Purchase', 'Unmatched Purchase',
'User Flagged', 'User Flagged',
]) ], allow_null=True)
class Meta: class Meta:
model = models.Transaction model = models.Transaction
@ -62,7 +62,14 @@ class TransactionSerializer(serializers.ModelSerializer):
validated_data['user'] = member.user validated_data['user'] = member.user
return super().create(validated_data) return super().create(validated_data)
def update(self, instance, validated_data):
member = get_object_or_404(models.Member, id=validated_data['member_id'])
validated_data['user'] = member.user
return super().update(instance, validated_data)
def get_member_name(self, obj): def get_member_name(self, obj):
if not obj.member_id: return 'Unknown'
if obj.user: if obj.user:
member = obj.user.member member = obj.user.member
else: else:

4
apiserver/apiserver/api/utils_paypal.py
View File

@ -105,7 +105,7 @@ def build_tx(data):
def create_unmatched_member_tx(data): def create_unmatched_member_tx(data):
transactions = models.Transaction.objects transactions = models.Transaction.objects
report_memo = 'Cant link sender name: {} {}, email: {}, note: {}'.format( report_memo = 'Cant link sender name, {} {}, email: {}, note: {}'.format(
data['first_name'], data['first_name'],
data['last_name'], data['last_name'],
data['payer_email'], data['payer_email'],
@ -150,7 +150,7 @@ def create_unmatched_purchase_tx(data, member):
transactions = models.Transaction.objects transactions = models.Transaction.objects
user = getattr(member, 'user', None) user = getattr(member, 'user', None)
report_memo = 'Unknown payment reason: {} {}, email: {}, note: {}'.format( report_memo = 'Unknown payment reason, {} {}, email: {}, note: {}'.format(
data['first_name'], data['first_name'],
data['last_name'], data['last_name'],
data['payer_email'], data['payer_email'],

15
apiserver/apiserver/api/views.py
View File

@ -193,11 +193,17 @@ class TrainingViewSet(Base, Retrieve, Create, Update):
serializer.save(user=self.request.user) serializer.save(user=self.request.user)
class TransactionViewSet(Base, Create, Retrieve, Update): class TransactionViewSet(Base, List, Create, Retrieve, Update):
permission_classes = [AllowMetadata | IsAuthenticated, IsObjOwnerOrAdmin] permission_classes = [AllowMetadata | IsAuthenticated, IsObjOwnerOrAdmin]
queryset = models.Transaction.objects.all()
serializer_class = serializers.TransactionSerializer serializer_class = serializers.TransactionSerializer
def get_queryset(self):
queryset = models.Transaction.objects
if self.action == 'list':
return queryset.exclude(report_type__isnull=True).order_by('-id', '-date')
else:
return queryset.all()
def retally_membership(self): def retally_membership(self):
member_id = self.request.data['member_id'] member_id = self.request.data['member_id']
member = get_object_or_404(models.Member, id=member_id) member = get_object_or_404(models.Member, id=member_id)
@ -211,6 +217,11 @@ class TransactionViewSet(Base, Create, Retrieve, Update):
serializer.save() serializer.save()
self.retally_membership() self.retally_membership()
def list(self, request):
if not is_admin_director(self.request.user):
raise exceptions.PermissionDenied()
return super().list(request)
class UserView(views.APIView): class UserView(views.APIView):
permission_classes = [AllowMetadata | IsAuthenticated] permission_classes = [AllowMetadata | IsAuthenticated]