Skip to content

Fix fields incorrectly marked as autocreated in squashed migration #1506

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 3 commits into from
Closed

Fix fields incorrectly marked as autocreated in squashed migration #1506

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
925eeb7
Fix fields incorrectly marked as autocreated
jladd-geant Jun 23, 2025
85fc764
Add changelog
jladd-geant Jun 23, 2025
a73ce49
fixup! Fix fields incorrectly marked as autocreated
jladd-geant Jun 24, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions changelog.d/1506.changed.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Fix fields incorrectly marked as autocreated in squashed migration
8 changes: 4 additions & 4 deletions src/argus/incident/migrations/0001_squashed_incident_20250514.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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')])),
Expand All @@ -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')),
Expand Down Expand Up @@ -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()),
],
Expand All @@ -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')),
Expand Down
8 changes: 4 additions & 4 deletions src/argus/incident/models.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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()

Expand Down Expand Up @@ -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")
Expand Down Expand Up @@ -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()
Expand Down Expand Up @@ -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,
Expand Down
Loading