Skip to content

Commit 5fb889f

Browse files
authored
Revert 1400-fix_dupe_changelog (#1440)
Signed-off-by: Tushar Goel <[email protected]>
1 parent 766cb3e commit 5fb889f

5 files changed

+2
-126
lines changed

vulnerabilities/migrations/0057_alter_packagechangelog_software_version_and_more.py renamed to vulnerabilities/migrations/0055_alter_packagechangelog_software_version_and_more.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
1-
# Generated by Django 4.1.13 on 2024-02-26 13:52
1+
# Generated by Django 4.1.13 on 2024-03-18 08:35
22

33
from django.db import migrations, models
44

55

66
class Migration(migrations.Migration):
77

88
dependencies = [
9-
("vulnerabilities", "0056_alter_packagechangelog_unique_together_and_more"),
9+
("vulnerabilities", "0054_alter_packagechangelog_software_version_and_more"),
1010
]
1111

1212
operations = [

vulnerabilities/migrations/0055_remove_changelogs_with_same_data_different_software_version.py

Lines changed: 0 additions & 52 deletions
This file was deleted.

vulnerabilities/migrations/0056_alter_packagechangelog_unique_together_and_more.py

Lines changed: 0 additions & 21 deletions
This file was deleted.

vulnerabilities/models.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1165,7 +1165,6 @@ def get_iso_time(self):
11651165
class Meta:
11661166
abstract = True
11671167
ordering = ("-action_time",)
1168-
unique_together = ("action_time", "actor_name", "action_type", "source_url")
11691168

11701169

11711170
class VulnerabilityHistoryManager(models.Manager):

vulnerabilities/tests/test_data_migrations.py

Lines changed: 0 additions & 50 deletions
Original file line numberDiff line numberDiff line change
@@ -610,53 +610,3 @@ def setUpBeforeMigration(self, apps):
610610
def test_removal_of_duped_purls(self):
611611
Package = apps.get_model("vulnerabilities", "Package")
612612
assert Package.objects.count() == 1
613-
614-
615-
class TestRemoveDupedChangeLogWithSameData(TestMigrations):
616-
app_name = "vulnerabilities"
617-
migrate_from = "0054_alter_packagechangelog_software_version_and_more"
618-
migrate_to = "0055_remove_changelogs_with_same_data_different_software_version"
619-
620-
def setUpBeforeMigration(self, apps):
621-
PackageChangeLog = apps.get_model("vulnerabilities", "PackageChangeLog")
622-
VulnerabilityChangeLog = apps.get_model("vulnerabilities", "VulnerabilityChangeLog")
623-
Package = apps.get_model("vulnerabilities", "Package")
624-
Vulnerability = apps.get_model("vulnerabilities", "Vulnerability")
625-
pkg1 = Package.objects.create(type="nginx", name="nginx", qualifiers={"os": "windows"})
626-
vuln = Vulnerability.objects.create(summary="NEW")
627-
PackageChangeLog.objects.create(
628-
actor_name="Nginx",
629-
action_type=1,
630-
source_url="test",
631-
software_version="1",
632-
package=pkg1,
633-
related_vulnerability=vuln,
634-
)
635-
PackageChangeLog.objects.create(
636-
actor_name="Nginx",
637-
action_type=1,
638-
source_url="test",
639-
software_version="2",
640-
package=pkg1,
641-
related_vulnerability=vuln,
642-
)
643-
VulnerabilityChangeLog.objects.create(
644-
actor_name="Nginx",
645-
action_type=1,
646-
source_url="test",
647-
software_version="2",
648-
vulnerability=vuln,
649-
)
650-
VulnerabilityChangeLog.objects.create(
651-
actor_name="Nginx",
652-
action_type=1,
653-
source_url="test",
654-
software_version="1",
655-
vulnerability=vuln,
656-
)
657-
658-
def test_removal_of_changelog(self):
659-
PackageChangeLog = apps.get_model("vulnerabilities", "PackageChangeLog")
660-
VulnerabilityChangeLog = apps.get_model("vulnerabilities", "VulnerabilityChangeLog")
661-
assert PackageChangeLog.objects.all().count() == 1
662-
assert VulnerabilityChangeLog.objects.all().count() == 1

0 commit comments

Comments
 (0)