Skip to content

remove actual_time and estimated_time fields #12712

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

Merged
Maffooch merged 2 commits into from
Jun 30, 2025
Merged

remove actual_time and estimated_time fields #12712

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3fc92bf
remove actual_time and estimated_time fields
valentijnscholten Jun 27, 2025
c02618b
cleanup fixture
valentijnscholten Jun 27, 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
2 changes: 0 additions & 2 deletions docker/sample_data/initial_dojo_data.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -590,14 +590,12 @@
},
{
"fields": {
"estimated_time": null,
"test_type": 9,
"engagement": 1,
"environment": 1,
"target_start": "2016-08-26T05:00:00Z",
"notes": [],
"percent_complete": 100,
"actual_time": null,
"target_end": "2016-08-26T05:00:00Z"
},
"model": "dojo.test",
Expand Down
21 changes: 21 additions & 0 deletions dojo/db_migrations/0232_remove_test_actual_time_remove_test_estimated_time.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
# Generated by Django 5.1.8 on 2025-06-27 20:26

from django.db import migrations


class Migration(migrations.Migration):

dependencies = [
('dojo', '0231_alter_finding_cvssv3_alter_finding_template_cvssv3'),
]

operations = [
migrations.RemoveField(
model_name='test',
name='actual_time',
),
migrations.RemoveField(
model_name='test',
name='estimated_time',
),
]
2 changes: 1 addition & 1 deletion dojo/filters.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2982,7 +2982,7 @@ class Meta:
model = Test
fields = ["id", "title", "test_type", "target_start",
"target_end", "notes", "percent_complete",
"actual_time", "engagement", "version",
"engagement", "version",
"branch_tag", "build_id", "commit_hash",
"api_scan_configuration", "scan_type"]

Expand Down
36 changes: 0 additions & 36 deletions dojo/fixtures/defect_dojo_sample_data.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3643,8 +3643,6 @@
"description": null,
"target_start": "2021-02-18T00:00:00Z",
"target_end": "2021-02-27T00:00:00Z",
"estimated_time": "00:00:00",
"actual_time": "00:00:00",
"percent_complete": 100,
"environment": 1,
"updated": null,
Expand Down Expand Up @@ -3674,8 +3672,6 @@
"description": null,
"target_start": "2021-03-21T01:00:00Z",
"target_end": "2021-03-22T01:00:00Z",
"estimated_time": null,
"actual_time": null,
"percent_complete": 100,
"environment": 1,
"updated": null,
Expand Down Expand Up @@ -3703,8 +3699,6 @@
"description": null,
"target_start": "2021-02-18T00:00:00Z",
"target_end": "2021-02-27T00:00:00Z",
"estimated_time": "02:00:00",
"actual_time": "00:30:00",
"percent_complete": 100,
"environment": 1,
"updated": null,
Expand Down Expand Up @@ -3734,8 +3728,6 @@
"description": null,
"target_start": "2021-11-03T00:00:00Z",
"target_end": "2021-11-03T00:00:00Z",
"estimated_time": null,
"actual_time": null,
"percent_complete": 100,
"environment": 7,
"updated": "2021-11-04T09:01:30.563Z",
Expand Down Expand Up @@ -3765,8 +3757,6 @@
"description": null,
"target_start": "2021-11-03T00:00:00Z",
"target_end": "2021-11-03T00:00:00Z",
"estimated_time": null,
"actual_time": null,
"percent_complete": 100,
"environment": 7,
"updated": "2021-11-04T09:03:25.139Z",
Expand Down Expand Up @@ -3796,8 +3786,6 @@
"description": null,
"target_start": "2022-01-19T00:00:00Z",
"target_end": "2022-01-24T00:00:00Z",
"estimated_time": null,
"actual_time": null,
"percent_complete": null,
"environment": 3,
"updated": "2021-11-04T09:26:34.003Z",
Expand Down Expand Up @@ -3825,8 +3813,6 @@
"description": null,
"target_start": "2021-11-04T09:36:15.180Z",
"target_end": "2021-11-04T09:36:15.180Z",
"estimated_time": null,
"actual_time": null,
"percent_complete": null,
"environment": null,
"updated": "2021-11-04T09:36:15.180Z",
Expand Down Expand Up @@ -3856,8 +3842,6 @@
"description": null,
"target_start": "2021-12-20T00:00:00Z",
"target_end": "2021-12-27T00:00:00Z",
"estimated_time": null,
"actual_time": null,
"percent_complete": null,
"environment": 3,
"updated": "2021-11-04T09:43:09.101Z",
Expand Down Expand Up @@ -3887,8 +3871,6 @@
"description": null,
"target_start": "2021-12-20T00:00:00Z",
"target_end": "2021-12-27T00:00:00Z",
"estimated_time": null,
"actual_time": null,
"percent_complete": null,
"environment": 2,
"updated": "2021-11-04T09:43:23.410Z",
Expand Down Expand Up @@ -3918,8 +3900,6 @@
"description": null,
"target_start": "2021-12-20T00:00:00Z",
"target_end": "2021-12-27T00:00:00Z",
"estimated_time": null,
"actual_time": null,
"percent_complete": null,
"environment": 3,
"updated": "2021-11-04T09:43:41.711Z",
Expand Down Expand Up @@ -3949,8 +3929,6 @@
"description": null,
"target_start": "2021-12-20T00:00:00Z",
"target_end": "2021-12-27T00:00:00Z",
"estimated_time": null,
"actual_time": null,
"percent_complete": null,
"environment": 3,
"updated": "2021-11-04T09:44:01.815Z",
Expand Down Expand Up @@ -3980,8 +3958,6 @@
"description": null,
"target_start": "2021-11-04T00:00:00Z",
"target_end": "2021-11-04T00:00:00Z",
"estimated_time": null,
"actual_time": null,
"percent_complete": 100,
"environment": 7,
"updated": "2021-11-05T06:44:35.814Z",
Expand Down Expand Up @@ -4011,8 +3987,6 @@
"description": null,
"target_start": "2021-11-04T00:00:00Z",
"target_end": "2021-11-04T00:00:00Z",
"estimated_time": null,
"actual_time": null,
"percent_complete": 100,
"environment": 7,
"updated": "2021-11-05T06:46:06.450Z",
Expand Down Expand Up @@ -4042,8 +4016,6 @@
"description": null,
"target_start": "2021-11-04T00:00:00Z",
"target_end": "2021-11-04T00:00:00Z",
"estimated_time": null,
"actual_time": null,
"percent_complete": 100,
"environment": 7,
"updated": "2021-11-05T06:47:17.517Z",
Expand Down Expand Up @@ -4073,8 +4045,6 @@
"description": null,
"target_start": "2021-11-04T00:00:00Z",
"target_end": "2021-11-11T00:00:00Z",
"estimated_time": null,
"actual_time": null,
"percent_complete": null,
"environment": 3,
"updated": "2021-11-05T06:54:23.989Z",
Expand Down Expand Up @@ -4104,8 +4074,6 @@
"description": null,
"target_start": "2021-11-04T00:00:00Z",
"target_end": "2021-11-11T00:00:00Z",
"estimated_time": null,
"actual_time": null,
"percent_complete": null,
"environment": 5,
"updated": "2021-11-05T06:54:35.499Z",
Expand Down Expand Up @@ -4135,8 +4103,6 @@
"description": null,
"target_start": "2021-11-04T00:00:00Z",
"target_end": "2021-11-04T00:00:00Z",
"estimated_time": null,
"actual_time": null,
"percent_complete": 100,
"environment": 7,
"updated": "2021-11-05T07:07:18.034Z",
Expand Down Expand Up @@ -4166,8 +4132,6 @@
"description": null,
"target_start": "2021-11-04T00:00:00Z",
"target_end": "2021-11-04T00:00:00Z",
"estimated_time": null,
"actual_time": null,
"percent_complete": 100,
"environment": 7,
"updated": "2021-11-05T10:43:05.485Z",
Expand Down
20 changes: 0 additions & 20 deletions dojo/fixtures/dojo_testdata.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -977,15 +977,13 @@
"model": "dojo.test",
"fields": {
"lead": null,
"estimated_time": "00:00:00",
"test_type": 1,
"scan_type": "ZAP Scan",
"engagement": 1,
"environment": 1,
"target_start": "2017-12-01T00:00:00Z",
"notes": [],
"percent_complete": 100,
"actual_time": "00:00:00",
"target_end": "2017-12-10T00:00:00Z"
}
},
Expand All @@ -994,7 +992,6 @@
"model": "dojo.test",
"fields": {
"lead": null,
"estimated_time": "00:00:00",
"test_type": 1,
"scan_type": "ZAP Scan",
"title": "My ZAP Scan",
Expand All @@ -1003,7 +1000,6 @@
"target_start": "2017-12-01T00:00:00Z",
"notes": [],
"percent_complete": 100,
"actual_time": "00:00:00",
"target_end": "2017-12-10T00:00:00Z"
}
},
Expand All @@ -1012,14 +1008,12 @@
"model": "dojo.test",
"fields": {
"lead": null,
"estimated_time": "00:00:00",
"test_type": 120,
"engagement": 3,
"environment": 1,
"target_start": "2017-12-01T00:00:00Z",
"notes": [],
"percent_complete": 100,
"actual_time": "00:00:00",
"target_end": "2017-12-10T00:00:00Z"
}
},
Expand All @@ -1028,15 +1022,13 @@
"model": "dojo.test",
"fields": {
"lead": null,
"estimated_time": "00:00:00",
"test_type": 999,
"scan_type": "Checkmarx Scan detailed",
"engagement": 5,
"environment": 1,
"target_start": "2017-12-01T00:00:00Z",
"notes": [],
"percent_complete": 100,
"actual_time": "00:00:00",
"target_end": "2017-12-10T00:00:00Z"
}
},
Expand All @@ -1045,15 +1037,13 @@
"model": "dojo.test",
"fields": {
"lead": null,
"estimated_time": "00:00:00",
"test_type": 999,
"scan_type": "Checkmarx Scan detailed",
"engagement": 5,
"environment": 1,
"target_start": "2017-12-01T00:00:00Z",
"notes": [],
"percent_complete": 100,
"actual_time": "00:00:00",
"target_end": "2017-12-10T00:00:00Z"
}
},
Expand All @@ -1062,15 +1052,13 @@
"model": "dojo.test",
"fields": {
"lead": null,
"estimated_time": "00:00:00",
"test_type": 555,
"scan_type": "Veracode Scan",
"engagement": 5,
"environment": 1,
"target_start": "2017-12-01T00:00:00Z",
"notes": [],
"percent_complete": 100,
"actual_time": "00:00:00",
"target_end": "2017-12-10T00:00:00Z"
}
},
Expand All @@ -1079,14 +1067,12 @@
"model": "dojo.test",
"fields": {
"lead": null,
"estimated_time": "00:00:00",
"test_type": 555,
"engagement": 5,
"environment": 1,
"target_start": "2017-12-01T00:00:00Z",
"notes": [],
"percent_complete": 100,
"actual_time": "00:00:00",
"target_end": "2017-12-10T00:00:00Z"
}
},
Expand All @@ -1095,14 +1081,12 @@
"model": "dojo.test",
"fields": {
"lead": 2,
"estimated_time": null,
"test_type": 1,
"engagement": 2,
"environment": 1,
"target_start": "2018-01-01T01:00:00Z",
"notes": [],
"percent_complete": 100,
"actual_time": null,
"target_end": "2018-01-02T01:00:00Z"
}
},
Expand All @@ -1111,7 +1095,6 @@
"model": "dojo.test",
"fields": {
"lead": null,
"estimated_time": "02:00:00",
"test_type": 1,
"engagement": 1,
"environment": 1,
Expand All @@ -1120,7 +1103,6 @@
1
],
"percent_complete": 100,
"actual_time": "00:30:00",
"target_end": "2017-12-10T00:00:00Z"
}
},
Expand All @@ -1129,7 +1111,6 @@
"model": "dojo.test",
"fields": {
"lead": null,
"estimated_time": "00:00:00",
"test_type": 1,
"scan_type": "ZAP Scan",
"title": "Endpoint mitigation tests",
Expand All @@ -1138,7 +1119,6 @@
"target_start": "2017-12-01T00:00:00Z",
"notes": [],
"percent_complete": 100,
"actual_time": "00:00:00",
"target_end": "2017-12-10T00:00:00Z"
}
},
Expand Down
4 changes: 1 addition & 3 deletions dojo/fixtures/unit_limit_reqresp.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,21 +102,19 @@
"api_test": true,
"deduplication_on_engagement": true
}
},
},
{
"pk": 5,
"model": "dojo.test",
"fields": {
"lead": null,
"estimated_time": "00:00:00",
"test_type": 1,
"scan_type": "ZAP Scan",
"engagement": 5,
"environment": 1,
"target_start": "2017-12-01T00:00:00Z",
"notes": [],
"percent_complete": 100,
"actual_time": "00:00:00",
"target_end": "2017-12-10T00:00:00Z"
}
},{
Expand Down
2 changes: 0 additions & 2 deletions dojo/models.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2080,8 +2080,6 @@ class Test(models.Model):
description = models.TextField(null=True, blank=True)
target_start = models.DateTimeField()
target_end = models.DateTimeField()
estimated_time = models.TimeField(null=True, blank=True, editable=False)
actual_time = models.TimeField(null=True, blank=True, editable=False)
percent_complete = models.IntegerField(null=True, blank=True,
editable=True)
notes = models.ManyToManyField(Notes, blank=True,
Expand Down
Loading