[#1548] process PR feedback

Author: pi-sigma

src/open_inwoner/accounts/migrations/0062_alter_user_deactivated_on.py

@@ -0,0 +1,23 @@
+# Generated by Django 3.2.15 on 2023-06-23 08:35
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("accounts", "0061_auto_20230612_1428"),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name="user",
+            name="deactivated_on",
+            field=models.DateField(
+                blank=True,
+                help_text="This is the date the user decided to deactivate their account. This field is deprecated since user profiles are now immediately deleted.",
+                null=True,
+                verbose_name="Deactivated on",
+            ),
+        ),
+    ]

src/open_inwoner/accounts/models.py

@@ -144,7 +144,11 @@ class User(AbstractBaseUser, PermissionsMixin):
         verbose_name=_("Deactivated on"),
         null=True,
         blank=True,
-        help_text=_("This is the date the user decided to deactivate their account."),
+        help_text=_(
+            "This is the date the user decided to deactivate their account. "
+            "This field is deprecated since user profiles are now immediately "
+            "deleted."
+        ),
     )
     is_prepopulated = models.BooleanField(
         verbose_name=_("Prepopulated"),

src/open_inwoner/accounts/tests/test_logging.py

@@ -205,9 +205,9 @@ def test_logout_is_logged(self):
             },
         )
 
-    def test_users_deactivation_is_logged(self):
+    def test_users_deletion_is_logged(self):
         form = self.app.get(reverse("profile:detail"), user=self.user).forms[
-            "deactivate-form"
+            "delete-form"
         ]
         form.submit()
         log_entry = TimelineLog.objects.last()
@@ -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,10 +532,9 @@ 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()
+        response = response.forms["delete-form"].submit()
         self.assertIsNone(User.objects.first())
 
         # check redirect
@@ -552,10 +551,9 @@ 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()
+        response = response.forms["delete-form"].submit()
         self.assertIsNone(User.objects.first())
 
         # check redirect
@@ -567,16 +565,15 @@ 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()
+        response = response.forms["delete-form"].submit()
         self.assertEqual(User.objects.first(), user)
 
         # check redirect
@@ -593,10 +590,9 @@ 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()
+        response = response.forms["delete-form"].submit()
         self.assertEqual(User.objects.first(), user)
 
         # check redirect

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 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")
 
 

src/open_inwoner/templates/pages/profile/me.html

@@ -129,9 +129,9 @@ <h1 class="h1" id="overview">{% trans "Persoonlijk overzicht" %}</h1>
     </div> {% endcomment %}
 </div>
 
-{% render_form form=form method="POST" id="deactivate-form" extra_classes="confirm" spaceless=True data_confirm_title=_("Weet u zeker dat u uw account wilt verwijderen?") data_confirm_text=_("Hiermee worden alleen uw persoonlijke voorkeuren verwijderd. U krijgt dan bijvoorbeeld geen e-mail meer van ons over wijzigingen van uw lopende zaken. Uw persoonsgegevens en uw lopende zaken zelf worden hiermee niet verwijderd.") data_confirm_cancel=_("Nee") data_confirm_default=_("Ja") %}
+{% render_form form=form method="POST" id="delete-form" extra_classes="confirm" spaceless=True data_confirm_title=_("Weet u zeker dat u uw account wilt verwijderen?") data_confirm_text=_("Hiermee worden alleen uw persoonlijke voorkeuren verwijderd. U krijgt dan bijvoorbeeld geen e-mail meer van ons over wijzigingen van uw lopende zaken. Uw persoonsgegevens en uw lopende zaken zelf worden hiermee niet verwijderd.") data_confirm_cancel=_("Nee") data_confirm_default=_("Ja") %}
     {% csrf_token %}
-    {% form_actions primary_text=_("Profiel deactiveren") primary_icon="close" transparent=True %}
+    {% form_actions primary_text=_("Profiel verwijderen") primary_icon="close" transparent=True %}
 {% endrender_form %}
 
 {% if files %}