Skip to content

Commit 84108f6

Browse files
valentijnscholtenvalentijnscholten
authored
remove actual_time and estimated_time fields (#12712)
* remove actual_time and estimated_time fields * cleanup fixture
1 parent 689afc9 commit 84108f6

8 files changed

Lines changed: 23 additions & 66 deletions

File tree

‎docker/sample_data/initial_dojo_data.json‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -590,14 +590,12 @@
590590
},
591591
{
592592
"fields": {
593-
"estimated_time": null,
594593
"test_type": 9,
595594
"engagement": 1,
596595
"environment": 1,
597596
"target_start": "2016-08-26T05:00:00Z",
598597
"notes": [],
599598
"percent_complete": 100,
600-
"actual_time": null,
601599
"target_end": "2016-08-26T05:00:00Z"
602600
},
603601
"model": "dojo.test",

‎dojo/db_migrations/0232_remove_test_actual_time_remove_test_estimated_time.py‎

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
# Generated by Django 5.1.8 on 2025-06-27 20:26
2+
3+
from django.db import migrations
4+
5+
6+
class Migration(migrations.Migration):
7+
8+
dependencies = [
9+
('dojo', '0231_alter_finding_cvssv3_alter_finding_template_cvssv3'),
10+
]
11+
12+
operations = [
13+
migrations.RemoveField(
14+
model_name='test',
15+
name='actual_time',
16+
),
17+
migrations.RemoveField(
18+
model_name='test',
19+
name='estimated_time',
20+
),
21+
]

‎dojo/filters.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2982,7 +2982,7 @@ class Meta:
29822982
model = Test
29832983
fields = ["id", "title", "test_type", "target_start",
29842984
"target_end", "notes", "percent_complete",
2985-
"actual_time", "engagement", "version",
2985+
"engagement", "version",
29862986
"branch_tag", "build_id", "commit_hash",
29872987
"api_scan_configuration", "scan_type"]
29882988

‎dojo/fixtures/defect_dojo_sample_data.json‎

Lines changed: 0 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -3643,8 +3643,6 @@
36433643
"description": null,
36443644
"target_start": "2021-02-18T00:00:00Z",
36453645
"target_end": "2021-02-27T00:00:00Z",
3646-
"estimated_time": "00:00:00",
3647-
"actual_time": "00:00:00",
36483646
"percent_complete": 100,
36493647
"environment": 1,
36503648
"updated": null,
@@ -3674,8 +3672,6 @@
36743672
"description": null,
36753673
"target_start": "2021-03-21T01:00:00Z",
36763674
"target_end": "2021-03-22T01:00:00Z",
3677-
"estimated_time": null,
3678-
"actual_time": null,
36793675
"percent_complete": 100,
36803676
"environment": 1,
36813677
"updated": null,
@@ -3703,8 +3699,6 @@
37033699
"description": null,
37043700
"target_start": "2021-02-18T00:00:00Z",
37053701
"target_end": "2021-02-27T00:00:00Z",
3706-
"estimated_time": "02:00:00",
3707-
"actual_time": "00:30:00",
37083702
"percent_complete": 100,
37093703
"environment": 1,
37103704
"updated": null,
@@ -3734,8 +3728,6 @@
37343728
"description": null,
37353729
"target_start": "2021-11-03T00:00:00Z",
37363730
"target_end": "2021-11-03T00:00:00Z",
3737-
"estimated_time": null,
3738-
"actual_time": null,
37393731
"percent_complete": 100,
37403732
"environment": 7,
37413733
"updated": "2021-11-04T09:01:30.563Z",
@@ -3765,8 +3757,6 @@
37653757
"description": null,
37663758
"target_start": "2021-11-03T00:00:00Z",
37673759
"target_end": "2021-11-03T00:00:00Z",
3768-
"estimated_time": null,
3769-
"actual_time": null,
37703760
"percent_complete": 100,
37713761
"environment": 7,
37723762
"updated": "2021-11-04T09:03:25.139Z",
@@ -3796,8 +3786,6 @@
37963786
"description": null,
37973787
"target_start": "2022-01-19T00:00:00Z",
37983788
"target_end": "2022-01-24T00:00:00Z",
3799-
"estimated_time": null,
3800-
"actual_time": null,
38013789
"percent_complete": null,
38023790
"environment": 3,
38033791
"updated": "2021-11-04T09:26:34.003Z",
@@ -3825,8 +3813,6 @@
38253813
"description": null,
38263814
"target_start": "2021-11-04T09:36:15.180Z",
38273815
"target_end": "2021-11-04T09:36:15.180Z",
3828-
"estimated_time": null,
3829-
"actual_time": null,
38303816
"percent_complete": null,
38313817
"environment": null,
38323818
"updated": "2021-11-04T09:36:15.180Z",
@@ -3856,8 +3842,6 @@
38563842
"description": null,
38573843
"target_start": "2021-12-20T00:00:00Z",
38583844
"target_end": "2021-12-27T00:00:00Z",
3859-
"estimated_time": null,
3860-
"actual_time": null,
38613845
"percent_complete": null,
38623846
"environment": 3,
38633847
"updated": "2021-11-04T09:43:09.101Z",
@@ -3887,8 +3871,6 @@
38873871
"description": null,
38883872
"target_start": "2021-12-20T00:00:00Z",
38893873
"target_end": "2021-12-27T00:00:00Z",
3890-
"estimated_time": null,
3891-
"actual_time": null,
38923874
"percent_complete": null,
38933875
"environment": 2,
38943876
"updated": "2021-11-04T09:43:23.410Z",
@@ -3918,8 +3900,6 @@
39183900
"description": null,
39193901
"target_start": "2021-12-20T00:00:00Z",
39203902
"target_end": "2021-12-27T00:00:00Z",
3921-
"estimated_time": null,
3922-
"actual_time": null,
39233903
"percent_complete": null,
39243904
"environment": 3,
39253905
"updated": "2021-11-04T09:43:41.711Z",
@@ -3949,8 +3929,6 @@
39493929
"description": null,
39503930
"target_start": "2021-12-20T00:00:00Z",
39513931
"target_end": "2021-12-27T00:00:00Z",
3952-
"estimated_time": null,
3953-
"actual_time": null,
39543932
"percent_complete": null,
39553933
"environment": 3,
39563934
"updated": "2021-11-04T09:44:01.815Z",
@@ -3980,8 +3958,6 @@
39803958
"description": null,
39813959
"target_start": "2021-11-04T00:00:00Z",
39823960
"target_end": "2021-11-04T00:00:00Z",
3983-
"estimated_time": null,
3984-
"actual_time": null,
39853961
"percent_complete": 100,
39863962
"environment": 7,
39873963
"updated": "2021-11-05T06:44:35.814Z",
@@ -4011,8 +3987,6 @@
40113987
"description": null,
40123988
"target_start": "2021-11-04T00:00:00Z",
40133989
"target_end": "2021-11-04T00:00:00Z",
4014-
"estimated_time": null,
4015-
"actual_time": null,
40163990
"percent_complete": 100,
40173991
"environment": 7,
40183992
"updated": "2021-11-05T06:46:06.450Z",
@@ -4042,8 +4016,6 @@
40424016
"description": null,
40434017
"target_start": "2021-11-04T00:00:00Z",
40444018
"target_end": "2021-11-04T00:00:00Z",
4045-
"estimated_time": null,
4046-
"actual_time": null,
40474019
"percent_complete": 100,
40484020
"environment": 7,
40494021
"updated": "2021-11-05T06:47:17.517Z",
@@ -4073,8 +4045,6 @@
40734045
"description": null,
40744046
"target_start": "2021-11-04T00:00:00Z",
40754047
"target_end": "2021-11-11T00:00:00Z",
4076-
"estimated_time": null,
4077-
"actual_time": null,
40784048
"percent_complete": null,
40794049
"environment": 3,
40804050
"updated": "2021-11-05T06:54:23.989Z",
@@ -4104,8 +4074,6 @@
41044074
"description": null,
41054075
"target_start": "2021-11-04T00:00:00Z",
41064076
"target_end": "2021-11-11T00:00:00Z",
4107-
"estimated_time": null,
4108-
"actual_time": null,
41094077
"percent_complete": null,
41104078
"environment": 5,
41114079
"updated": "2021-11-05T06:54:35.499Z",
@@ -4135,8 +4103,6 @@
41354103
"description": null,
41364104
"target_start": "2021-11-04T00:00:00Z",
41374105
"target_end": "2021-11-04T00:00:00Z",
4138-
"estimated_time": null,
4139-
"actual_time": null,
41404106
"percent_complete": 100,
41414107
"environment": 7,
41424108
"updated": "2021-11-05T07:07:18.034Z",
@@ -4166,8 +4132,6 @@
41664132
"description": null,
41674133
"target_start": "2021-11-04T00:00:00Z",
41684134
"target_end": "2021-11-04T00:00:00Z",
4169-
"estimated_time": null,
4170-
"actual_time": null,
41714135
"percent_complete": 100,
41724136
"environment": 7,
41734137
"updated": "2021-11-05T10:43:05.485Z",

‎dojo/fixtures/dojo_testdata.json‎

Lines changed: 0 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -977,15 +977,13 @@
977977
"model": "dojo.test",
978978
"fields": {
979979
"lead": null,
980-
"estimated_time": "00:00:00",
981980
"test_type": 1,
982981
"scan_type": "ZAP Scan",
983982
"engagement": 1,
984983
"environment": 1,
985984
"target_start": "2017-12-01T00:00:00Z",
986985
"notes": [],
987986
"percent_complete": 100,
988-
"actual_time": "00:00:00",
989987
"target_end": "2017-12-10T00:00:00Z"
990988
}
991989
},
@@ -994,7 +992,6 @@
994992
"model": "dojo.test",
995993
"fields": {
996994
"lead": null,
997-
"estimated_time": "00:00:00",
998995
"test_type": 1,
999996
"scan_type": "ZAP Scan",
1000997
"title": "My ZAP Scan",
@@ -1003,7 +1000,6 @@
10031000
"target_start": "2017-12-01T00:00:00Z",
10041001
"notes": [],
10051002
"percent_complete": 100,
1006-
"actual_time": "00:00:00",
10071003
"target_end": "2017-12-10T00:00:00Z"
10081004
}
10091005
},
@@ -1012,14 +1008,12 @@
10121008
"model": "dojo.test",
10131009
"fields": {
10141010
"lead": null,
1015-
"estimated_time": "00:00:00",
10161011
"test_type": 120,
10171012
"engagement": 3,
10181013
"environment": 1,
10191014
"target_start": "2017-12-01T00:00:00Z",
10201015
"notes": [],
10211016
"percent_complete": 100,
1022-
"actual_time": "00:00:00",
10231017
"target_end": "2017-12-10T00:00:00Z"
10241018
}
10251019
},
@@ -1028,15 +1022,13 @@
10281022
"model": "dojo.test",
10291023
"fields": {
10301024
"lead": null,
1031-
"estimated_time": "00:00:00",
10321025
"test_type": 999,
10331026
"scan_type": "Checkmarx Scan detailed",
10341027
"engagement": 5,
10351028
"environment": 1,
10361029
"target_start": "2017-12-01T00:00:00Z",
10371030
"notes": [],
10381031
"percent_complete": 100,
1039-
"actual_time": "00:00:00",
10401032
"target_end": "2017-12-10T00:00:00Z"
10411033
}
10421034
},
@@ -1045,15 +1037,13 @@
10451037
"model": "dojo.test",
10461038
"fields": {
10471039
"lead": null,
1048-
"estimated_time": "00:00:00",
10491040
"test_type": 999,
10501041
"scan_type": "Checkmarx Scan detailed",
10511042
"engagement": 5,
10521043
"environment": 1,
10531044
"target_start": "2017-12-01T00:00:00Z",
10541045
"notes": [],
10551046
"percent_complete": 100,
1056-
"actual_time": "00:00:00",
10571047
"target_end": "2017-12-10T00:00:00Z"
10581048
}
10591049
},
@@ -1062,15 +1052,13 @@
10621052
"model": "dojo.test",
10631053
"fields": {
10641054
"lead": null,
1065-
"estimated_time": "00:00:00",
10661055
"test_type": 555,
10671056
"scan_type": "Veracode Scan",
10681057
"engagement": 5,
10691058
"environment": 1,
10701059
"target_start": "2017-12-01T00:00:00Z",
10711060
"notes": [],
10721061
"percent_complete": 100,
1073-
"actual_time": "00:00:00",
10741062
"target_end": "2017-12-10T00:00:00Z"
10751063
}
10761064
},
@@ -1079,14 +1067,12 @@
10791067
"model": "dojo.test",
10801068
"fields": {
10811069
"lead": null,
1082-
"estimated_time": "00:00:00",
10831070
"test_type": 555,
10841071
"engagement": 5,
10851072
"environment": 1,
10861073
"target_start": "2017-12-01T00:00:00Z",
10871074
"notes": [],
10881075
"percent_complete": 100,
1089-
"actual_time": "00:00:00",
10901076
"target_end": "2017-12-10T00:00:00Z"
10911077
}
10921078
},
@@ -1095,14 +1081,12 @@
10951081
"model": "dojo.test",
10961082
"fields": {
10971083
"lead": 2,
1098-
"estimated_time": null,
10991084
"test_type": 1,
11001085
"engagement": 2,
11011086
"environment": 1,
11021087
"target_start": "2018-01-01T01:00:00Z",
11031088
"notes": [],
11041089
"percent_complete": 100,
1105-
"actual_time": null,
11061090
"target_end": "2018-01-02T01:00:00Z"
11071091
}
11081092
},
@@ -1111,7 +1095,6 @@
11111095
"model": "dojo.test",
11121096
"fields": {
11131097
"lead": null,
1114-
"estimated_time": "02:00:00",
11151098
"test_type": 1,
11161099
"engagement": 1,
11171100
"environment": 1,
@@ -1120,7 +1103,6 @@
11201103
1
11211104
],
11221105
"percent_complete": 100,
1123-
"actual_time": "00:30:00",
11241106
"target_end": "2017-12-10T00:00:00Z"
11251107
}
11261108
},
@@ -1129,7 +1111,6 @@
11291111
"model": "dojo.test",
11301112
"fields": {
11311113
"lead": null,
1132-
"estimated_time": "00:00:00",
11331114
"test_type": 1,
11341115
"scan_type": "ZAP Scan",
11351116
"title": "Endpoint mitigation tests",
@@ -1138,7 +1119,6 @@
11381119
"target_start": "2017-12-01T00:00:00Z",
11391120
"notes": [],
11401121
"percent_complete": 100,
1141-
"actual_time": "00:00:00",
11421122
"target_end": "2017-12-10T00:00:00Z"
11431123
}
11441124
},

