mirror of
https://github.com/ae-utbm/sith.git
synced 2025-07-11 04:19:25 +00:00
Better usage of cache for groups and clubs related operations (#634)
* Better usage of cache for group retrieval * Cache clearing on object deletion or update * replace signals by save and delete override * add is_anonymous check in is_owned_by Add in many is_owned_by(self, user) methods that user is not anonymous. Since many of those functions do db queries, this should reduce a little bit the load of the db. * Stricter usage of User.is_in_group Constrain the parameters that can be passed to the function to make sure only a str or an int can be used. Also force to explicitly specify if the group id or the group name is used. * write test and correct bugs * remove forgotten populate commands * Correct test
This commit is contained in:
@ -73,16 +73,16 @@ class Election(models.Model):
|
||||
return bool(timezone.now() <= self.end_candidature)
|
||||
|
||||
def can_candidate(self, user):
|
||||
for group in self.candidature_groups.all():
|
||||
if user.is_in_group(group):
|
||||
for group_id in self.candidature_groups.values_list("pk", flat=True):
|
||||
if user.is_in_group(pk=group_id):
|
||||
return True
|
||||
return False
|
||||
|
||||
def can_vote(self, user):
|
||||
if not self.is_vote_active or self.has_voted(user):
|
||||
return False
|
||||
for group in self.vote_groups.all():
|
||||
if user.is_in_group(group):
|
||||
for group_id in self.vote_groups.values_list("pk", flat=True):
|
||||
if user.is_in_group(pk=group_id):
|
||||
return True
|
||||
return False
|
||||
|
||||
@ -97,10 +97,9 @@ class Election(models.Model):
|
||||
results[role.title] = role.results(total_vote)
|
||||
return results
|
||||
|
||||
def delete(self):
|
||||
for election_list in self.election_lists.all():
|
||||
election_list.delete()
|
||||
super(Election, self).delete()
|
||||
def delete(self, *args, **kwargs):
|
||||
self.election_lists.all().delete()
|
||||
super(Election, self).delete(*args, **kwargs)
|
||||
|
||||
# Permissions
|
||||
|
||||
|
Reference in New Issue
Block a user