Migrate common models to the new app

City-of-Helsinki · Oct 2, 2024 · 62f916a · 62f916a
1 parent 22b9c61
commit 62f916a
Show file tree

Hide file tree

Showing 289 changed files with 1,921 additions and 1,629 deletions.
diff --git a/applications/migrations/0004_fixed_organisation_year_field.py b/applications/migrations/0004_fixed_organisation_year_field.py
@@ -8,7 +8,7 @@
 
 
 def year_not_in_future(year: int | None) -> None:
-    from common.date_utils import DEFAULT_TIMEZONE
+    from utils.date_utils import DEFAULT_TIMEZONE
 
     if year is None:
         return

diff --git a/applications/migrations/0066_remove_applicationaggregatedata_application_and_more.py b/applications/migrations/0066_remove_applicationaggregatedata_application_and_more.py
@@ -11,11 +11,11 @@
 from django.utils.text import format_lazy
 from django.utils.translation import gettext_lazy as _
 
-import common.fields.model
+import utils.fields.model
 
 
 def year_not_in_future(year: int | None) -> None:
-    from common.date_utils import DEFAULT_TIMEZONE
+    from utils.date_utils import DEFAULT_TIMEZONE
 
     if year is None:
         return
@@ -162,7 +162,7 @@ class Migration(migrations.Migration):
         migrations.AddField(
             model_name="applicationeventschedule",
             name="allocated_day",
-            field=common.fields.model.IntChoiceField(
+            field=utils.fields.model.IntChoiceField(
                 blank=True,
                 enum=WeekdayChoice,
                 default=None,
@@ -369,7 +369,7 @@ class Migration(migrations.Migration):
         migrations.AlterField(
             model_name="application",
             name="applicant_type",
-            field=common.fields.model.StrChoiceField(enum=ApplicantTypeChoice, db_index=True, max_length=11, null=True),
+            field=utils.fields.model.StrChoiceField(enum=ApplicantTypeChoice, db_index=True, max_length=11, null=True),
         ),
         migrations.AlterField(
             model_name="application",
@@ -550,7 +550,7 @@ class Migration(migrations.Migration):
         migrations.AlterField(
             model_name="applicationeventschedule",
             name="day",
-            field=common.fields.model.IntChoiceField(
+            field=utils.fields.model.IntChoiceField(
                 enum=WeekdayChoice,
                 validators=[
                     django.core.validators.MinValueValidator(limit_value=0, message="Value must be between 0 and 6."),
@@ -566,7 +566,7 @@ class Migration(migrations.Migration):
         migrations.AlterField(
             model_name="applicationeventschedule",
             name="priority",
-            field=common.fields.model.IntChoiceField(
+            field=utils.fields.model.IntChoiceField(
                 blank=True,
                 enum=ReservationPriorityChoice,
                 default=300,
@@ -773,7 +773,7 @@ class Migration(migrations.Migration):
         migrations.AlterField(
             model_name="organisation",
             name="organisation_type",
-            field=common.fields.model.StrChoiceField(enum=OrganizationTypeChoice, default="COMPANY", max_length=24),
+            field=utils.fields.model.StrChoiceField(enum=OrganizationTypeChoice, default="COMPANY", max_length=24),
         ),
         migrations.AlterField(
             model_name="organisation",

diff --git a/applications/migrations/0069_applicationroundtimeslot_and_more.py b/applications/migrations/0069_applicationroundtimeslot_and_more.py
@@ -5,8 +5,8 @@
 from django.contrib.postgres.operations import HStoreExtension
 from django.db import migrations, models
 
-import common.fields.model
 import tilavarauspalvelu.utils.validators
+import utils.fields.model
 
 
 class WeekdayChoice(models.IntegerChoices):
@@ -33,7 +33,7 @@ class Migration(migrations.Migration):
                 ("id", models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name="ID")),
                 (
                     "weekday",
-                    common.fields.model.IntChoiceField(
+                    utils.fields.model.IntChoiceField(
                         enum=WeekdayChoice,
                         validators=[
                             django.core.validators.MinValueValidator(

diff --git a/applications/migrations/0080_applicationsection_suitabletimerange_and_more.py b/applications/migrations/0080_applicationsection_suitabletimerange_and_more.py
@@ -6,7 +6,7 @@
 import django.db.models.deletion
 from django.db import migrations, models
 
-import common.fields.model
+import utils.fields.model
 
 
 class Weekday(models.TextChoices):
@@ -83,15 +83,15 @@ class Migration(migrations.Migration):
                 ("id", models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name="ID")),
                 (
                     "priority",
-                    common.fields.model.StrChoiceField(
+                    utils.fields.model.StrChoiceField(
                         choices=[("PRIMARY", "Primary"), ("SECONDARY", "Secondary")],
                         enum=Priority,
                         max_length=9,
                     ),
                 ),
                 (
                     "day_of_the_week",
-                    common.fields.model.StrChoiceField(
+                    utils.fields.model.StrChoiceField(
                         choices=[
                             ("MONDAY", "Monday"),
                             ("TUESDAY", "Tuesday"),
@@ -160,7 +160,7 @@ class Migration(migrations.Migration):
                 ("id", models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name="ID")),
                 (
                     "day_of_the_week",
-                    common.fields.model.StrChoiceField(
+                    utils.fields.model.StrChoiceField(
                         choices=[
                             ("MONDAY", "Monday"),
                             ("TUESDAY", "Tuesday"),

diff --git a/applications/migrations/0089_migrate_old_application_data.py b/applications/migrations/0089_migrate_old_application_data.py
@@ -5,7 +5,7 @@
 
 from django.db import migrations
 
-from common.date_utils import time_as_timedelta
+from utils.date_utils import time_as_timedelta
 
 logger = logging.getLogger(__name__)
 

diff --git a/common/admin/__init__.py b/common/admin/__init__.py
diff --git a/common/admin/banner_notification.py b/common/admin/banner_notification.py
diff --git a/common/admin/request_log.py b/common/admin/request_log.py