‎dojo/fixtures/unit_limit_reqresp.json‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -102,21 +102,19 @@
102102
"api_test": true,
103103
"deduplication_on_engagement": true
104104
}
105-
},
105+
},
106106
{
107107
"pk": 5,
108108
"model": "dojo.test",
109109
"fields": {
110110
"lead": null,
111-
"estimated_time": "00:00:00",
112111
"test_type": 1,
113112
"scan_type": "ZAP Scan",
114113
"engagement": 5,
115114
"environment": 1,
116115
"target_start": "2017-12-01T00:00:00Z",
117116
"notes": [],
118117
"percent_complete": 100,
119-
"actual_time": "00:00:00",
120118
"target_end": "2017-12-10T00:00:00Z"
121119
}
122120
},{

‎dojo/models.py‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2085,8 +2085,6 @@ class Test(models.Model):
20852085
description = models.TextField(null=True, blank=True)
20862086
target_start = models.DateTimeField()
20872087
target_end = models.DateTimeField()
2088-
estimated_time = models.TimeField(null=True, blank=True, editable=False)
2089-
actual_time = models.TimeField(null=True, blank=True, editable=False)
20902088
percent_complete = models.IntegerField(null=True, blank=True,
20912089
editable=True)
20922090
notes = models.ManyToManyField(Notes, blank=True,

0 commit comments

Comments
 (0)