add the option to mark users as deleted instead of actually deleting them from the db

tapir/coop/migrations/0056_deleteshareownerlogentry_shareowner_deleted_at.py

@@ -0,0 +1,45 @@
+# Generated by Django 5.1.12 on 2025-11-21 14:55
+
+import django.contrib.postgres.fields.hstore
+import django.db.models.deletion
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        (
+            "coop",
+            "0055_membershippauseupdatedlogentry_coop_member_old_val_6e6554_gin_and_more",
+        ),
+        ("log", "0008_logentry_log_logentr_user_id_c4ca60_idx_and_more"),
+    ]
+
+    operations = [
+        migrations.CreateModel(
+            name="DeleteShareOwnerLogEntry",
+            fields=[
+                (
+                    "logentry_ptr",
+                    models.OneToOneField(
+                        auto_created=True,
+                        on_delete=django.db.models.deletion.CASCADE,
+                        parent_link=True,
+                        primary_key=True,
+                        serialize=False,
+                        to="log.logentry",
+                    ),
+                ),
+                ("values", django.contrib.postgres.fields.hstore.HStoreField()),
+            ],
+            options={
+                "abstract": False,
+            },
+            bases=("log.logentry",),
+        ),
+        migrations.AddField(
+            model_name="shareowner",
+            name="deleted_at",
+            field=models.DateTimeField(blank=True, default=None, null=True),
+        ),
+    ]

tapir/coop/models.py

@@ -17,6 +17,7 @@
 from tapir.coop.services.membership_pause_service import MembershipPauseService
 from tapir.coop.services.number_of_shares_service import NumberOfSharesService
 from tapir.core.config import help_text_displayed_name
