[fix] Avoided redundant SQL write query during CA/Cert creation #120

Closes #120.

Co-authored-by: Federico Capoano <[email protected]>

Author: SitaGanesh

django_x509/base/models.py

@@ -200,17 +200,12 @@ def clean(self):
         self._verify_extension_format()
 
     def save(self, *args, **kwargs):
-        generate = False
-        if not self.pk and not self.certificate and not self.private_key:
-            generate = True
-        super().save(*args, **kwargs)
-        if generate:
-            # automatically determine serial number
+        if self._state.adding and not self.certificate and not self.private_key:
+            # auto generate serial number
             if not self.serial_number:
                 self.serial_number = self._generate_serial_number()
             self._generate()
-            kwargs['force_insert'] = False
-            super().save(*args, **kwargs)
+        super().save(*args, **kwargs)
 
     @cached_property
     def x509(self):

django_x509/tests/test_cert.py

@@ -4,6 +4,7 @@
 from django.test import TestCase
 from django.utils import timezone
 from OpenSSL import crypto
+from openwisp_utils.tests import AssertNumQueriesSubTestMixin
 from swapper import load_model
 
 from .. import settings as app_settings
@@ -14,7 +15,7 @@
 Cert = load_model('django_x509', 'Cert')
 
 
-class TestCert(TestX509Mixin, TestCase):
+class TestCert(AssertNumQueriesSubTestMixin, TestX509Mixin, TestCase):
     """
     tests for Cert model
     """
@@ -81,7 +82,8 @@ class TestCert(TestX509Mixin, TestCase):
 """
 
     def test_new(self):
-        cert = self._create_cert()
+        with self.assertNumQueries(3):
+            cert = self._create_cert()
         self.assertNotEqual(cert.certificate, '')
         self.assertNotEqual(cert.private_key, '')
         x509 = cert.x509