diff --git a/changelog.d/1506.changed.md b/changelog.d/1506.changed.md new file mode 100644 index 000000000..57c6d8275 --- /dev/null +++ b/changelog.d/1506.changed.md @@ -0,0 +1 @@ +Fix fields incorrectly marked as autocreated in squashed migration diff --git a/src/argus/incident/migrations/0001_squashed_incident_20250514.py b/src/argus/incident/migrations/0001_squashed_incident_20250514.py index 2e3d8267a..2b72e5b36 100644 --- a/src/argus/incident/migrations/0001_squashed_incident_20250514.py +++ b/src/argus/incident/migrations/0001_squashed_incident_20250514.py @@ -21,7 +21,7 @@ class Migration(migrations.Migration): migrations.CreateModel( name='Event', fields=[ - ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), + ('id', models.BigAutoField(primary_key=True, serialize=False, verbose_name='ID')), ('timestamp', models.DateTimeField()), ('received', models.DateTimeField(default=django.utils.timezone.now)), ('type', models.TextField(choices=[('STA', 'Incident start'), ('END', 'Incident end'), ('CHI', 'Incident change'), ('CLO', 'Close'), ('REO', 'Reopen'), ('ACK', 'Acknowledge'), ('OTH', 'Other'), ('LES', 'Stateless')])), @@ -35,7 +35,7 @@ class Migration(migrations.Migration): migrations.CreateModel( name='Incident', fields=[ - ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), + ('id', models.BigAutoField(primary_key=True, serialize=False, verbose_name='ID')), ('start_time', models.DateTimeField(help_text='The time the incident was created.')), ('end_time', argus.incident.fields.DateTimeInfinityField(blank=True, help_text="The time the incident was resolved or closed. If not set, the incident is stateless; if 'infinity' is checked, the incident is stateful, but has not yet been resolved or closed - i.e. open.", null=True)), ('source_incident_id', models.TextField(blank=True, default='', verbose_name='source incident ID')), @@ -79,7 +79,7 @@ class Migration(migrations.Migration): migrations.CreateModel( name='Tag', fields=[ - ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), + ('id', models.BigAutoField(primary_key=True, serialize=False, verbose_name='ID')), ('key', models.TextField(validators=[argus.incident.validators.validate_key])), ('value', models.TextField()), ], @@ -100,7 +100,7 @@ class Migration(migrations.Migration): migrations.CreateModel( name='IncidentTagRelation', fields=[ - ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), + ('id', models.BigAutoField(primary_key=True, serialize=False, verbose_name='ID')), ('added_time', models.DateTimeField(auto_now_add=True)), ('added_by', models.ForeignKey(on_delete=django.db.models.deletion.PROTECT, related_name='tags_added', to=settings.AUTH_USER_MODEL)), ('incident', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='incident_tag_relations', to='argus_incident.incident')), diff --git a/src/argus/incident/models.py b/src/argus/incident/models.py index 41007f272..228166d0e 100644 --- a/src/argus/incident/models.py +++ b/src/argus/incident/models.py @@ -189,7 +189,7 @@ def create_from_tag(self, tag): class Tag(models.Model): TAG_DELIMITER = "=" - id = models.BigAutoField(primary_key=True) + id = models.BigAutoField(primary_key=True, verbose_name="ID") key = models.TextField(validators=[validate_key]) value = models.TextField() @@ -227,7 +227,7 @@ def split(cls, tag: str): class IncidentTagRelation(models.Model): - id = models.BigAutoField(primary_key=True) + id = models.BigAutoField(primary_key=True, verbose_name="ID") tag = models.ForeignKey(to=Tag, on_delete=models.CASCADE, related_name="incident_tag_relations") incident = models.ForeignKey(to="Incident", on_delete=models.CASCADE, related_name="incident_tag_relations") added_by = models.ForeignKey(to=User, on_delete=models.PROTECT, related_name="tags_added") @@ -262,7 +262,7 @@ class Type(models.TextChoices): } ALLOWED_TYPES_FOR_END_USERS = {Type.CLOSE, Type.REOPEN, Type.ACKNOWLEDGE, Type.OTHER} - id = models.BigAutoField(primary_key=True) + id = models.BigAutoField(primary_key=True, verbose_name="ID") incident = models.ForeignKey(to="Incident", on_delete=models.PROTECT, related_name="events") actor = models.ForeignKey(to=User, on_delete=models.PROTECT, related_name="caused_events") timestamp = models.DateTimeField() @@ -414,7 +414,7 @@ def update_ticket_url(self, actor: User, url: str, timestamp=None): class Incident(models.Model): LEVEL_CHOICES = tuple(zip(Level.values, map(str, Level.values))) - id = models.BigAutoField(primary_key=True) + id = models.BigAutoField(primary_key=True, verbose_name="ID") start_time = models.DateTimeField(help_text="The time the incident was created.") end_time = DateTimeInfinityField( null=True,