[#1548] process PR feedback

Author: pi-sigma

src/open_inwoner/accounts/tests/test_logging.py

@@ -218,7 +218,7 @@ def test_users_deactivation_is_logged(self):
         self.assertEqual(
             log_entry.extra_data,
             {
-                "message": _("user was deactivated via frontend"),
+                "message": _("user was deleted via frontend"),
                 "action_flag": list(LOG_ACTIONS[4]),
                 "content_object_repr": self.user.email,
             },

src/open_inwoner/accounts/tests/test_profile_views.py

@@ -532,7 +532,6 @@ def test_delete_regular_user_success(self):
 
         # get profile page
         response = self.app.get(self.url, user=user)
-        self.assertEqual(response.status_code, 200)
 
         # check delete
         response = response.forms["deactivate-form"].submit()
@@ -552,7 +551,6 @@ def test_delete_user_with_digid_login_success(self):
 
         # get profile page
         response = self.app.get(self.url, user=user)
-        self.assertEqual(response.status_code, 200)
 
         # check user deleted
         response = response.forms["deactivate-form"].submit()
@@ -567,13 +565,12 @@ def test_delete_user_with_digid_login_success(self):
             fetch_redirect_response=True,
         )
 
-    def test_delete_regular_with_existing_plans_fail(self):
+    def test_delete_regular_user_as_plan_contact_fail(self):
         user = UserFactory()
-        PlanFactory.create(created_by=user)
+        PlanFactory.create(plan_contacts=[user])
 
         # get profile page
         response = self.app.get(self.url, user=user)
-        self.assertEqual(response.status_code, 200)
 
         # check user not deleted
         response = response.forms["deactivate-form"].submit()
@@ -593,7 +590,6 @@ def test_delete_staff_user_via_frontend_does_not_work(self):
 
         # get profile page
         response = self.app.get(self.url, user=user)
-        self.assertEqual(response.status_code, 200)
 
         # check staff user not deleted
         response = response.forms["deactivate-form"].submit()

src/open_inwoner/accounts/views/profile.py

@@ -3,6 +3,7 @@
 from django.conf import settings
 from django.contrib import messages
 from django.contrib.auth.mixins import LoginRequiredMixin
+from django.db.models import Q
 from django.forms.forms import Form
 from django.http import HttpResponseRedirect
 from django.shortcuts import redirect
@@ -108,25 +109,25 @@ def post(self, request, *args, **kwargs):
         if request.user.is_authenticated and not request.user.is_staff:
             instance = User.objects.get(id=request.user.id)
 
-            # check if there are still plans associated witht the user
-            if Plan.objects.filter(created_by=instance).exists():
+            # check if there are still plans created by or associated witht the user
+            if Plan.objects.connected(instance):
                 messages.warning(
                     request,
                     _(
-                        "You still have plans associated with your profile. "
-                        "Please delete those plans before deleting your profile."
+                        "Your profile could not be deleted because you you still "
+                        "have plans associated with it."
                     ),
                 )
                 return redirect("profile:detail")
 
             # continue with delete
-            self.log_user_action(instance, _("user was deactivated via frontend"))
+            self.log_user_action(instance, _("user was deleted via frontend"))
             instance.delete()
             request.session.flush()
 
             return redirect(reverse("logout"))
         else:
-            messages.warning(request, _("Uw account kon niet worden gedeactiveerd"))
+            messages.warning(request, _("Uw account kon niet worden verwijderd"))
             return redirect("profile:detail")