Skip to content

Commit dc20421

Browse files
johannaenglandhmpf
authored andcommitted
Rename PM owner to created_by
1 parent f897c15 commit dc20421

File tree

6 files changed

+35
-12
lines changed

6 files changed

+35
-12
lines changed

docs/reference/img/ER_model.png

1.46 KB
Loading

src/argus/plannedmaintenance/admin.py

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -24,24 +24,24 @@ def cancel_pms(modeladmin, request, queryset):
2424
class PlannedMaintenanceTaskAdmin(admin.ModelAdmin):
2525
# Planned maintenance list
2626
list_display = (
27-
"owner",
27+
"created_by",
2828
"created",
2929
"start_time",
3030
"end_time",
3131
"description",
3232
)
3333
search_fields = (
3434
"description",
35-
"owner__first_name",
36-
"owner__last_name",
37-
"owner__username",
35+
"created_by__first_name",
36+
"created_by__last_name",
37+
"created_by__username",
3838
"filters__name",
3939
"filters__user__first_name",
4040
"filters__user__last_name",
4141
"filters__user__username",
4242
)
4343
list_filter = [
44-
("owner", admin.RelatedOnlyFieldListFilter),
44+
("created_by", admin.RelatedOnlyFieldListFilter),
4545
list_filter_factory(
4646
"future",
4747
lambda qs, yes_filter: qs.future() if yes_filter else qs.filter(start_time__lte=timezone.now()),
@@ -58,8 +58,8 @@ class PlannedMaintenanceTaskAdmin(admin.ModelAdmin):
5858
),
5959
]
6060

61-
list_select_related = ("owner",)
62-
raw_id_fields = ("owner",)
61+
list_select_related = ("created_by",)
62+
raw_id_fields = ("created_by",)
6363
ordering = ("start_time",)
6464

6565
actions = [cancel_pms]
Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
from zoneinfo import ZoneInfo
2+
3+
import factory
4+
5+
from argus.auth.factories import PersonUserFactory
6+
from argus.plannedmaintenance import models
7+
from argus.util.datetime_utils import LOCAL_INFINITY
8+
9+
10+
__all__ = [
11+
"PlannedMaintenanceFactory",
12+
]
13+
14+
15+
class PlannedMaintenanceFactory(factory.django.DjangoModelFactory):
16+
class Meta:
17+
model = models.PlannedMaintenanceTask
18+
19+
created_by = factory.SubFactory(PersonUserFactory)
20+
start_time = factory.Faker("date_time_between", start_date="-2d", end_date="-1d", tzinfo=ZoneInfo("UTC"))
21+
end_time = LOCAL_INFINITY
22+
description = factory.Faker("sentence")

src/argus/plannedmaintenance/migrations/0001_initial.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Generated by Django 5.2.3 on 2025-11-25 11:46
1+
# Generated by Django 5.2.3 on 2025-11-27 08:52
22

33
import datetime
44
import django.db.models.deletion
@@ -55,7 +55,7 @@ class Migration(migrations.Migration):
5555
),
5656
),
5757
(
58-
"owner",
58+
"created_by",
5959
models.ForeignKey(
6060
on_delete=django.db.models.deletion.CASCADE,
6161
related_name="planned_maintenance_tasks",

src/argus/plannedmaintenance/models.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ class Meta:
4545
),
4646
]
4747

48-
owner = models.ForeignKey(to=User, on_delete=models.CASCADE, related_name="planned_maintenance_tasks")
48+
created_by = models.ForeignKey(to=User, on_delete=models.CASCADE, related_name="planned_maintenance_tasks")
4949
created = models.DateTimeField(default=timezone.now)
5050
start_time = models.DateTimeField(default=timezone.now)
5151
end_time = models.DateTimeField(default=LOCAL_INFINITY)
@@ -78,4 +78,4 @@ def cancel(self, end_time: Optional[datetime] = None):
7878
self.save()
7979

8080
def __str__(self):
81-
return f"Planned maintenance from {self.start_time} to {self.end_time if self.end_time != LOCAL_INFINITY else INFINITY_REPR} owned by {self.owner} - {self.description}"
81+
return f"Planned maintenance from {self.start_time} to {self.end_time if self.end_time != LOCAL_INFINITY else INFINITY_REPR} created by {self.created_by} - {self.description}"

tests/plannedmaintenance/test_models.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,6 +70,7 @@ def teardown(self):
7070

7171
def test_given_open_pm_task_modifiable_is_true(self):
7272
open_pm_task = PlannedMaintenanceTask(created_by=self.user)
73+
7374
self.assertTrue(open_pm_task.modifiable)
7475

7576
def test_given_recently_ended_pm_task_modifiable_is_true(self):
@@ -87,7 +88,7 @@ def test_given_long_ago_ended_pm_task_modifiable_is_false(self):
8788
start_time=timezone.now() - MODIFICATION_WINDOW_PM - timedelta(hours=2),
8889
end_time=timezone.now() - MODIFICATION_WINDOW_PM - timedelta(hours=1),
8990
)
90-
self.assertFalse(self.past_pm.modifiable)
91+
self.assertFalse(open_pm_task.modifiable)
9192

9293
def test_given_active_pm_current_is_true(self):
9394
pm = PlannedMaintenanceFactory(start_time=timezone.now() - timedelta(minutes=5))

0 commit comments

Comments
 (0)