more fields
This commit is contained in:
parent
1d961efb69
commit
2caae02a3c
2 changed files with 10 additions and 2 deletions
|
|
@ -230,8 +230,12 @@ class TransactionGroupedSerializer(serializers.Serializer):
|
||||||
application = serializers.UUIDField()
|
application = serializers.UUIDField()
|
||||||
total_amount = serializers.FloatField()
|
total_amount = serializers.FloatField()
|
||||||
total_count = serializers.IntegerField()
|
total_count = serializers.IntegerField()
|
||||||
|
state = serializers.IntegerField()
|
||||||
|
description = serializers.CharField()
|
||||||
|
created_at = serializers.DateTimeField()
|
||||||
|
|
||||||
transactions = TransactionSerializer(many=True)
|
transactions = TransactionSerializer(many=True)
|
||||||
|
|
||||||
class Meta:
|
class Meta:
|
||||||
fields = ('reference', 'application', 'total_amount', 'total_count', 'transactions')
|
fields = ('reference', 'application', 'total_amount', 'total_count', 'transactions', 'state', 'description', 'created_at')
|
||||||
read_only_fields = ['reference', 'application', 'total_amount', 'total_count', 'transactions']
|
read_only_fields = ['reference', 'application', 'total_amount', 'total_count', 'transactions', 'state', 'description', 'created_at']
|
||||||
|
|
|
||||||
|
|
@ -360,7 +360,11 @@ class UserTransactionViewSet(mixins.ListModelMixin,
|
||||||
transaction_dict = {t.pk: t for t in transaction_list}
|
transaction_dict = {t.pk: t for t in transaction_list}
|
||||||
|
|
||||||
for grouped_transaction in page:
|
for grouped_transaction in page:
|
||||||
|
grouped_transaction: dict
|
||||||
for i, transaction in enumerate(grouped_transaction['transactions']):
|
for i, transaction in enumerate(grouped_transaction['transactions']):
|
||||||
|
grouped_transaction.setdefault('description', transaction_dict[transaction].details.get('description', 'no-description'))
|
||||||
|
grouped_transaction.setdefault('state', transaction_dict[transaction].state)
|
||||||
|
grouped_transaction.setdefault('created_at', transaction_dict[transaction].created_at)
|
||||||
grouped_transaction['transactions'][i] = transaction_dict[transaction]
|
grouped_transaction['transactions'][i] = transaction_dict[transaction]
|
||||||
|
|
||||||
serializer = self.get_serializer(page, many=True)
|
serializer = self.get_serializer(page, many=True)
|
||||||
|
|
|
||||||
Loading…
Add table
Reference in a new issue