feat: assign users to customers, projects and tasks

update serializers
create new through-tables for assigned users
update django-admin for user assignement

requirements.txt

@@ -12,6 +12,7 @@ pytz==2021.1
 pyexcel-webio==0.1.4
 pyexcel-io==0.6.4
 django-excel==0.0.10
+django-nested-inline==0.4.2
 pyexcel-ods3==0.6.0
 pyexcel-xlsx==0.6.0
 pyexcel-ezodf==0.3.4

timed/projects/admin.py

@@ -5,19 +5,34 @@
 from django.forms.models import BaseInlineFormSet
 from django.utils.translation import gettext_lazy as _
 
+from nested_inline.admin import NestedModelAdmin, NestedStackedInline
 from timed.forms import DurationInHoursField
 from timed.projects import models
 from timed.redmine.admin import RedmineProjectInline
 from timed.subscription.admin import CustomerPasswordInline
 
 
+class CustomerAssigneeInline(admin.TabularInline):
+    model = models.CustomerAssignee
+    extra = 0
+
+
+class ProjectAssigneeInline(admin.TabularInline):
+    model = models.ProjectAssignee
+    extra = 0
+
+class TaskAssigneeInline(NestedStackedInline):
+    model = models.TaskAssignee
+    extra = 1
+
+
 @admin.register(models.Customer)
 class CustomerAdmin(admin.ModelAdmin):
     """Customer admin view."""
 
     list_display = ["name"]
     search_fields = ["name"]
-    inlines = [CustomerPasswordInline]
+    inlines = [CustomerPasswordInline, CustomerAssigneeInline]
 
     def has_delete_permission(self, request, obj=None):
         return obj and not obj.projects.exists()
@@ -68,11 +83,12 @@ def __init__(self, *args, **kwargs):
             self.extra += len(self.initial)
 
 
-class TaskInline(admin.TabularInline):
+class TaskInline(NestedStackedInline):
     formset = TaskInlineFormset
     form = TaskForm
     model = models.Task
     extra = 0
+    inlines = [TaskAssigneeInline]
 
     def has_delete_permission(self, request, obj=None):
         # for some reason obj is parent object and not task
@@ -96,15 +112,15 @@ class ProjectForm(forms.ModelForm):
 
 
 @admin.register(models.Project)
-class ProjectAdmin(admin.ModelAdmin):
+class ProjectAdmin(NestedModelAdmin):
     """Project admin view."""
 
     form = ProjectForm
     list_display = ["name", "customer"]
     list_filter = ["customer"]
     search_fields = ["name", "customer__name"]
 
-    inlines = [TaskInline, ReviewerInline, RedmineProjectInline]
+    inlines = [TaskInline, ReviewerInline, RedmineProjectInline, ProjectAssigneeInline]
     exclude = ("reviewers",)
 
     def has_delete_permission(self, request, obj=None):

timed/projects/migrations/0011_auto_20210419_1459.py

@@ -0,0 +1,64 @@
+# Generated by Django 3.1.7 on 2021-04-19 12:59
+
+from django.conf import settings
+from django.db import migrations, models
+import django.db.models.deletion
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        migrations.swappable_dependency(settings.AUTH_USER_MODEL),
+        ('projects', '0010_project_billed'),
+    ]
+
+    operations = [
+        migrations.CreateModel(
+            name='TaskAssignee',
+            fields=[
+                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('is_resource', models.BooleanField(default=False)),
+                ('is_reviewer', models.BooleanField(default=False)),
+                ('is_manager', models.BooleanField(default=False)),
+                ('task', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='task_assignees', to='projects.task')),
+                ('user', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='task_assignees', to=settings.AUTH_USER_MODEL)),
+            ],
+        ),
+        migrations.CreateModel(
+            name='ProjectAssignee',
+            fields=[
+                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('is_resource', models.BooleanField(default=False)),
+                ('is_reviewer', models.BooleanField(default=False)),
+                ('is_manager', models.BooleanField(default=False)),
+                ('project', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='project_assignees', to='projects.project')),
+                ('user', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='project_assignees', to=settings.AUTH_USER_MODEL)),
+            ],
+        ),
+        migrations.CreateModel(
+            name='CustomerAssignee',
+            fields=[
+                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('is_resource', models.BooleanField(default=False)),
+                ('is_reviewer', models.BooleanField(default=False)),
+                ('is_manager', models.BooleanField(default=False)),
+                ('customer', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='customer_assignees', to='projects.customer')),
+                ('user', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='customer_assignees', to=settings.AUTH_USER_MODEL)),
+            ],
+        ),
+        migrations.AddField(
+            model_name='customer',
+            name='assignees',
+            field=models.ManyToManyField(related_name='assigned_to_customers', through='projects.CustomerAssignee', to=settings.AUTH_USER_MODEL),
+        ),
+        migrations.AddField(
+            model_name='project',
+            name='assignees',
+            field=models.ManyToManyField(related_name='assigned_to_projects', through='projects.ProjectAssignee', to=settings.AUTH_USER_MODEL),
+        ),
+        migrations.AddField(
+            model_name='task',
+            name='assignees',
+            field=models.ManyToManyField(related_name='assigned_to_tasks', through='projects.TaskAssignee', to=settings.AUTH_USER_MODEL),
+        ),
+    ]

timed/projects/models.py

