arona/PyRIGS
1
0
Fork 0
mirror of https://github.com/nottinghamtec/PyRIGS.git synced 2026-01-22 16:02:16 +00:00
Code Issues Projects Releases Wiki Activity

Performance optimisation of the related models by letting the DB deal with the relation straight off

Browse Source
This commit is contained in:
Tom Price
2015-01-26 15:19:37 +00:00
parent c4bb7fbee6
commit 5b1cdbf182
1 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
RIGS/models.py
View File

@@ -63,7 +63,7 @@ class Person(models.Model, RevisionMixin):
@property @property
def latest_events(self): def latest_events(self):
return self.event_set.order_by('-start_date') return self.event_set.order_by('-start_date').select_related('person','organisation','venue','mic')
class Meta: class Meta:
permissions = ( permissions = (
@@ -98,7 +98,7 @@ class Organisation(models.Model, RevisionMixin):
@property @property
def latest_events(self): def latest_events(self):
return self.event_set.order_by('-start_date') return self.event_set.order_by('-start_date').select_related('person','organisation','venue','mic')
class Meta: class Meta:
permissions = ( permissions = (
@@ -158,7 +158,7 @@ class Venue(models.Model, RevisionMixin):
@property @property
def latest_events(self): def latest_events(self):
return self.event_set.order_by('-start_date') return self.event_set.order_by('-start_date').select_related('person','organisation','venue','mic')
class Meta: class Meta:
permissions = ( permissions = (
@@ -181,11 +181,11 @@ class EventManager(models.Manager):
models.Q(dry_hire=True, checked_in_by__isnull=False, status__gt=Event.CANCELLED) | # Active dry hire GT models.Q(dry_hire=True, checked_in_by__isnull=False, status__gt=Event.CANCELLED) | # Active dry hire GT
models.Q(dry_hire=True, status=Event.CANCELLED, start_date__gte=datetime.date.today()) models.Q(dry_hire=True, status=Event.CANCELLED, start_date__gte=datetime.date.today())
# Canceled but not started # Canceled but not started
).order_by('meet_at', 'start_date') ).order_by('meet_at', 'start_date').select_related('person','organisation','venue','mic')
return events return events
def rig_count(self): def rig_count(self):
events = self.filter( event_count = self.filter(
models.Q(start_date__gte=datetime.date.today(), end_date__isnull=True, models.Q(start_date__gte=datetime.date.today(), end_date__isnull=True,
is_rig=True) | # Starts after with no end is_rig=True) | # Starts after with no end
models.Q(end_date__gte=datetime.date.today(), is_rig=True) | # Ends after models.Q(end_date__gte=datetime.date.today(), is_rig=True) | # Ends after
@@ -193,8 +193,8 @@ class EventManager(models.Manager):
is_rig=True) | # Active dry hire LT is_rig=True) | # Active dry hire LT
models.Q(dry_hire=True, checked_in_by__isnull=False, status__gt=Event.CANCELLED, is_rig=True) models.Q(dry_hire=True, checked_in_by__isnull=False, status__gt=Event.CANCELLED, is_rig=True)
# Active dry hire GT # Active dry hire GT
).order_by('meet_at', 'start_date') ).order_by('meet_at', 'start_date').count()
return len(events) return event_count
@reversion.register(follow=['items']) @reversion.register(follow=['items'])