Merge lp:~newell-jensen/maas/fix-1573219 into lp:~maas-committers/maas/trunk

[Newell Jensen]

Delete User's FileStorage objects before deleting user. This will be backported to MAAS 1.9 as well.

[Gavin Panella (allenap)]

review: Approve

=== modified file 'src/maasserver/models/tests/test_userprofile.py'
--- src/maasserver/models/tests/test_userprofile.py	2015-12-01 18:12:59 +0000
+++ src/maasserver/models/tests/test_userprofile.py	2016-04-26 21:31:42 +0000
@@ -7,7 +7,10 @@
 
 from django.contrib.auth.models import User
 from maasserver.exceptions import CannotDeleteUserException
-from maasserver.models import UserProfile
+from maasserver.models import (
+    FileStorage,
+    UserProfile,
+)
 from maasserver.models.user import (
     GENERIC_CONSUMER,
     get_auth_tokens,
@@ -81,6 +84,21 @@
         self.assertFalse(Consumer.objects.filter(id__in=consumer_ids).exists())
         self.assertFalse(Token.objects.filter(id__in=token_ids).exists())
 
+    def test_delete_deletes_related_filestorage_objects(self):
+        # Deleting a profile deletes the related filestorage objects.
+        profile = factory.make_User().userprofile
+        profile_id = profile.id
+        filestorage = factory.make_FileStorage(owner=profile.user)
+        filestorage_id = filestorage.id
+        self.assertTrue(FileStorage.objects.filter(id=filestorage_id).exists())
+        self.assertTrue(
+            UserProfile.objects.filter(id=profile_id).exists())
+        profile.delete()
+        self.assertFalse(
+            FileStorage.objects.filter(id=filestorage_id).exists())
+        self.assertFalse(
+            UserProfile.objects.filter(id=profile_id).exists())
+
     def test_delete_attached_nodes(self):
         # Cannot delete a user with nodes attached to it.
         profile = factory.make_User().userprofile

=== modified file 'src/maasserver/models/userprofile.py'
--- src/maasserver/models/userprofile.py	2015-12-02 20:43:30 +0000
+++ src/maasserver/models/userprofile.py	2016-04-26 21:31:42 +0000
@@ -67,6 +67,8 @@
                 "allocated to this user." %
                 (self.user.username, nb_nodes))
             raise CannotDeleteUserException(msg)
+        if self.user.filestorage_set.exists():
+            self.user.filestorage_set.all().delete()
         self.user.consumers.all().delete()
         self.user.delete()
         super(UserProfile, self).delete()