Merge acc7916 into 0eefbed

tests/monolith/test_monolith_enrollment_package_api_views.py

@@ -9,6 +9,7 @@
 from accounts.models import APIToken, User
 from zentral.contrib.inventory.models import Tag
 from zentral.contrib.monolith.models import ManifestEnrollmentPackage
+from zentral.contrib.munki.models import Enrollment as MunkiEnrollment
 from tests.munki.utils import force_enrollment as force_munki_enrollment
 from .utils import force_manifest, force_manifest_enrollment_package
 
@@ -420,6 +421,7 @@ def test_delete_manifest_enrollment_package_not_found(self):
 
     def test_delete_manifest_enrollment_package(self):
         mep = force_manifest_enrollment_package()
+        enrollment = mep.get_enrollment()
         manifest = mep.manifest
         manifest.refresh_from_db()
         self.assertEqual(manifest.version, 2)
@@ -428,3 +430,4 @@ def test_delete_manifest_enrollment_package(self):
         self.assertEqual(response.status_code, 204)
         manifest.refresh_from_db()
         self.assertEqual(manifest.version, 3)
+        self.assertTrue(MunkiEnrollment.objects.filter(pk=enrollment.pk).exists())

zentral/contrib/monolith/api_views.py

@@ -289,9 +289,8 @@ class ManifestEnrollmentPackageDetail(generics.RetrieveUpdateDestroyAPIView):
 
     def perform_destroy(self, instance):
         manifest = instance.manifest
-        response = super().perform_destroy(instance)
+        instance.delete(delete_enrollment=False)
         manifest.bump_version()
-        return response
 
 
 # manifest sub manifests

zentral/contrib/monolith/models.py

@@ -1140,10 +1140,11 @@ class ManifestEnrollmentPackage(models.Model):
     updated_at = models.DateTimeField(auto_now=True)
 
     def delete(self, *args, **kwargs):
+        delete_enrollment = kwargs.pop("delete_enrollment", True)
         self.file.delete(save=False)
         enrollment = self.get_enrollment()
         super().delete(*args, **kwargs)
-        if enrollment:
+        if delete_enrollment and enrollment:
             enrollment.delete()
 
     def get_installer_item_filename(self):