TTMK/web2.0-backend
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

format files with black

Browse Source
This commit is contained in:
Aarni Halinen
2022-01-13 22:10:24 +02:00
parent a0f062c697
commit 11efcdd579
178 changed files with 3763 additions and 2324 deletions
Download Patch File Download Diff File Expand all files Collapse all files
members/models.py
+36 -30
View File
@@ -12,8 +12,9 @@ class BaseMember(models.Model):
first_name = models.CharField(_("First name"), max_length=127)
last_name = models.CharField(_("Last name"), max_length=127)
email = models.EmailField(_("Email"), unique=True)
POR = models.CharField(_("Place of residence"),
max_length=255) # place of residence
POR = models.CharField(
_("Place of residence"), max_length=255
) # place of residence
AYY = models.BooleanField(_("AYY"), default=False)
jas = models.BooleanField(_("JAS"), default=False)
@@ -34,7 +35,7 @@ class BaseMember(models.Model):
self.email,
self.POR,
int(self.AYY),
int(self.jas)
int(self.jas),
]
@@ -42,11 +43,9 @@ class Request(BaseMember):
"""Member request model represents one member request."""
class Meta:
permissions = (
('read_application', 'Can see member application in list'),
)
permissions = (("read_application", "Can see member application in list"),)
submitted = models.DateTimeField(_('Submitted'), default=timezone.now)
submitted = models.DateTimeField(_("Submitted"), default=timezone.now)
def to_member(self):
"""Convert array to member model."""
@@ -59,47 +58,54 @@ class Payment(models.Model):
"""Payment model representing one payment event."""
class Meta:
permissions = (
('read_payment', 'Can see payment in list'),
)
permissions = (("read_payment", "Can see payment in list"),)
date = models.DateTimeField(_('Date'), default=timezone.now)
source = models.CharField(_('Source'), choices=[
('AYY', _('AYY')),
('cash', _('Cash')),
('bank_transfer', _('Bank transfer')),
], max_length=255)
date = models.DateTimeField(_("Date"), default=timezone.now)
source = models.CharField(
_("Source"),
choices=[
("AYY", _("AYY")),
("cash", _("Cash")),
("bank_transfer", _("Bank transfer")),
],
max_length=255,
)
member = models.ForeignKey('Member',
on_delete=models.PROTECT,
blank=True,
null=True,
related_name='payments')
member = models.ForeignKey(
"Member",
on_delete=models.PROTECT,
blank=True,
null=True,
related_name="payments",
)
def __str__(self):
"""Return payment id and date."""
return 'Payment no. {}, {}'.format(self.id, str(self.date))
return "Payment no. {}, {}".format(self.id, str(self.date))
@staticmethod
def find_payments_by_name(query_name):
qs = Payment.objects.all()
for term in query_name.split():
qs = qs.filter(Q(member__first_name__icontains=term) | Q(member__last_name__icontains=term))
qs = qs.filter(
Q(member__first_name__icontains=term)
| Q(member__last_name__icontains=term)
)
return qs
class Member(BaseMember):
"""Member model represets one member on the registry."""
created = models.DateTimeField(_('Created'), default=timezone.now)
created = models.DateTimeField(_("Created"), default=timezone.now)
class Meta:
permissions = (
('check_by_email', 'Can check if user exists by email'),
('read_member', 'Can see member in list'),
("check_by_email", "Can check if user exists by email"),
("read_member", "Can see member in list"),
)
verbose_name = _('Member')
verbose_name_plural = _('Members')
verbose_name = _("Member")
verbose_name_plural = _("Members")
@staticmethod
def from_array(array):
@@ -126,5 +132,5 @@ class Member(BaseMember):
@staticmethod
def get_members_with_latest_payment(members_query):
"""Return QuerySet of given members QS with last_paid attribute."""
latest = Payment.objects.filter(member=OuterRef('pk')).order_by('-date')
return members_query.annotate(last_paid=Subquery(latest.values('date')[:1]))
latest = Payment.objects.filter(member=OuterRef("pk")).order_by("-date")
return members_query.annotate(last_paid=Subquery(latest.values("date")[:1]))