mirror of
https://github.com/daniviga/django-ram.git
synced 2026-03-21 15:52:30 +01:00
Improve performance oprimizing queries (#56)
* Extend test coverage * Implement query optimization * More aggressing code reuse * Add more indexes and optimize usage * Fix tests * Further optimizations, improve counting to rely on backend DB * chore: add Makefile for frontend asset minification - Add comprehensive Makefile with targets for JS and CSS minification - Implements instructions from ram/portal/static/js/src/README.md - Provides targets: install, minify, minify-js, minify-css, clean, watch - Fix main.min.js to only include theme_selector.js and tabs_selector.js - Remove validators.js from minified output per README instructions * Add a Makefile to compile JS and CSS * docs: add blank line whitespace rule to AGENTS.md Specify that blank lines must not contain any whitespace (spaces or tabs) to maintain code cleanliness and PEP 8 compliance * Update for 0.20 release with optimizations * Improve Makefile
This commit is contained in:
GitHub
@@ -2,18 +2,227 @@ from django.db import models
|
||||
from django.core.exceptions import FieldError
|
||||
|
||||
|
||||
class PublicManager(models.Manager):
|
||||
class PublicQuerySet(models.QuerySet):
|
||||
"""Base QuerySet with published/public filtering."""
|
||||
|
||||
def get_published(self, user):
|
||||
"""
|
||||
Get published items based on user authentication status.
|
||||
Returns all items for authenticated users, only published for anonymous.
|
||||
"""
|
||||
if user.is_authenticated:
|
||||
return self.get_queryset()
|
||||
return self
|
||||
else:
|
||||
return self.get_queryset().filter(published=True)
|
||||
return self.filter(published=True)
|
||||
|
||||
def get_public(self, user):
|
||||
"""
|
||||
Get public items based on user authentication status.
|
||||
Returns all items for authenticated users, only non-private for anonymous.
|
||||
"""
|
||||
if user.is_authenticated:
|
||||
return self.get_queryset()
|
||||
return self
|
||||
else:
|
||||
try:
|
||||
return self.get_queryset().filter(private=False)
|
||||
return self.filter(private=False)
|
||||
except FieldError:
|
||||
return self.get_queryset().filter(property__private=False)
|
||||
return self.filter(property__private=False)
|
||||
|
||||
|
||||
class PublicManager(models.Manager):
|
||||
"""Manager using PublicQuerySet."""
|
||||
|
||||
def get_queryset(self):
|
||||
return PublicQuerySet(self.model, using=self._db)
|
||||
|
||||
def get_published(self, user):
|
||||
return self.get_queryset().get_published(user)
|
||||
|
||||
def get_public(self, user):
|
||||
return self.get_queryset().get_public(user)
|
||||
|
||||
|
||||
class RollingStockQuerySet(PublicQuerySet):
|
||||
"""QuerySet with optimization methods for RollingStock."""
|
||||
|
||||
def with_related(self):
|
||||
"""
|
||||
Optimize queryset by prefetching commonly accessed related objects.
|
||||
Use this for list views to avoid N+1 queries.
|
||||
"""
|
||||
return self.select_related(
|
||||
'rolling_class',
|
||||
'rolling_class__company',
|
||||
'rolling_class__type',
|
||||
'manufacturer',
|
||||
'scale',
|
||||
'decoder',
|
||||
'shop',
|
||||
).prefetch_related('tags', 'image')
|
||||
|
||||
def with_details(self):
|
||||
"""
|
||||
Optimize queryset for detail views with all related objects.
|
||||
Includes properties, documents, and journal entries.
|
||||
"""
|
||||
return self.with_related().prefetch_related(
|
||||
'property',
|
||||
'document',
|
||||
'journal',
|
||||
'rolling_class__property',
|
||||
'rolling_class__manufacturer',
|
||||
'decoder__document',
|
||||
)
|
||||
|
||||
|
||||
class RollingStockManager(PublicManager):
|
||||
"""Optimized manager for RollingStock with prefetch methods."""
|
||||
|
||||
def get_queryset(self):
|
||||
return RollingStockQuerySet(self.model, using=self._db)
|
||||
|
||||
def with_related(self):
|
||||
return self.get_queryset().with_related()
|
||||
|
||||
def with_details(self):
|
||||
return self.get_queryset().with_details()
|
||||
|
||||
def get_published_with_related(self, user):
|
||||
"""
|
||||
Convenience method combining get_published with related objects.
|
||||
"""
|
||||
return self.get_published(user).with_related()
|
||||
|
||||
|
||||
class ConsistQuerySet(PublicQuerySet):
|
||||
"""QuerySet with optimization methods for Consist."""
|
||||
|
||||
def with_related(self):
|
||||
"""
|
||||
Optimize queryset by prefetching commonly accessed related objects.
|
||||
Note: Consist.image is a direct ImageField, not a relation.
|
||||
"""
|
||||
return self.select_related('company', 'scale').prefetch_related(
|
||||
'tags', 'consist_item'
|
||||
)
|
||||
|
||||
def with_rolling_stock(self):
|
||||
"""
|
||||
Optimize queryset including consist items and their rolling stock.
|
||||
Use for detail views showing consist composition.
|
||||
"""
|
||||
return self.with_related().prefetch_related(
|
||||
'consist_item__rolling_stock',
|
||||
'consist_item__rolling_stock__rolling_class',
|
||||
'consist_item__rolling_stock__rolling_class__company',
|
||||
'consist_item__rolling_stock__rolling_class__type',
|
||||
'consist_item__rolling_stock__manufacturer',
|
||||
'consist_item__rolling_stock__scale',
|
||||
'consist_item__rolling_stock__image',
|
||||
)
|
||||
|
||||
|
||||
class ConsistManager(PublicManager):
|
||||
"""Optimized manager for Consist with prefetch methods."""
|
||||
|
||||
def get_queryset(self):
|
||||
return ConsistQuerySet(self.model, using=self._db)
|
||||
|
||||
def with_related(self):
|
||||
return self.get_queryset().with_related()
|
||||
|
||||
def with_rolling_stock(self):
|
||||
return self.get_queryset().with_rolling_stock()
|
||||
|
||||
|
||||
class BookQuerySet(PublicQuerySet):
|
||||
"""QuerySet with optimization methods for Book."""
|
||||
|
||||
def with_related(self):
|
||||
"""
|
||||
Optimize queryset by prefetching commonly accessed related objects.
|
||||
"""
|
||||
return self.select_related('publisher', 'shop').prefetch_related(
|
||||
'authors', 'tags', 'image', 'toc'
|
||||
)
|
||||
|
||||
def with_details(self):
|
||||
"""
|
||||
Optimize queryset for detail views with properties and documents.
|
||||
"""
|
||||
return self.with_related().prefetch_related('property', 'document')
|
||||
|
||||
|
||||
class BookManager(PublicManager):
|
||||
"""Optimized manager for Book/Catalog with prefetch methods."""
|
||||
|
||||
def get_queryset(self):
|
||||
return BookQuerySet(self.model, using=self._db)
|
||||
|
||||
def with_related(self):
|
||||
return self.get_queryset().with_related()
|
||||
|
||||
def with_details(self):
|
||||
return self.get_queryset().with_details()
|
||||
|
||||
|
||||
class CatalogQuerySet(PublicQuerySet):
|
||||
"""QuerySet with optimization methods for Catalog."""
|
||||
|
||||
def with_related(self):
|
||||
"""
|
||||
Optimize queryset by prefetching commonly accessed related objects.
|
||||
"""
|
||||
return self.select_related('manufacturer', 'shop').prefetch_related(
|
||||
'scales', 'tags', 'image'
|
||||
)
|
||||
|
||||
def with_details(self):
|
||||
"""
|
||||
Optimize queryset for detail views with properties and documents.
|
||||
"""
|
||||
return self.with_related().prefetch_related('property', 'document')
|
||||
|
||||
|
||||
class CatalogManager(PublicManager):
|
||||
"""Optimized manager for Catalog with prefetch methods."""
|
||||
|
||||
def get_queryset(self):
|
||||
return CatalogQuerySet(self.model, using=self._db)
|
||||
|
||||
def with_related(self):
|
||||
return self.get_queryset().with_related()
|
||||
|
||||
def with_details(self):
|
||||
return self.get_queryset().with_details()
|
||||
|
||||
|
||||
class MagazineIssueQuerySet(PublicQuerySet):
|
||||
"""QuerySet with optimization methods for MagazineIssue."""
|
||||
|
||||
def with_related(self):
|
||||
"""
|
||||
Optimize queryset by prefetching commonly accessed related objects.
|
||||
"""
|
||||
return self.select_related('magazine').prefetch_related(
|
||||
'tags', 'image', 'toc'
|
||||
)
|
||||
|
||||
def with_details(self):
|
||||
"""
|
||||
Optimize queryset for detail views with properties and documents.
|
||||
"""
|
||||
return self.with_related().prefetch_related('property', 'document')
|
||||
|
||||
|
||||
class MagazineIssueManager(PublicManager):
|
||||
"""Optimized manager for MagazineIssue with prefetch methods."""
|
||||
|
||||
def get_queryset(self):
|
||||
return MagazineIssueQuerySet(self.model, using=self._db)
|
||||
|
||||
def with_related(self):
|
||||
return self.get_queryset().with_related()
|
||||
|
||||
def with_details(self):
|
||||
return self.get_queryset().with_details()
|
||||
|
||||
Reference in New Issue
Block a user