+from tapir.core.models import SoftDeleteMixin, NonDeleted
 from tapir.log.models import UpdateModelLogEntry, ModelLogEntry, LogEntry
 from tapir.utils.expection_utils import TapirException
 from tapir.utils.models import (
@@ -31,7 +32,89 @@
 from tapir.utils.user_utils import UserUtils
 
 
-class ShareOwner(models.Model):
+class ShareOwnerQuerySet(models.QuerySet):
+    def with_name(self, search_string: str):
+        searches = [s for s in search_string.split(" ") if s != ""]
+
+        combined_filters = Q(last_name__icontains="")
+        for search in searches:
+            word_filter = (
+                Q(last_name__unaccent__icontains=search)
+                | Q(first_name__unaccent__icontains=search)
+                | Q(usage_name__unaccent__icontains=search)
+                | Q(user__first_name__unaccent__icontains=search)
+                | Q(user__usage_name__unaccent__icontains=search)
+                | Q(user__last_name__unaccent__icontains=search)
+                | Q(company_name__unaccent__icontains=search)
+            )
+            combined_filters = combined_filters & word_filter
+
+        return self.filter(combined_filters)
+
+    def with_status(
+        self, status: str, at_datetime: datetime.datetime | datetime.date = None
+    ):
+        if at_datetime is None:
+            at_datetime = timezone.now()
+
+        at_datetime = ensure_datetime(at_datetime)
+
+        share_owners_with_nb_of_shares = NumberOfSharesService.annotate_share_owner_queryset_with_nb_of_active_shares(
+            ShareOwner.objects.all(), at_datetime.date()
+        )
+        members_without_shares = share_owners_with_nb_of_shares.filter(
+            **{NumberOfSharesService.ANNOTATION_NUMBER_OF_ACTIVE_SHARES: 0}
+        )
+        members_without_shares_ids = list(
+            members_without_shares.values_list("id", flat=True)
+        )
+
+        if status == MemberStatus.SOLD:
+            return self.filter(id__in=members_without_shares_ids).distinct()
+
+        members_with_valid_shares = self.exclude(id__in=members_without_shares_ids)
+
+        members_with_investing_annotation = InvestingStatusService.annotate_share_owner_queryset_with_investing_status_at_datetime(
+            ShareOwner.objects.all(), at_datetime
+        )
+        investing_members = members_with_investing_annotation.filter(
+            **{InvestingStatusService.ANNOTATION_WAS_INVESTING: True}
+        )
+        investing_members_ids = list(investing_members.values_list("id", flat=True))
+
+        if status == MemberStatus.INVESTING:
+            return members_with_valid_shares.filter(
+                id__in=investing_members_ids
+            ).distinct()
+
+        member_with_shares_and_not_investing: Self = members_with_valid_shares.exclude(
+            id__in=investing_members_ids
+        )
+
+        members_with_paused_annotation = (
+            MembershipPauseService.annotate_share_owner_queryset_with_has_active_pause(
+                ShareOwner.objects.all(), at_datetime.date()
+            )
+        )
+        paused_members = members_with_paused_annotation.filter(
+            **{MembershipPauseService.ANNOTATION_HAS_ACTIVE_PAUSE: True}
+        )
+        paused_members_ids = list(paused_members.values_list("id", flat=True))
+
+        if status == MemberStatus.PAUSED:
+            return member_with_shares_and_not_investing.filter(
+                id__in=paused_members_ids
+            ).distinct()
+
+        if status == MemberStatus.ACTIVE:
+            return member_with_shares_and_not_investing.exclude(
+                id__in=paused_members_ids
+            ).distinct()
+
+        raise TapirException(f"Invalid status : {status}")
+
+
+class ShareOwner(SoftDeleteMixin, models.Model):
     """ShareOwner represents a share_owner of a ShareOwnership.
 
     Usually, this is just a proxy for the associated user. However, it may also be used to
@@ -96,86 +179,8 @@ class Meta:
     )
     create_account_reminder_email_sent = models.BooleanField(default=False)
 
-    class ShareOwnerQuerySet(models.QuerySet):
-        def with_name(self, search_string: str):
-            searches = [s for s in search_string.split(" ") if s != ""]
-
-            combined_filters = Q(last_name__icontains="")
-            for search in searches:
-                word_filter = (
-                    Q(last_name__unaccent__icontains=search)
-                    | Q(first_name__unaccent__icontains=search)
-                    | Q(usage_name__unaccent__icontains=search)
-                    | Q(user__first_name__unaccent__icontains=search)
-                    | Q(user__usage_name__unaccent__icontains=search)
-                    | Q(user__last_name__unaccent__icontains=search)
-                    | Q(company_name__unaccent__icontains=search)
-                )
-                combined_filters = combined_filters & word_filter
-
-            return self.filter(combined_filters)
-
-        def with_status(
-            self, status: str, at_datetime: datetime.datetime | datetime.date = None
-        ):
-            if at_datetime is None:
-                at_datetime = timezone.now()
-
-            at_datetime = ensure_datetime(at_datetime)
-
-            share_owners_with_nb_of_shares = NumberOfSharesService.annotate_share_owner_queryset_with_nb_of_active_shares(
-                ShareOwner.objects.all(), at_datetime.date()
-            )
-            members_without_shares = share_owners_with_nb_of_shares.filter(
-                **{NumberOfSharesService.ANNOTATION_NUMBER_OF_ACTIVE_SHARES: 0}
-            )
-            members_without_shares_ids = list(
-                members_without_shares.values_list("id", flat=True)
-            )
-
-            if status == MemberStatus.SOLD:
-                return self.filter(id__in=members_without_shares_ids).distinct()
-
-            members_with_valid_shares = self.exclude(id__in=members_without_shares_ids)
-
-            members_with_investing_annotation = InvestingStatusService.annotate_share_owner_queryset_with_investing_status_at_datetime(
-                ShareOwner.objects.all(), at_datetime
-            )
-            investing_members = members_with_investing_annotation.filter(
-                **{InvestingStatusService.ANNOTATION_WAS_INVESTING: True}
-            )
-            investing_members_ids = list(investing_members.values_list("id", flat=True))
-
-            if status == MemberStatus.INVESTING:
-                return members_with_valid_shares.filter(
-                    id__in=investing_members_ids
-                ).distinct()
-
-            member_with_shares_and_not_investing: Self = (
-                members_with_valid_shares.exclude(id__in=investing_members_ids)
-            )
-
-            members_with_paused_annotation = MembershipPauseService.annotate_share_owner_queryset_with_has_active_pause(
-                ShareOwner.objects.all(), at_datetime.date()
-            )
-            paused_members = members_with_paused_annotation.filter(
-                **{MembershipPauseService.ANNOTATION_HAS_ACTIVE_PAUSE: True}
-            )
-            paused_members_ids = list(paused_members.values_list("id", flat=True))
-
-            if status == MemberStatus.PAUSED:
-                return member_with_shares_and_not_investing.filter(
-                    id__in=paused_members_ids
-                ).distinct()
-
-            if status == MemberStatus.ACTIVE:
-                return member_with_shares_and_not_investing.exclude(
-                    id__in=paused_members_ids
-                ).distinct()
-
-            raise TapirException(f"Invalid status : {status}")
-
-    objects = ShareOwnerQuerySet.as_manager()
+    # overwrite from Mixin:
+    objects = NonDeleted.from_queryset(ShareOwnerQuerySet)()
 
     def blank_info_fields(self):
         """Used after a ShareOwner is linked to a user, which is used as the source for user info instead."""
@@ -866,3 +871,10 @@ def populate(
         return super().populate_base(
             actor=actor, share_owner=model.share_owner, model=model
         )
+
+
+class DeleteShareOwnerLogEntry(ModelLogEntry):
+    template_name = "coop/log/delete_share_owner_log_entry.html"
+
+    def populate(self, share_owner: ShareOwner, actor, model):
+        return self.populate_base(share_owner=share_owner, actor=actor, model=model)

tapir/coop/templates/coop/log/delete_share_owner_log_entry.html

@@ -0,0 +1,4 @@
+{% load i18n %}
+{% blocktranslate %}
+Member has been deleted.
+{% endblocktranslate %}

tapir/coop/templates/coop/shareowner_confirm_delete.html

@@ -0,0 +1,32 @@
+{% extends "core/base.html" %}
+{% load utils %}
+{% load django_bootstrap5 %}
+{% load i18n %}
+{% load core %}
+{% block title %}
+    {% translate "Confirm Delete" %}: {% get_display_name_for_viewer object request.user %}
+{% endblock title %}
+{% block content %}
+    <div class="container">
+        <div class="card mb-2" id="share_owner_confirm_delete_card">
+            <h5 class="card-header">
+                <span>{% translate "Confirm Delete" %}: {% get_display_name_for_viewer object request.user %}</span>
+            </h5>
+            <div class="card-body">
+                <div class="alert alert-warning">{% translate "Are you sure you want to delete this member?" %}</div>
+                <p>
+                    {% translate "Please note that deleting this member will permanently remove their account and all associated data such as owned shares and payments. The deleted user will no longer be part of the cooperative. However, all shift records and logs will remain intact." %}
+                </p>
+                <form method="post">
+                    {% csrf_token %}
+                    <button type="submit" class="{% tapir_button_custom 'danger' %}">
+                        <span class="material-icons">delete</span>
+                        {% translate 'Delete' %}
+                    </button>
+                    <a href="{% url 'coop:shareowner_list' %}"
+                       class="{% tapir_button_link %}">{% translate 'Cancel' %}</a>
+                </form>
+            </div>
+        </div>
+    </div>
+{% endblock content %}

tapir/coop/templates/coop/tags/user_coop_share_ownership_list_tag.html

@@ -4,29 +4,38 @@
 {% load core %}
 <div class="card mb-2" id="user_coop_info_card">
     <h5 class="card-header d-flex justify-content-between align-items-center flex-wrap gap-2">
-        {% if share_owner %}
+        {% if share_owner and not share_owner.is_soft_deleted %}
             <span>
                 {% blocktranslate with coop_share_owner_id=share_owner.id %}
                     Member #{{ coop_share_owner_id }}
                 {% endblocktranslate %}
             </span>
-            {% if perms.accounts.manage %}
+            {% if perms.accounts.manage or perms.group.manage %}
                 <span class="d-flex justify-content-end flex-fill flex-wrap gap-2">
-                    <a class="{% tapir_button_link %}"
-                       href="{% url 'coop:shareowner_membership_confirmation' share_owner.pk %}">
-                        <span class="material-icons">file_present</span>{% translate 'Membership confirmation' %}
-                    </a>
-                    <a class="{% tapir_button_link_to_action %}"
-                       href="{% url 'coop:shareowner_update' share_owner.pk %}"
-                       id="share_owner_edit_button">
-                        <span class="material-icons">edit</span>{% translate 'Edit' %}
-                    </a>
+                    {% if perms.accounts.manage %}
+                        <a class="{% tapir_button_link %}"
+                           href="{% url 'coop:shareowner_membership_confirmation' share_owner.pk %}">
+                            <span class="material-icons">file_present</span>{% translate 'Membership confirmation' %}
+                        </a>
+                        <a class="{% tapir_button_link_to_action %}"
+                           href="{% url 'coop:shareowner_update' share_owner.pk %}"
+                           id="share_owner_edit_button">
+                            <span class="material-icons">edit</span>{% translate 'Edit' %}
+                        </a>
+                    {% endif %}
+                    {% if perms.group.manage %}
+                        <a class="{% tapir_button_custom 'outline-danger' %}"
+                           href="{% url 'coop:shareowner_delete' share_owner.pk %}"
+                           id="share_owner_delete_button">
+                            <span class="material-icons">delete</span>{% translate 'Delete' %}
+                        </a>
+                    {% endif %}
                 </span>
             {% endif %}
         {% endif %}
     </h5>
     <div class="card-body">
-        {% if share_owner %}
+        {% if share_owner and not share_owner.is_soft_deleted %}
             <div class="row m-1">
                 <div class="col-12 col-sm-5 fw-bold text-sm-end">{% translate "Status" %}:</div>
                 <div class="col-12 col-sm-7" id="share_owner_status">