Use microsecond in vulcoids

Signed-off-by: Shivam Sandbhor <shivam.sandbhor@gmail.com>

Author: sbs2001

vulnerabilities/models.py

@@ -65,24 +65,14 @@ class Vulnerability(models.Model):
     def save(self, *args, **kwargs):
         if self.vulnerability_id:
             return super().save(*args, **kwargs)
-        # Generate unique VULCOID
-        ie = None
-        for attempt in range(1, 11):
-            try:
-                self.vulnerability_id = self.generate_vulcoid()
-                # Using the context manager due to https://stackoverflow.com/a/23326971
-                with transaction.atomic():
-                    return super().save(*args, **kwargs)
-
-            except IntegrityError as ie:
-                sleep(0.5 * attempt)
-        raise Exception("Failed to generate a unique VULCOID after 10 attempts") from ie
+        self.vulnerability_id = self.generate_vulcoid()
+        return super().save(*args, **kwargs)
 
     @staticmethod
     def generate_vulcoid(timestamp=None):
         if not timestamp:
             timestamp = datetime.now()
-        timestamp = timestamp.strftime("%Y-%m-%d%H%M%S")
+        timestamp = timestamp.strftime("%Y%m%d-%H%M-%S%f")[:-4]
         return f"VULCOID-{timestamp}"
 
     @property

vulnerabilities/tests/test_models.py

@@ -33,14 +33,14 @@
 class TestVulnerabilityModel(TestCase):
 
     def test_generate_vulcoid_given_timestamp_object(self):
-        timestamp_object = datetime(2021, 1, 1, 11, 12, 13)
-        expected_vulcoid = "VULCOID-2021-01-01111213"
+        timestamp_object = datetime(2021, 1, 1, 11, 12, 13, 2000)
+        expected_vulcoid = "VULCOID-20210101-1112-1300"
         found_vulcoid = models.Vulnerability.generate_vulcoid(timestamp_object)
         assert expected_vulcoid == found_vulcoid
 
     def test_generate_vulcoid(self):
-        expected_vulcoid = "VULCOID-2021-01-01111213"
-        with freeze_time("2021-01-01 11:12:13"):
+        expected_vulcoid = "VULCOID-20210101-1112-1300"
+        with freeze_time("2021-01-01 11:12:13.0000"):
             found_vulcoid = models.Vulnerability.generate_vulcoid()
         assert expected_vulcoid == found_vulcoid
 
@@ -52,22 +52,11 @@ def test_vulnerability_save_with_vulnerability_id(self):
     @pytest.mark.django_db
     def test_vulnerability_save_without_vulnerability_id(self):
         assert models.Vulnerability.objects.filter(
-            vulnerability_id="VULCOID-2021-01-01111213"
+            vulnerability_id="VULCOID-20210101-1112-1300"
             ).count() == 0
 
-        with freeze_time("2021-01-01 11:12:13"):
+        with freeze_time("2021-01-01 11:12:13.0000"):
             models.Vulnerability(vulnerability_id="").save()
             assert models.Vulnerability.objects.filter(
-                vulnerability_id="VULCOID-2021-01-01111213"
-                ).count() == 1
-
-        assert models.Vulnerability.objects.filter(
-            vulnerability_id="VULCOID-2021-01-01111214"
-            ).count() == 0
-
-        with freeze_time("2021-01-01 11:12:13", tick=True):
-            # This context manager sets time to "2021-01-01 11:12:13" and starts the clock.
-            models.Vulnerability(vulnerability_id="").save()
-            assert models.Vulnerability.objects.filter(
-                vulnerability_id="VULCOID-2021-01-01111214"
+                vulnerability_id="VULCOID-20210101-1112-1300"
                 ).count() == 1