add 'show members when searching for the correspondent hashtag'

This commit is contained in:
2020-09-07 10:20:05 +00:00
parent e490980d3e
commit 5026fb1ff8
3 changed files with 41 additions and 11 deletions

View File

@@ -11,7 +11,7 @@ from rest_framework import serializers
class MemberQuerySet(models.QuerySet):
def get_members(self):
def get_active(self):
date_today = timezone.now().date()
return self.filter(
@@ -35,11 +35,11 @@ class ActiveMemberManager(models.Manager):
def get_members_of_job(self, job_names):
tmp_list = []
for job_name in job_names:
tmp_list.append(self.get_queryset().get_members().filter(Q(job__name=job_name)))
tmp_list.append(self.get_queryset().get_active().filter(Q(job__name=job_name)))
return tmp_list
def get_all(self):
return self.get_queryset().get_members()
return self.get_queryset().get_active()
def get_queryset(self):
return MemberQuerySet(self.model, using=self._db)