fix: conflicting migrations, add timestamps

City-of-Helsinki · Oct 13, 2023 · 07dcacb · 07dcacb
1 parent e7f9b8e
commit 07dcacb
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 3 deletions.
diff --git a/...plications/migrations/0041_ahjosetting.py → ...plications/migrations/0042_ahjosetting.py b/...plications/migrations/0041_ahjosetting.py → ...plications/migrations/0042_ahjosetting.py
@@ -1,21 +1,26 @@
-# Generated by Django 3.2.18 on 2023-09-29 09:16
+# Generated by Django 3.2.18 on 2023-10-13 12:38
 
 from django.db import migrations, models
 
 
 class Migration(migrations.Migration):
 
     dependencies = [
-        ('applications', '0040_pay_subsidy_types'),
+        ('applications', '0041_add_paper_application_date'),
     ]
 
     operations = [
         migrations.CreateModel(
             name='AhjoSetting',
             fields=[
                 ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('created_at', models.DateTimeField(auto_now_add=True, verbose_name='time created')),
+                ('modified_at', models.DateTimeField(auto_now=True, verbose_name='time modified')),
                 ('name', models.CharField(max_length=255, unique=True)),
                 ('data', models.JSONField()),
             ],
+            options={
+                'abstract': False,
+            },
         ),
     ]
diff --git a/backend/benefit/applications/models.py b/backend/benefit/applications/models.py
@@ -877,6 +877,6 @@ class ReviewState(models.Model):
     approval = models.BooleanField(default=False, verbose_name=_("approval"))
 
 
-class AhjoSetting(models.Model):
+class AhjoSetting(TimeStampedModel):
     name = models.CharField(max_length=255, unique=True)
     data = JSONField()