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

Improve validation

Browse Source
This commit is contained in:
Tanner Collin 2022-08-22 22:37:49 +00:00
parent 1444a52a11
commit 495a6855a1
2 changed files with 18 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -109,12 +109,6 @@ class TransactionSerializer(serializers.ModelSerializer):
if validated_data['amount'] == 0: if validated_data['amount'] == 0:
raise ValidationError(dict(account_type='Can\'t have a $0.00 {} transaction. Do you want "Membership Adjustment"?'.format(validated_data['account_type']))) raise ValidationError(dict(account_type='Can\'t have a $0.00 {} transaction. Do you want "Membership Adjustment"?'.format(validated_data['account_type'])))
if validated_data['protocoin'] < 0:
current_protocoin = member.user.transactions.aggregate(Sum('protocoin'))['protocoin__sum']
new_protocoin = current_protocoin + validated_data['protocoin']
if new_protocoin < 0:
raise ValidationError(dict(protocoin='Insufficient funds. Member only has {} protocoin.'.format(current_protocoin)))
if validated_data['account_type'] in ['Interac', 'Dream Pmt', 'Square Pmt', 'PayPal']: if validated_data['account_type'] in ['Interac', 'Dream Pmt', 'Square Pmt', 'PayPal']:
if not validated_data.get('reference_number', None): if not validated_data.get('reference_number', None):
raise ValidationError(dict(reference_number='This field is required.')) raise ValidationError(dict(reference_number='This field is required.'))
@ -124,6 +118,13 @@ class TransactionSerializer(serializers.ModelSerializer):
def create(self, validated_data): def create(self, validated_data):
validated_data = self.validate_transaction(validated_data) validated_data = self.validate_transaction(validated_data)
if validated_data['protocoin'] < 0:
user = validated_data['user']
current_protocoin = user.transactions.aggregate(Sum('protocoin'))['protocoin__sum']
new_protocoin = current_protocoin + validated_data['protocoin']
if new_protocoin < 0:
raise ValidationError(dict(category='Insufficient funds. Member only has {} protocoin.'.format(current_protocoin)))
if validated_data['account_type'] == 'PayPal': if validated_data['account_type'] == 'PayPal':
msg = 'Manual PayPal transaction added:\n' + str(validated_data) msg = 'Manual PayPal transaction added:\n' + str(validated_data)
utils.alert_tanner(msg) utils.alert_tanner(msg)
@ -136,6 +137,15 @@ class TransactionSerializer(serializers.ModelSerializer):
def update(self, instance, validated_data): def update(self, instance, validated_data):
validated_data = self.validate_transaction(validated_data) validated_data = self.validate_transaction(validated_data)
if validated_data['protocoin'] < 0:
user = validated_data['user']
# when updating, we need to subtract out the transaction being edited
current_protocoin = user.transactions.aggregate(Sum('protocoin'))['protocoin__sum'] - instance.protocoin
new_protocoin = current_protocoin + validated_data['protocoin']
if new_protocoin < 0:
raise ValidationError(dict(category='Insufficient funds. Member only had {} protocoin.'.format(current_protocoin)))
return super().update(instance, validated_data) return super().update(instance, validated_data)
def get_member_id(self, obj): def get_member_id(self, obj):

3
webclient/src/Transactions.js
View File

@ -116,7 +116,8 @@ export function TransactionEditor(props) {
{input?.account_type !== prevInput?.account_type && input?.account_type === 'Protocoin' && {input?.account_type !== prevInput?.account_type && input?.account_type === 'Protocoin' &&
<Message visible warning> <Message visible warning>
<Message.Header>Are you sure?</Message.Header> <Message.Header>Are you sure?</Message.Header>
<p>Protocoin spending transactions are automatic. Do you want "Purchase of Protocoin" category below?</p> <p>Protocoin spending transactions are automatic. Do you want the "Purchase of Protocoin" category below?</p>
{input.protocoin > 0 && <p>Also, the value should be a <b>negative</b> number if they are spending Protocoin.</p>}
</Message> </Message>
} }