From 09bcbb399e6441eaedf196ca4a50793196f67941 Mon Sep 17 00:00:00 2001 From: Ivlev Denis Date: Mon, 12 Mar 2018 11:49:32 +0300 Subject: [PATCH] Fix balance calc --- apps/user/models.py | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/apps/user/models.py b/apps/user/models.py index 43eac1cd..e0b7afa8 100644 --- a/apps/user/models.py +++ b/apps/user/models.py @@ -1,3 +1,6 @@ +from json import dumps +from rest_framework.authtoken.models import Token + from django.db import models from django.db.models.signals import post_save from django.dispatch import receiver @@ -5,10 +8,8 @@ from django.contrib.auth.models import AbstractUser, UserManager from django.contrib.postgres import fields as pgfields from django.utils.translation import gettext_lazy as _ -from rest_framework.authtoken.models import Token - -from json import dumps from api.v1 import serializers +from apps.payment.models import AuthorBalance class User(AbstractUser): @@ -63,7 +64,7 @@ class User(AbstractUser): @property def balance(self): - aggregate = self.balances.aggregate( + aggregate = self.balances.filter(type=AuthorBalance.IN).aggregate( models.Sum('amount'), models.Sum('commission'), )