Integrate hierarkey package (#460)

src/pretix/base/models/__init__.py

@@ -1,8 +1,9 @@
+from ..settings import GlobalSettingsObject_SettingsStore
 from .auth import U2FDevice, User
 from .base import CachedFile, LoggedModel, cachedfile_name
 from .checkin import Checkin
 from .event import (
-    Event, EventLock, EventPermission, EventSetting, RequiredAction,
+    Event, Event_SettingsStore, EventLock, EventPermission, RequiredAction,
     generate_invite_token,
 )
 from .invoices import Invoice, InvoiceLine, invoice_filename
@@ -17,6 +18,6 @@ from .orders import (
     cachedcombinedticket_name, cachedticket_name, generate_position_secret,
     generate_secret,
 )
-from .organizer import Organizer, OrganizerPermission, OrganizerSetting
+from .organizer import Organizer, Organizer_SettingsStore, OrganizerPermission
 from .vouchers import Voucher
 from .waitinglist import WaitingListEntry

src/pretix/base/models/event.py

@@ -11,22 +11,21 @@ from django.core.validators import RegexValidator
 from django.db import models
 from django.template.defaultfilters import date as _date
 from django.utils.crypto import get_random_string
-from django.utils.functional import cached_property
 from django.utils.timezone import make_aware, now
 from django.utils.translation import ugettext_lazy as _
 from i18nfield.fields import I18nCharField
 
 from pretix.base.email import CustomSMTPBackend
 from pretix.base.models.base import LoggedModel
-from pretix.base.settings import SettingsProxy
 from pretix.base.validators import EventSlugBlacklistValidator
 from pretix.helpers.daterange import daterange
 
+from ..settings import settings_hierarkey
 from .auth import User
 from .organizer import Organizer
-from .settings import EventSetting
 
 
+@settings_hierarkey.add(parent_field='organizer', cache_namespace='event')
 class Event(LoggedModel):
     """
     This model represents an event. An event is anything you can buy
@@ -183,17 +182,6 @@ class Event(LoggedModel):
 
         return ObjectRelatedCache(self)
 
-    @cached_property
-    def settings(self) -> SettingsProxy:
-        """
-        Returns an object representing this event's settings.
-        """
-        try:
-            return SettingsProxy(self, type=EventSetting, parent=self.organizer)
-        except Organizer.DoesNotExist:
-            # Should only happen when creating new events
-            return SettingsProxy(self, type=EventSetting)
-
     @property
     def presale_has_ended(self):
         if self.presale_end and now() > self.presale_end:
@@ -290,7 +278,7 @@ class Event(LoggedModel):
                 o.question = q
                 o.save()
 
-        for s in EventSetting.objects.filter(object=other):
+        for s in other.settings._objects.all():
             s.object = self
             s.pk = None
             if s.value.startswith('file://'):

src/pretix/base/models/organizer.py

@@ -3,17 +3,16 @@ import string
 from django.core.validators import RegexValidator
 from django.db import models
 from django.utils.crypto import get_random_string
-from django.utils.functional import cached_property
 from django.utils.translation import ugettext_lazy as _
 
 from pretix.base.models.base import LoggedModel
-from pretix.base.settings import SettingsProxy
 from pretix.base.validators import OrganizerSlugBlacklistValidator
 
+from ..settings import settings_hierarkey
 from .auth import User
-from .settings import OrganizerSetting
 
 
+@settings_hierarkey.add(cache_namespace='organizer')
 class Organizer(LoggedModel):
     """
     This model represents an entity organizing events, e.g. a company, institution,
@@ -59,14 +58,6 @@ class Organizer(LoggedModel):
         self.get_cache().clear()
         return obj
 
-    @cached_property
-    def settings(self) -> SettingsProxy:
-        """
-        Returns an object representing this organizer's settings
-        """
-        from pretix.base.settings import GlobalSettingsObject
-        return SettingsProxy(self, type=OrganizerSetting, parent=GlobalSettingsObject())
-
     def get_cache(self) -> "pretix.base.cache.ObjectRelatedCache":
         """
         Returns an :py:class:`ObjectRelatedCache` object. This behaves equivalent to

src/pretix/base/models/settings.py

@@ -1,34 +0,0 @@
-from django.db import models
-
-
-class GlobalSetting(models.Model):
-    """
-    A global setting is a key-value setting which can be set for a
-    pretix instance. It will be inherited by all events and organizers.
-    It is filled via the register_global_settings signal.
-    """
-    key = models.CharField(max_length=255, primary_key=True)
-    value = models.TextField()
-
-    def __init__(self, *args, object=None, **kwargs):
-        super().__init__(*args, **kwargs)
-
-
-class OrganizerSetting(models.Model):
-    """
-    An organizer setting is a key-value setting which can be set for an
-    organizer. It will be inherited by the events of this organizer
-    """
-    object = models.ForeignKey('Organizer', related_name='setting_objects', on_delete=models.CASCADE)
-    key = models.CharField(max_length=255)
-    value = models.TextField()
-
-
-class EventSetting(models.Model):
-    """
-    An event setting is a key-value setting which can be set for a
-    specific event
-    """
-    object = models.ForeignKey('Event', related_name='setting_objects', on_delete=models.CASCADE)
-    key = models.CharField(max_length=255)
-    value = models.TextField()