Merge pull request #195 from pneumaticapp/backend/users/45646__implementing_hierarchy_users

45646 backend [ users ] Implementing a hierarchy of users

Author: EBirkenfeld

backend/src/accounts/messages.py

@@ -110,3 +110,5 @@
 MSG_A_0052 = _('The vacation is not active.')
 MSG_A_0053 = _('The status is already active.')
 MSG_A_0054 = _('The end date must be after the start date.')
+MSG_A_0055 = _('A user cannot be their own manager.')
+MSG_A_0056 = _('This assignment would create a circular management hierarchy.')

backend/src/accounts/migrations/0143_user_manager.py

@@ -0,0 +1,20 @@
+# Generated by Django 2.2 on 2026-04-01 13:05
+
+from django.conf import settings
+from django.db import migrations, models
+import django.db.models.deletion
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('accounts', '0142_vacation_fields'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='user',
+            name='manager',
+            field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='subordinates', to=settings.AUTH_USER_MODEL, verbose_name='Manager'),
+        ),
+    ]

backend/src/accounts/models.py

@@ -450,6 +450,14 @@ class Meta:
     )
     is_admin = models.BooleanField(default=True)
     is_account_owner = models.BooleanField(default=False)
+    manager = models.ForeignKey(
+        'self',
+        on_delete=models.SET_NULL,
+        null=True,
+        blank=True,
+        related_name='subordinates',
+        verbose_name='Manager',
+    )
 
     notify_about_tasks = models.BooleanField(default=True)
     is_digest_subscriber = models.BooleanField(default=True)

backend/src/accounts/serializers/user.py

@@ -31,6 +31,7 @@
     UserListInviteSerializer,
 )
 from src.generics.fields import (
+    AccountPrimaryKeyRelatedField,
     CommaSeparatedListField,
     DateFormatField,
     RelatedListField,
@@ -87,6 +88,8 @@ class Meta:
             'invite',
             'groups',
             'password',
+            'manager_id',
+            'subordinates_ids',
             'vacation',
         )
         read_only_fields = (
@@ -111,6 +114,18 @@ class Meta:
     date_fmt = DateFormatField(required=False)
     invite = serializers.SerializerMethodField(allow_null=True, read_only=True)
     password = serializers.CharField(write_only=True, required=False)
+    manager_id = AccountPrimaryKeyRelatedField(
+        queryset=UserModel.objects,
+        required=False,
+        allow_null=True,
+        source='manager',
+    )
+    subordinates_ids = AccountPrimaryKeyRelatedField(
+        many=True,
+        queryset=UserModel.objects,
+        required=False,
+        source='subordinates',
+    )
     vacation = VacationSerializer(read_only=True)
 
     def get_invite(self, instance: UserModel):
@@ -282,8 +297,16 @@ class Meta:
             'photo',
             'is_admin',
             'is_account_owner',
+            'manager_id',
+            'subordinates_ids',
         )
 
+    subordinates_ids = serializers.PrimaryKeyRelatedField(
+        many=True,
+        read_only=True,
+        source='subordinates',
+    )
+
 
 class VacationActivateSerializer(
     CustomValidationErrorMixin,