@@ -18,6 +18,11 @@ class Customer(models.Model):
     website = models.URLField(blank=True)
     comment = models.TextField(blank=True)
     archived = models.BooleanField(default=False)
+    assignees = models.ManyToManyField(
+        settings.AUTH_USER_MODEL,
+        through="CustomerAssignee",
+        related_name="assigned_to_customers",
+    )
 
     def __str__(self):
         """Represent the model as a string.
@@ -97,6 +102,11 @@ class Project(models.Model):
     amount_invoiced = MoneyField(
         max_digits=10, decimal_places=2, default_currency="CHF", blank=True, null=True
     )
+    assignees = models.ManyToManyField(
+        settings.AUTH_USER_MODEL,
+        through="ProjectAssignee",
+        related_name="assigned_to_projects",
+    )
 
     def __str__(self):
         """Represent the model as a string.
@@ -137,6 +147,11 @@ class Task(models.Model):
     amount_invoiced = MoneyField(
         max_digits=10, decimal_places=2, default_currency="CHF", blank=True, null=True
     )
+    assignees = models.ManyToManyField(
+        settings.AUTH_USER_MODEL,
+        through="TaskAssignee",
+        related_name="assigned_to_tasks",
+    )
 
     def __str__(self):
         """Represent the model as a string.
@@ -171,3 +186,60 @@ def __str__(self):
 
     class Meta:
         ordering = ["name"]
+
+
+class CustomerAssignee(models.Model):
+    """Customer assignee model.
+
+    Customer assignee is an employee that is assigned to a specific customer.
+    """
+
+    user = models.ForeignKey(
+        settings.AUTH_USER_MODEL,
+        on_delete=models.CASCADE,
+        related_name="customer_assignees",
+    )
+    customer = models.ForeignKey(
+        "projects.Customer", on_delete=models.CASCADE, related_name="customer_assignees"
+    )
+    is_resource = models.BooleanField(default=False)
+    is_reviewer = models.BooleanField(default=False)
+    is_manager = models.BooleanField(default=False)
+
+
+class ProjectAssignee(models.Model):
+    """Project assignee model.
+
+    Project assignee is an employee that is assigned to a specific project.
+    """
+
+    user = models.ForeignKey(
+        settings.AUTH_USER_MODEL,
+        on_delete=models.CASCADE,
+        related_name="project_assignees",
+    )
+    project = models.ForeignKey(
+        "projects.Project", on_delete=models.CASCADE, related_name="project_assignees"
+    )
+    is_resource = models.BooleanField(default=False)
+    is_reviewer = models.BooleanField(default=False)
+    is_manager = models.BooleanField(default=False)
+
+
+class TaskAssignee(models.Model):
+    """Task assignee model.
+
+    Task assignee is an employee that is assigned to a specific task.
+    """
+
+    user = models.ForeignKey(
+        settings.AUTH_USER_MODEL,
+        on_delete=models.CASCADE,
+        related_name="task_assignees",
+    )
+    task = models.ForeignKey(
+        "projects.Task", on_delete=models.CASCADE, related_name="task_assignees"
+    )
+    is_resource = models.BooleanField(default=False)
+    is_reviewer = models.BooleanField(default=False)
+    is_manager = models.BooleanField(default=False)

timed/projects/serializers.py

@@ -13,11 +13,15 @@
 class CustomerSerializer(ModelSerializer):
     """Customer serializer."""
 
+    included_serializers = {
+        "assignees": "timed.employment.serializers.UserSerializer",
+    }
+
     class Meta:
         """Meta information for the customer serializer."""
 
         model = models.Customer
-        fields = ["name", "reference", "email", "website", "comment", "archived"]
+        fields = ["name", "reference", "email", "website", "comment", "archived", "assignees",]
 
 
 class BillingTypeSerializer(ModelSerializer):
@@ -43,6 +47,7 @@ class ProjectSerializer(ModelSerializer):
         "billing_type": "timed.projects.serializers.BillingTypeSerializer",
         "cost_center": "timed.projects.serializers.CostCenterSerializer",
         "reviewers": "timed.employment.serializers.UserSerializer",
+        "assignees": "timed.employment.serializers.UserSerializer",
     }
 
     def get_root_meta(self, resource, many):
@@ -77,6 +82,7 @@ class Meta:
             "cost_center",
             "reviewers",
             "customer_visible",
+            "assignees",
         ]
 
 
@@ -89,6 +95,7 @@ class TaskSerializer(ModelSerializer):
         "activities": "timed.tracking.serializers.ActivitySerializer",
         "project": "timed.projects.serializers.ProjectSerializer",
         "cost_center": "timed.projects.serializers.CostCenterSerializer",
+        "assignees": "timed.employment.serializers.UserSerializer",
     }
 
     def get_root_meta(self, resource, many):
@@ -111,4 +118,5 @@ class Meta:
             "archived",
             "project",
             "cost_center",
+            "assignees",
         ]

timed/settings.py

@@ -61,7 +61,11 @@ def default(default_dev=env.NOTSET, default_prod=env.NOTSET):
     "django_filters",
     "djmoney",
     "mozilla_django_oidc",
+<<<<<<< HEAD
     "django_prometheus",
+=======
+    "nested_inline",
+>>>>>>> feat: assign users to customers, projects and tasks
     "timed.employment",
     "timed.projects",
     "timed.tracking",