From fba8d09875cc7b88b1097c0fb4a264c09c111f9f Mon Sep 17 00:00:00 2001 From: Ben Thorner Date: Thu, 10 Jun 2021 15:05:38 +0100 Subject: [PATCH] Move broadcast model code into an explicit module Previously this was hidden away in an anonymous __init__.py file. I did think about splitting the models into individual files, like we do with the top-level models for the app. Since the models are only imported in one place - i.e. are all used together - it didn't seem worth the hassle, so I've kept them in one file. --- app/broadcast_areas/{__init__.py => models.py} | 0 app/models/broadcast_message.py | 5 ++++- tests/app/broadcast_areas/test_broadcast_area.py | 2 +- 3 files changed, 5 insertions(+), 2 deletions(-) rename app/broadcast_areas/{__init__.py => models.py} (100%) diff --git a/app/broadcast_areas/__init__.py b/app/broadcast_areas/models.py similarity index 100% rename from app/broadcast_areas/__init__.py rename to app/broadcast_areas/models.py diff --git a/app/models/broadcast_message.py b/app/models/broadcast_message.py index a4285a916..4c8040088 100644 --- a/app/models/broadcast_message.py +++ b/app/models/broadcast_message.py @@ -6,7 +6,10 @@ from notifications_utils.template import BroadcastPreviewTemplate from orderedset import OrderedSet from werkzeug.utils import cached_property -from app.broadcast_areas import CustomBroadcastAreas, broadcast_area_libraries +from app.broadcast_areas.models import ( + CustomBroadcastAreas, + broadcast_area_libraries, +) from app.formatters import round_to_significant_figures from app.models import JSONModel, ModelList from app.models.user import User diff --git a/tests/app/broadcast_areas/test_broadcast_area.py b/tests/app/broadcast_areas/test_broadcast_area.py index 5ec865c76..448b76f00 100644 --- a/tests/app/broadcast_areas/test_broadcast_area.py +++ b/tests/app/broadcast_areas/test_broadcast_area.py @@ -3,7 +3,7 @@ from math import isclose import pytest from custom_polygons import BRISTOL, SKYE -from app.broadcast_areas import ( +from app.broadcast_areas.models import ( BroadcastAreasRepository, CustomBroadcastArea, broadcast_area_libraries,