From 3fc92bf70bbd659ffc8e0ca6f204cafe633e2518 Mon Sep 17 00:00:00 2001 From: Valentijn Scholten Date: Fri, 27 Jun 2025 22:26:50 +0200 Subject: [PATCH 1/2] remove actual_time and estimated_time fields --- docker/sample_data/initial_dojo_data.json | 2 -- ..._actual_time_remove_test_estimated_time.py | 21 +++++++++++ dojo/filters.py | 2 +- dojo/fixtures/defect_dojo_sample_data.json | 36 ------------------- dojo/fixtures/dojo_testdata.json | 18 ---------- dojo/fixtures/unit_limit_reqresp.json | 4 +-- dojo/models.py | 2 -- unittests/test_rest_framework.py | 2 -- 8 files changed, 23 insertions(+), 64 deletions(-) create mode 100644 dojo/db_migrations/0232_remove_test_actual_time_remove_test_estimated_time.py diff --git a/docker/sample_data/initial_dojo_data.json b/docker/sample_data/initial_dojo_data.json index 56f3a16e869..ce77fa07a31 100644 --- a/docker/sample_data/initial_dojo_data.json +++ b/docker/sample_data/initial_dojo_data.json @@ -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", diff --git a/dojo/db_migrations/0232_remove_test_actual_time_remove_test_estimated_time.py b/dojo/db_migrations/0232_remove_test_actual_time_remove_test_estimated_time.py new file mode 100644 index 00000000000..566f8f54c48 --- /dev/null +++ b/dojo/db_migrations/0232_remove_test_actual_time_remove_test_estimated_time.py @@ -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', + ), + ] diff --git a/dojo/filters.py b/dojo/filters.py index 6dae17e10fc..ba49cd1f645 100644 --- a/dojo/filters.py +++ b/dojo/filters.py @@ -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"] diff --git a/dojo/fixtures/defect_dojo_sample_data.json b/dojo/fixtures/defect_dojo_sample_data.json index 85c7311bf4a..676cd272850 100644 --- a/dojo/fixtures/defect_dojo_sample_data.json +++ b/dojo/fixtures/defect_dojo_sample_data.json @@ -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, @@ -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, @@ -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, @@ -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", @@ -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", @@ -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", @@ -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", @@ -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", @@ -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", @@ -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", @@ -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", @@ -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", @@ -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", @@ -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", @@ -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", @@ -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", @@ -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", @@ -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", diff --git a/dojo/fixtures/dojo_testdata.json b/dojo/fixtures/dojo_testdata.json index b35d570eaab..e3e63025a38 100644 --- a/dojo/fixtures/dojo_testdata.json +++ b/dojo/fixtures/dojo_testdata.json @@ -977,7 +977,6 @@ "model": "dojo.test", "fields": { "lead": null, - "estimated_time": "00:00:00", "test_type": 1, "scan_type": "ZAP Scan", "engagement": 1, @@ -985,7 +984,6 @@ "target_start": "2017-12-01T00:00:00Z", "notes": [], "percent_complete": 100, - "actual_time": "00:00:00", "target_end": "2017-12-10T00:00:00Z" } }, @@ -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", @@ -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" } }, @@ -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" } }, @@ -1028,7 +1022,6 @@ "model": "dojo.test", "fields": { "lead": null, - "estimated_time": "00:00:00", "test_type": 999, "scan_type": "Checkmarx Scan detailed", "engagement": 5, @@ -1036,7 +1029,6 @@ "target_start": "2017-12-01T00:00:00Z", "notes": [], "percent_complete": 100, - "actual_time": "00:00:00", "target_end": "2017-12-10T00:00:00Z" } }, @@ -1045,7 +1037,6 @@ "model": "dojo.test", "fields": { "lead": null, - "estimated_time": "00:00:00", "test_type": 999, "scan_type": "Checkmarx Scan detailed", "engagement": 5, @@ -1053,7 +1044,6 @@ "target_start": "2017-12-01T00:00:00Z", "notes": [], "percent_complete": 100, - "actual_time": "00:00:00", "target_end": "2017-12-10T00:00:00Z" } }, @@ -1062,7 +1052,6 @@ "model": "dojo.test", "fields": { "lead": null, - "estimated_time": "00:00:00", "test_type": 555, "scan_type": "Veracode Scan", "engagement": 5, @@ -1070,7 +1059,6 @@ "target_start": "2017-12-01T00:00:00Z", "notes": [], "percent_complete": 100, - "actual_time": "00:00:00", "target_end": "2017-12-10T00:00:00Z" } }, @@ -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" } }, @@ -1095,7 +1081,6 @@ "model": "dojo.test", "fields": { "lead": 2, - "estimated_time": null, "test_type": 1, "engagement": 2, "environment": 1, @@ -1111,7 +1096,6 @@ "model": "dojo.test", "fields": { "lead": null, - "estimated_time": "02:00:00", "test_type": 1, "engagement": 1, "environment": 1, @@ -1129,7 +1113,6 @@ "model": "dojo.test", "fields": { "lead": null, - "estimated_time": "00:00:00", "test_type": 1, "scan_type": "ZAP Scan", "title": "Endpoint mitigation tests", @@ -1138,7 +1121,6 @@ "target_start": "2017-12-01T00:00:00Z", "notes": [], "percent_complete": 100, - "actual_time": "00:00:00", "target_end": "2017-12-10T00:00:00Z" } }, diff --git a/dojo/fixtures/unit_limit_reqresp.json b/dojo/fixtures/unit_limit_reqresp.json index 360156f533b..85fbd23e2b2 100644 --- a/dojo/fixtures/unit_limit_reqresp.json +++ b/dojo/fixtures/unit_limit_reqresp.json @@ -102,13 +102,12 @@ "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, @@ -116,7 +115,6 @@ "target_start": "2017-12-01T00:00:00Z", "notes": [], "percent_complete": 100, - "actual_time": "00:00:00", "target_end": "2017-12-10T00:00:00Z" } },{ diff --git a/dojo/models.py b/dojo/models.py index da5690c0be6..d2e2839e34f 100644 --- a/dojo/models.py +++ b/dojo/models.py @@ -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, diff --git a/unittests/test_rest_framework.py b/unittests/test_rest_framework.py index 3cf133f0fe6..e709e4e7c0d 100644 --- a/unittests/test_rest_framework.py +++ b/unittests/test_rest_framework.py @@ -1662,8 +1662,6 @@ def __init__(self, *args, **kwargs): "test_type": 1, "environment": 1, "engagement": 2, - "estimated_time": "0:30:20", - "actual_time": "0:20:30", "notes": [], "target_start": "2017-01-12T00:00", "target_end": "2017-01-12T00:00", From c02618baafce0f0510912f1e38c05b9f19148df3 Mon Sep 17 00:00:00 2001 From: Valentijn Scholten Date: Fri, 27 Jun 2025 23:17:13 +0200 Subject: [PATCH 2/2] cleanup fixture --- dojo/fixtures/dojo_testdata.json | 2 -- 1 file changed, 2 deletions(-) diff --git a/dojo/fixtures/dojo_testdata.json b/dojo/fixtures/dojo_testdata.json index e3e63025a38..04a06452f4b 100644 --- a/dojo/fixtures/dojo_testdata.json +++ b/dojo/fixtures/dojo_testdata.json @@ -1087,7 +1087,6 @@ "target_start": "2018-01-01T01:00:00Z", "notes": [], "percent_complete": 100, - "actual_time": null, "target_end": "2018-01-02T01:00:00Z" } }, @@ -1104,7 +1103,6 @@ 1 ], "percent_complete": 100, - "actual_time": "00:30:00", "target_end": "2017-12-10T00:00:00Z" } },