Skip to content

Commit 723e1ca

Browse files
Maffoochclaude
andcommitted
fix: drop malformed watson.searchentry rows left by bad merge
The merge of dev into this branch (2f8f682) collided on the watson search-entry rows: dev removed stub_finding entries while this branch removed cred_user entries, and the three-way merge dropped only the model name from each conflicting row, leaving six entries per fixture with content_type set to ['dojo'] (a one-element natural key). loaddata then failed with: ContentTypeManager.get_by_natural_key() missing 1 required positional argument: 'model' ... (watson.searchentry:pk=4) field_value was '['dojo']' These rows pointed at the now-removed cred_user content type and were already supposed to be deleted (see 12d749f). Remove them from both fixture files. Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
1 parent 2f8f682 commit 723e1ca

2 files changed

Lines changed: 0 additions & 204 deletions

File tree

dojo/fixtures/defect_dojo_sample_data.json

Lines changed: 0 additions & 102 deletions
Original file line numberDiff line numberDiff line change
@@ -43163,57 +43163,6 @@
4316343163
"model": "watson.searchentry",
4316443164
"pk": 3
4316543165
},
43166-
{
43167-
"fields": {
43168-
"content": "",
43169-
"content_type": [
43170-
"dojo"
43171-
],
43172-
"description": "",
43173-
"engine_slug": "default",
43174-
"meta_encoded": "{}",
43175-
"object_id": "3",
43176-
"object_id_int": 3,
43177-
"title": "Web Scan (Feb 23, 2022)",
43178-
"url": ""
43179-
},
43180-
"model": "watson.searchentry",
43181-
"pk": 4
43182-
},
43183-
{
43184-
"fields": {
43185-
"content": "",
43186-
"content_type": [
43187-
"dojo"
43188-
],
43189-
"description": "",
43190-
"engine_slug": "default",
43191-
"meta_encoded": "{}",
43192-
"object_id": "13",
43193-
"object_id_int": 13,
43194-
"title": "Web Scan (Mar 26, 2022)",
43195-
"url": ""
43196-
},
43197-
"model": "watson.searchentry",
43198-
"pk": 5
43199-
},
43200-
{
43201-
"fields": {
43202-
"content": "",
43203-
"content_type": [
43204-
"dojo"
43205-
],
43206-
"description": "",
43207-
"engine_slug": "default",
43208-
"meta_encoded": "{}",
43209-
"object_id": "14",
43210-
"object_id_int": 14,
43211-
"title": "Web Scan (Feb 23, 2022)",
43212-
"url": ""
43213-
},
43214-
"model": "watson.searchentry",
43215-
"pk": 6
43216-
},
4321743166
{
4321843167
"fields": {
4321943168
"content": "",
@@ -43466,57 +43415,6 @@
4346643415
"model": "watson.searchentry",
4346743416
"pk": 25
4346843417
},
43469-
{
43470-
"fields": {
43471-
"content": "",
43472-
"content_type": [
43473-
"dojo"
43474-
],
43475-
"description": "",
43476-
"engine_slug": "default",
43477-
"meta_encoded": "{}",
43478-
"object_id": "3",
43479-
"object_id_int": 3,
43480-
"title": "Web Scan (Feb 23, 2022)",
43481-
"url": ""
43482-
},
43483-
"model": "watson.searchentry",
43484-
"pk": 26
43485-
},
43486-
{
43487-
"fields": {
43488-
"content": "",
43489-
"content_type": [
43490-
"dojo"
43491-
],
43492-
"description": "",
43493-
"engine_slug": "default",
43494-
"meta_encoded": "{}",
43495-
"object_id": "13",
43496-
"object_id_int": 13,
43497-
"title": "Web Scan (Mar 26, 2022)",
43498-
"url": ""
43499-
},
43500-
"model": "watson.searchentry",
43501-
"pk": 27
43502-
},
43503-
{
43504-
"fields": {
43505-
"content": "",
43506-
"content_type": [
43507-
"dojo"
43508-
],
43509-
"description": "",
43510-
"engine_slug": "default",
43511-
"meta_encoded": "{}",
43512-
"object_id": "14",
43513-
"object_id_int": 14,
43514-
"title": "Web Scan (Feb 23, 2022)",
43515-
"url": ""
43516-
},
43517-
"model": "watson.searchentry",
43518-
"pk": 28
43519-
},
4352043418
{
4352143419
"fields": {
4352243420
"content": "April Monthly Engagement Requested by the team for regular manual checkup by the security team. None None None Completed threat_model none none Interactive None None None None",

dojo/fixtures/defect_dojo_sample_data_locations.json

Lines changed: 0 additions & 102 deletions
Original file line numberDiff line numberDiff line change
@@ -78976,57 +78976,6 @@
7897678976
"model": "watson.searchentry",
7897778977
"pk": 3
7897878978
},
78979-
{
78980-
"fields": {
78981-
"content": "",
78982-
"content_type": [
78983-
"dojo"
78984-
],
78985-
"description": "",
78986-
"engine_slug": "default",
78987-
"meta_encoded": "{}",
78988-
"object_id": "3",
78989-
"object_id_int": 3,
78990-
"title": "Web Scan (Mar 21, 2021)",
78991-
"url": ""
78992-
},
78993-
"model": "watson.searchentry",
78994-
"pk": 4
78995-
},
78996-
{
78997-
"fields": {
78998-
"content": "",
78999-
"content_type": [
79000-
"dojo"
79001-
],
79002-
"description": "",
79003-
"engine_slug": "default",
79004-
"meta_encoded": "{}",
79005-
"object_id": "13",
79006-
"object_id_int": 13,
79007-
"title": "Web Scan (Apr 21, 2021)",
79008-
"url": ""
79009-
},
79010-
"model": "watson.searchentry",
79011-
"pk": 5
79012-
},
79013-
{
79014-
"fields": {
79015-
"content": "",
79016-
"content_type": [
79017-
"dojo"
79018-
],
79019-
"description": "",
79020-
"engine_slug": "default",
79021-
"meta_encoded": "{}",
79022-
"object_id": "14",
79023-
"object_id_int": 14,
79024-
"title": "Web Scan (Mar 21, 2021)",
79025-
"url": ""
79026-
},
79027-
"model": "watson.searchentry",
79028-
"pk": 6
79029-
},
7903078979
{
7903178980
"fields": {
7903278981
"content": "",
@@ -79279,57 +79228,6 @@
7927979228
"model": "watson.searchentry",
7928079229
"pk": 25
7928179230
},
79282-
{
79283-
"fields": {
79284-
"content": "",
79285-
"content_type": [
79286-
"dojo"
79287-
],
79288-
"description": "",
79289-
"engine_slug": "default",
79290-
"meta_encoded": "{}",
79291-
"object_id": "3",
79292-
"object_id_int": 3,
79293-
"title": "Web Scan (Mar 21, 2021)",
79294-
"url": ""
79295-
},
79296-
"model": "watson.searchentry",
79297-
"pk": 26
79298-
},
79299-
{
79300-
"fields": {
79301-
"content": "",
79302-
"content_type": [
79303-
"dojo"
79304-
],
79305-
"description": "",
79306-
"engine_slug": "default",
79307-
"meta_encoded": "{}",
79308-
"object_id": "13",
79309-
"object_id_int": 13,
79310-
"title": "Web Scan (Apr 21, 2021)",
79311-
"url": ""
79312-
},
79313-
"model": "watson.searchentry",
79314-
"pk": 27
79315-
},
79316-
{
79317-
"fields": {
79318-
"content": "",
79319-
"content_type": [
79320-
"dojo"
79321-
],
79322-
"description": "",
79323-
"engine_slug": "default",
79324-
"meta_encoded": "{}",
79325-
"object_id": "14",
79326-
"object_id_int": 14,
79327-
"title": "Web Scan (Mar 21, 2021)",
79328-
"url": ""
79329-
},
79330-
"model": "watson.searchentry",
79331-
"pk": 28
79332-
},
7933379231
{
7933479232
"fields": {
7933579233
"content": "April Monthly Engagement Requested by the team for regular manual checkup by the security team. None None None Completed threat_model none none Interactive None None None None",

0 commit comments

Comments
 (0)