diff --git a/app/models.py b/app/models.py index d09f18e7b..9c5450fb5 100644 --- a/app/models.py +++ b/app/models.py @@ -2122,7 +2122,8 @@ class ServiceContactList(db.Model): updated_at = db.Column(db.DateTime, nullable=True, onupdate=datetime.datetime.utcnow) archived = db.Column(db.Boolean, nullable=False, default=False) - def get_job_count(self): + @property + def job_count(self): today = datetime.datetime.utcnow().date() return Job.query.filter( Job.contact_list_id == self.id, @@ -2136,7 +2137,8 @@ class ServiceContactList(db.Model): ) ).count() - def get_has_jobs(self): + @property + def has_jobs(self): return bool(Job.query.filter( Job.contact_list_id == self.id, ).first()) @@ -2147,8 +2149,8 @@ class ServiceContactList(db.Model): "id": str(self.id), "original_file_name": self.original_file_name, "row_count": self.row_count, - "recent_job_count": self.get_job_count(), - "has_jobs": self.get_has_jobs(), + "recent_job_count": self.job_count, + "has_jobs": self.has_jobs, "template_type": self.template_type, "service_id": str(self.service_id), "created_by": self.created_by.name,