darkhelm/notifications-admin
1
0
Fork 0
mirror of https://github.com/GSA/notifications-admin.git synced 2026-05-06 00:48:46 -04:00
Code Issues Packages Projects Releases Wiki Activity

Rename mixin to clarify purpose

Browse Source 
`SortableMixin` no longer has anything to do with sorting, except that
it inherits from the similarly-named `SortByNameMixin`.

This commit:
- renames it to describe its main purpose: doing equality (and identity)
  checks based on the `id` attribute
- makes it no longer inherit from `SortByNameMixin`, so that the two can
  be used independently or combined
This commit is contained in:
Chris Hill-Scott
2022-02-01 11:36:30 +00:00
parent 82b3a96a83
commit e918e2497b
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
app/broadcast_areas/models.py
View File

@@ -14,7 +14,7 @@ from .populations import CITY_OF_LONDON
from .repo import BroadcastAreasRepository, rtree_index from .repo import BroadcastAreasRepository, rtree_index
class SortableMixin(SortByNameMixin): class IdEqualityMixin:
def __repr__(self): def __repr__(self):
return f'{self.__class__.__name__}(<{self.id}>)' return f'{self.__class__.__name__}(<{self.id}>)'
@@ -75,7 +75,7 @@ class BaseBroadcastArea(ABC):
return max(500, min(estimated_bleed, 5000)) return max(500, min(estimated_bleed, 5000))
class BroadcastArea(BaseBroadcastArea, SortableMixin): class BroadcastArea(BaseBroadcastArea, IdEqualityMixin, SortByNameMixin):
def __init__(self, row): def __init__(self, row):
self.id, self.name, self._count_of_phones, self.library_id = row self.id, self.name, self._count_of_phones, self.library_id = row
@@ -220,7 +220,7 @@ class CustomBroadcastAreas(SerialisedModelCollection):
) )
class BroadcastAreaLibrary(SerialisedModelCollection, SortableMixin, GetItemByIdMixin): class BroadcastAreaLibrary(SerialisedModelCollection, SortByNameMixin, IdEqualityMixin, GetItemByIdMixin):
model = BroadcastArea model = BroadcastArea