From 18acdde6e5420f15f1126be21b794281c742ddbc Mon Sep 17 00:00:00 2001 From: S4NKALP Date: Wed, 27 May 2026 23:33:20 +0545 Subject: [PATCH] =?UTF-8?q?feat(apps):=20add=20role=E2=80=91based=20Custom?= =?UTF-8?q?User=20admin=20and=20ticketing=20system?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - New Features * Introduce CustomUser with role field and admin integration * Add ProjectMembership model linking users to projects * Add Ticket model with status, type, creator, and project relationships * Register CustomUser and ProjectMembership in Django admin with list views * Add URLs and views for account management and ticket CRUD operations - Enhancements * Provide pagination and filtering for ticket listings * Improve admin UI with role‑specific fieldsets - Bug Fixes * Remove obsolete serializers and placeholder files --- apps/accounts/admin.py | 23 ++++++- apps/accounts/models.py | 33 +++++++++- apps/accounts/serializers.py | 5 -- apps/accounts/urls.py | 20 ++++-- apps/accounts/views.py | 52 +++++++++++++++- apps/activity/admin.py | 12 +++- apps/activity/models.py | 25 +++++++- apps/activity/serializers.py | 5 -- apps/activity/urls.py | 8 +-- apps/activity/views.py | 13 +++- apps/core/__init__.py | 0 apps/core/permissions.py | 42 +++++++++++++ apps/finance/admin.py | 32 +++++++++- apps/finance/models.py | 54 ++++++++++++++++- apps/finance/serializers.py | 5 -- apps/finance/urls.py | 24 ++++++-- apps/finance/views.py | 91 +++++++++++++++++++++++++++- apps/issues/admin.py | 22 ++++++- apps/issues/models.py | 52 +++++++++++++++- apps/issues/serializers.py | 5 -- apps/issues/urls.py | 18 ++++-- apps/issues/views.py | 67 +++++++++++++++++++- apps/kanban/admin.py | 31 +++++++++- apps/kanban/models.py | 57 +++++++++++++++++- apps/kanban/serializers.py | 5 -- apps/kanban/urls.py | 26 ++++++-- apps/kanban/views.py | 114 ++++++++++++++++++++++++++++++++++- apps/projects/admin.py | 11 +++- apps/projects/models.py | 32 +++++++++- apps/projects/serializers.py | 5 -- apps/projects/urls.py | 19 ++++-- apps/projects/views.py | 52 +++++++++++++++- apps/tickets/admin.py | 11 +++- apps/tickets/models.py | 38 +++++++++++- apps/tickets/serializers.py | 5 -- apps/tickets/urls.py | 16 +++-- apps/tickets/views.py | 50 ++++++++++++++- 37 files changed, 954 insertions(+), 126 deletions(-) delete mode 100644 apps/accounts/serializers.py delete mode 100644 apps/activity/serializers.py create mode 100644 apps/core/__init__.py create mode 100644 apps/core/permissions.py delete mode 100644 apps/finance/serializers.py delete mode 100644 apps/issues/serializers.py delete mode 100644 apps/kanban/serializers.py delete mode 100644 apps/projects/serializers.py delete mode 100644 apps/tickets/serializers.py diff --git a/apps/accounts/admin.py b/apps/accounts/admin.py index 0dc5f91..95c2664 100644 --- a/apps/accounts/admin.py +++ b/apps/accounts/admin.py @@ -1,5 +1,22 @@ -"""generated with djinit""" - from django.contrib import admin +from django.contrib.auth.admin import UserAdmin -# Register your models here. \ No newline at end of file +from apps.accounts.models import CustomUser, ProjectMembership + + +@admin.register(CustomUser) +class CustomUserAdmin(UserAdmin): + list_display = ["username", "email", "role", "is_active"] + list_filter = ["role", "is_active"] + fieldsets = UserAdmin.fieldsets + ( + ("Role Info", {"fields": ("role",)}), + ) + add_fieldsets = UserAdmin.add_fieldsets + ( + ("Role Info", {"fields": ("role",)}), + ) + + +@admin.register(ProjectMembership) +class ProjectMembershipAdmin(admin.ModelAdmin): + list_display = ["user", "project", "joined_at"] + list_filter = ["project"] diff --git a/apps/accounts/models.py b/apps/accounts/models.py index d7b9f75..93120d5 100644 --- a/apps/accounts/models.py +++ b/apps/accounts/models.py @@ -1,5 +1,32 @@ -"""generated with djinit""" - +from django.contrib.auth.models import AbstractUser from django.db import models -# Create your models here. \ No newline at end of file + +class CustomUser(AbstractUser): + class Role(models.TextChoices): + ADMIN = "admin", "Admin" + CLIENT = "client", "Client" + MEMBER = "member", "Team Member" + + role = models.CharField(max_length=20, choices=Role.choices, default=Role.MEMBER) + + def is_admin(self): + return self.role == self.Role.ADMIN + + def is_client(self): + return self.role == self.Role.CLIENT + + def is_member(self): + return self.role == self.Role.MEMBER + + +class ProjectMembership(models.Model): + user = models.ForeignKey(CustomUser, on_delete=models.CASCADE, related_name="memberships") + project = models.ForeignKey("projects.Project", on_delete=models.CASCADE, related_name="memberships") + joined_at = models.DateTimeField(auto_now_add=True) + + class Meta: + unique_together = ("user", "project") + + def __str__(self): + return f"{self.user} -> {self.project}" diff --git a/apps/accounts/serializers.py b/apps/accounts/serializers.py deleted file mode 100644 index fbcbed8..0000000 --- a/apps/accounts/serializers.py +++ /dev/null @@ -1,5 +0,0 @@ -"""generated with djinit""" - -from rest_framework import serializers - -# Create your serializers here. \ No newline at end of file diff --git a/apps/accounts/urls.py b/apps/accounts/urls.py index 8020533..21e449b 100644 --- a/apps/accounts/urls.py +++ b/apps/accounts/urls.py @@ -1,7 +1,19 @@ -"""generated with djinit""" - +from django.contrib.auth.views import LogoutView from django.urls import path +from apps.accounts.views import ( + CustomLoginView, + ProfileView, + RegisterView, + UserListView, + UserUpdateView, +) + urlpatterns = [ - # Add your URL patterns here -] \ No newline at end of file + path("accounts/login/", CustomLoginView.as_view(), name="login"), + path("accounts/logout/", LogoutView.as_view(), name="logout"), + path("accounts/register/", RegisterView.as_view(), name="register"), + path("accounts/profile/", ProfileView.as_view(), name="profile"), + path("accounts/users/", UserListView.as_view(), name="user_list"), + path("accounts/users//edit/", UserUpdateView.as_view(), name="user_edit"), +] diff --git a/apps/accounts/views.py b/apps/accounts/views.py index 6630beb..55b9128 100644 --- a/apps/accounts/views.py +++ b/apps/accounts/views.py @@ -1,5 +1,51 @@ -"""generated with djinit""" +from django.contrib.auth import login +from django.contrib.auth.mixins import LoginRequiredMixin +from django.contrib.auth.views import LoginView +from django.shortcuts import redirect +from django.urls import reverse_lazy +from django.views.generic import CreateView, DetailView, ListView, UpdateView -from rest_framework import viewsets +from apps.accounts.models import CustomUser +from apps.core.permissions import AdminRequiredMixin -# Create your views here. \ No newline at end of file + +class CustomLoginView(LoginView): + template_name = "pages/accounts/login.html" + redirect_authenticated_user = True + + +class RegisterView(CreateView): + model = CustomUser + template_name = "pages/accounts/register.html" + fields = ["username", "email", "password", "first_name", "last_name"] + success_url = reverse_lazy("home") + + def form_valid(self, form): + form.instance.set_password(form.cleaned_data["password"]) + form.instance.role = CustomUser.Role.CLIENT + response = super().form_valid(form) + login(self.request, self.object) + return response + + +class ProfileView(LoginRequiredMixin, DetailView): + model = CustomUser + template_name = "pages/accounts/profile.html" + context_object_name = "profile_user" + + def get_object(self): + return self.request.user + + +class UserListView(AdminRequiredMixin, ListView): + model = CustomUser + template_name = "pages/accounts/user_list.html" + context_object_name = "users" + paginate_by = 20 + + +class UserUpdateView(AdminRequiredMixin, UpdateView): + model = CustomUser + template_name = "pages/accounts/user_form.html" + fields = ["username", "email", "role", "first_name", "last_name", "is_active"] + success_url = reverse_lazy("user_list") diff --git a/apps/activity/admin.py b/apps/activity/admin.py index 0dc5f91..70fb70d 100644 --- a/apps/activity/admin.py +++ b/apps/activity/admin.py @@ -1,5 +1,11 @@ -"""generated with djinit""" - from django.contrib import admin -# Register your models here. \ No newline at end of file +from apps.activity.models import ActivityLog + + +@admin.register(ActivityLog) +class ActivityLogAdmin(admin.ModelAdmin): + list_display = ["actor", "verb", "content_type", "object_id", "timestamp"] + list_filter = ["verb", "timestamp"] + search_fields = ["actor__username", "verb"] + readonly_fields = ["actor", "verb", "content_type", "object_id", "timestamp"] diff --git a/apps/activity/models.py b/apps/activity/models.py index d7b9f75..583aed0 100644 --- a/apps/activity/models.py +++ b/apps/activity/models.py @@ -1,5 +1,24 @@ -"""generated with djinit""" - +from django.contrib.contenttypes.fields import GenericForeignKey +from django.contrib.contenttypes.models import ContentType from django.db import models -# Create your models here. \ No newline at end of file + +class ActivityLog(models.Model): + actor = models.ForeignKey( + "accounts.CustomUser", + on_delete=models.CASCADE, + related_name="activities", + ) + verb = models.CharField(max_length=255) + description = models.TextField(blank=True) + content_type = models.ForeignKey(ContentType, on_delete=models.CASCADE) + object_id = models.PositiveIntegerField() + content_object = GenericForeignKey("content_type", "object_id") + timestamp = models.DateTimeField(auto_now_add=True) + + class Meta: + verbose_name_plural = "activity logs" + ordering = ["-timestamp"] + + def __str__(self): + return f"{self.actor} {self.verb} {self.content_type} #{self.object_id}" diff --git a/apps/activity/serializers.py b/apps/activity/serializers.py deleted file mode 100644 index fbcbed8..0000000 --- a/apps/activity/serializers.py +++ /dev/null @@ -1,5 +0,0 @@ -"""generated with djinit""" - -from rest_framework import serializers - -# Create your serializers here. \ No newline at end of file diff --git a/apps/activity/urls.py b/apps/activity/urls.py index 8020533..b476044 100644 --- a/apps/activity/urls.py +++ b/apps/activity/urls.py @@ -1,7 +1,7 @@ -"""generated with djinit""" - from django.urls import path +from apps.activity.views import ActivityLogListView + urlpatterns = [ - # Add your URL patterns here -] \ No newline at end of file + path("activity/", ActivityLogListView.as_view(), name="activity_list"), +] diff --git a/apps/activity/views.py b/apps/activity/views.py index 6630beb..125430d 100644 --- a/apps/activity/views.py +++ b/apps/activity/views.py @@ -1,5 +1,12 @@ -"""generated with djinit""" +from django.views.generic import ListView -from rest_framework import viewsets +from apps.activity.models import ActivityLog +from apps.core.permissions import AdminRequiredMixin -# Create your views here. \ No newline at end of file + +class ActivityLogListView(AdminRequiredMixin, ListView): + model = ActivityLog + template_name = "pages/activity/activity_list.html" + context_object_name = "activities" + paginate_by = 50 + ordering = ["-timestamp"] diff --git a/apps/core/__init__.py b/apps/core/__init__.py new file mode 100644 index 0000000..e69de29 diff --git a/apps/core/permissions.py b/apps/core/permissions.py new file mode 100644 index 0000000..64518b9 --- /dev/null +++ b/apps/core/permissions.py @@ -0,0 +1,42 @@ +from django.contrib.auth.mixins import LoginRequiredMixin, UserPassesTestMixin +from django.core.exceptions import PermissionDenied +from django.shortcuts import get_object_or_404 + +from apps.projects.models import Project + + +class AdminRequiredMixin(LoginRequiredMixin, UserPassesTestMixin): + def test_func(self): + return self.request.user.is_admin() + + +class ClientOrAdminMixin(LoginRequiredMixin, UserPassesTestMixin): + def test_func(self): + user = self.request.user + return user.is_admin() or user.is_client() + + +class ProjectMemberMixin(LoginRequiredMixin, UserPassesTestMixin): + def test_func(self): + pk = self.kwargs.get("pk") or self.kwargs.get("project_pk") + if not pk: + return False + project = get_object_or_404(Project, pk=pk) + return project.members.filter(pk=self.request.user.pk).exists() + + +class ProjectMemberRequired: + def dispatch(self, request, *args, **kwargs): + project = get_object_or_404(Project, pk=kwargs.get("pk")) + if not project.members.filter(pk=request.user.pk).exists(): + raise PermissionDenied + return super().dispatch(request, *args, **kwargs) + + +def project_membership_required(view_func): + def wrapper(request, *args, **kwargs): + project = get_object_or_404(Project, pk=kwargs.get("pk")) + if not project.members.filter(pk=request.user.pk).exists(): + raise PermissionDenied + return view_func(request, *args, **kwargs) + return wrapper diff --git a/apps/finance/admin.py b/apps/finance/admin.py index 0dc5f91..cbec219 100644 --- a/apps/finance/admin.py +++ b/apps/finance/admin.py @@ -1,5 +1,31 @@ -"""generated with djinit""" - from django.contrib import admin -# Register your models here. \ No newline at end of file +from apps.finance.models import Expense, Invoice, Payment, TeamPayment + + +class PaymentInline(admin.TabularInline): + model = Payment + extra = 1 + + +@admin.register(Invoice) +class InvoiceAdmin(admin.ModelAdmin): + list_display = ["id", "project", "client", "amount", "due_date", "status"] + list_filter = ["status"] + inlines = [PaymentInline] + + +@admin.register(Payment) +class PaymentAdmin(admin.ModelAdmin): + list_display = ["invoice", "amount", "method", "paid_at"] + + +@admin.register(Expense) +class ExpenseAdmin(admin.ModelAdmin): + list_display = ["project", "category", "amount", "raised_by", "date"] + list_filter = ["category"] + + +@admin.register(TeamPayment) +class TeamPaymentAdmin(admin.ModelAdmin): + list_display = ["member", "period", "amount", "paid_at"] diff --git a/apps/finance/models.py b/apps/finance/models.py index d7b9f75..52acba9 100644 --- a/apps/finance/models.py +++ b/apps/finance/models.py @@ -1,5 +1,53 @@ -"""generated with djinit""" - from django.db import models -# Create your models here. \ No newline at end of file + +class Invoice(models.Model): + class Status(models.TextChoices): + PENDING = "pending" + PAID = "paid" + OVERDUE = "overdue" + + project = models.ForeignKey("projects.Project", on_delete=models.CASCADE, related_name="invoices") + client = models.ForeignKey("accounts.CustomUser", on_delete=models.CASCADE, related_name="invoices") + amount = models.DecimalField(max_digits=10, decimal_places=2) + due_date = models.DateField() + status = models.CharField(max_length=20, choices=Status.choices, default=Status.PENDING) + created_at = models.DateTimeField(auto_now_add=True) + updated_at = models.DateTimeField(auto_now=True) + + def __str__(self): + return f"Invoice #{self.id} - {self.amount}" + + +class Payment(models.Model): + invoice = models.ForeignKey(Invoice, on_delete=models.CASCADE, related_name="payments") + paid_at = models.DateTimeField() + method = models.CharField(max_length=100) + amount = models.DecimalField(max_digits=10, decimal_places=2) + reference = models.CharField(max_length=255, blank=True) + + def __str__(self): + return f"Payment {self.method} for Invoice #{self.invoice_id}" + + +class Expense(models.Model): + project = models.ForeignKey("projects.Project", on_delete=models.CASCADE, related_name="expenses") + raised_by = models.ForeignKey("accounts.CustomUser", on_delete=models.CASCADE, related_name="expenses") + amount = models.DecimalField(max_digits=10, decimal_places=2) + category = models.CharField(max_length=100) + description = models.TextField(blank=True) + date = models.DateField(auto_now_add=True) + + def __str__(self): + return f"{self.category} - {self.amount}" + + +class TeamPayment(models.Model): + member = models.ForeignKey("accounts.CustomUser", on_delete=models.CASCADE, related_name="team_payments") + period = models.DateField() + amount = models.DecimalField(max_digits=10, decimal_places=2) + paid_at = models.DateTimeField(null=True, blank=True) + notes = models.TextField(blank=True) + + def __str__(self): + return f"{self.member} - {self.period} - {self.amount}" diff --git a/apps/finance/serializers.py b/apps/finance/serializers.py deleted file mode 100644 index fbcbed8..0000000 --- a/apps/finance/serializers.py +++ /dev/null @@ -1,5 +0,0 @@ -"""generated with djinit""" - -from rest_framework import serializers - -# Create your serializers here. \ No newline at end of file diff --git a/apps/finance/urls.py b/apps/finance/urls.py index 8020533..c352694 100644 --- a/apps/finance/urls.py +++ b/apps/finance/urls.py @@ -1,7 +1,23 @@ -"""generated with djinit""" - from django.urls import path +from apps.finance.views import ( + ExpenseCreateView, + ExpenseListView, + InvoiceCreateView, + InvoiceDetailView, + InvoiceListView, + PaymentCreateView, + TeamPaymentCreateView, + TeamPaymentListView, +) + urlpatterns = [ - # Add your URL patterns here -] \ No newline at end of file + path("finance/invoices/", InvoiceListView.as_view(), name="invoice_list"), + path("finance/invoices/create/", InvoiceCreateView.as_view(), name="invoice_create"), + path("finance/invoices//", InvoiceDetailView.as_view(), name="invoice_detail"), + path("finance/payments/create/", PaymentCreateView.as_view(), name="payment_create"), + path("finance/expenses/", ExpenseListView.as_view(), name="expense_list"), + path("finance/expenses/create/", ExpenseCreateView.as_view(), name="expense_create"), + path("finance/team-payments/", TeamPaymentListView.as_view(), name="team_payment_list"), + path("finance/team-payments/create/", TeamPaymentCreateView.as_view(), name="team_payment_create"), +] diff --git a/apps/finance/views.py b/apps/finance/views.py index 6630beb..b617681 100644 --- a/apps/finance/views.py +++ b/apps/finance/views.py @@ -1,5 +1,90 @@ -"""generated with djinit""" +from django.contrib.auth.mixins import LoginRequiredMixin +from django.urls import reverse_lazy +from django.views.generic import CreateView, DetailView, ListView, UpdateView -from rest_framework import viewsets +from apps.core.permissions import AdminRequiredMixin +from apps.finance.models import Expense, Invoice, Payment, TeamPayment -# Create your views here. \ No newline at end of file + +class InvoiceListView(LoginRequiredMixin, ListView): + model = Invoice + template_name = "pages/finance/invoice_list.html" + context_object_name = "invoices" + + def get_queryset(self): + user = self.request.user + qs = Invoice.objects.select_related("project", "client") + if user.is_admin(): + return qs.all() + return qs.filter(client=user) + + +class InvoiceDetailView(LoginRequiredMixin, DetailView): + model = Invoice + template_name = "pages/finance/invoice_detail.html" + context_object_name = "invoice" + + def get_context_data(self, **kwargs): + context = super().get_context_data(**kwargs) + context["payments"] = self.object.payments.all() + return context + + +class InvoiceCreateView(AdminRequiredMixin, CreateView): + model = Invoice + template_name = "pages/finance/invoice_form.html" + fields = ["project", "client", "amount", "due_date"] + success_url = reverse_lazy("invoice_list") + + +class PaymentCreateView(AdminRequiredMixin, CreateView): + model = Payment + template_name = "pages/finance/payment_form.html" + fields = ["invoice", "paid_at", "method", "amount", "reference"] + success_url = reverse_lazy("invoice_list") + + +class ExpenseListView(LoginRequiredMixin, ListView): + model = Expense + template_name = "pages/finance/expense_list.html" + context_object_name = "expenses" + + def get_queryset(self): + user = self.request.user + qs = Expense.objects.select_related("project", "raised_by") + if user.is_admin(): + return qs.all() + return qs.filter(raised_by=user) + + +class ExpenseCreateView(LoginRequiredMixin, CreateView): + model = Expense + template_name = "pages/finance/expense_form.html" + fields = ["project", "amount", "category", "description"] + + def form_valid(self, form): + form.instance.raised_by = self.request.user + return super().form_valid(form) + + def get_success_url(self): + return reverse_lazy("expense_list") + + +class TeamPaymentListView(LoginRequiredMixin, ListView): + model = TeamPayment + template_name = "pages/finance/team_payment_list.html" + context_object_name = "payments" + + def get_queryset(self): + user = self.request.user + qs = TeamPayment.objects.select_related("member") + if user.is_admin(): + return qs.all() + return qs.filter(member=user) + + +class TeamPaymentCreateView(AdminRequiredMixin, CreateView): + model = TeamPayment + template_name = "pages/finance/team_payment_form.html" + fields = ["member", "period", "amount"] + success_url = reverse_lazy("team_payment_list") diff --git a/apps/issues/admin.py b/apps/issues/admin.py index 0dc5f91..d084d91 100644 --- a/apps/issues/admin.py +++ b/apps/issues/admin.py @@ -1,5 +1,21 @@ -"""generated with djinit""" - from django.contrib import admin -# Register your models here. \ No newline at end of file +from apps.issues.models import Issue, IssueComment + + +class IssueCommentInline(admin.TabularInline): + model = IssueComment + extra = 1 + + +@admin.register(Issue) +class IssueAdmin(admin.ModelAdmin): + list_display = ["title", "project", "status", "priority", "assignee", "created_at"] + list_filter = ["status", "priority"] + search_fields = ["title"] + inlines = [IssueCommentInline] + + +@admin.register(IssueComment) +class IssueCommentAdmin(admin.ModelAdmin): + list_display = ["issue", "author", "created_at"] diff --git a/apps/issues/models.py b/apps/issues/models.py index d7b9f75..2707e8e 100644 --- a/apps/issues/models.py +++ b/apps/issues/models.py @@ -1,5 +1,51 @@ -"""generated with djinit""" - from django.db import models -# Create your models here. \ No newline at end of file + +class Issue(models.Model): + class Status(models.TextChoices): + OPEN = "open" + IN_PROGRESS = "in_progress" + RESOLVED = "resolved" + CLOSED = "closed" + + class Priority(models.TextChoices): + LOW = "low" + MEDIUM = "medium" + HIGH = "high" + + project = models.ForeignKey( + "projects.Project", + on_delete=models.CASCADE, + related_name="issues", + ) + reporter = models.ForeignKey( + "accounts.CustomUser", + on_delete=models.CASCADE, + related_name="reported_issues", + ) + assignee = models.ForeignKey( + "accounts.CustomUser", + null=True, + blank=True, + on_delete=models.SET_NULL, + related_name="assigned_issues", + ) + title = models.CharField(max_length=255) + description = models.TextField(blank=True) + status = models.CharField(max_length=20, choices=Status.choices, default=Status.OPEN) + priority = models.CharField(max_length=20, choices=Priority.choices, default=Priority.MEDIUM) + created_at = models.DateTimeField(auto_now_add=True) + updated_at = models.DateTimeField(auto_now=True) + + def __str__(self): + return self.title + + +class IssueComment(models.Model): + issue = models.ForeignKey(Issue, on_delete=models.CASCADE, related_name="comments") + author = models.ForeignKey("accounts.CustomUser", on_delete=models.CASCADE) + body = models.TextField() + created_at = models.DateTimeField(auto_now_add=True) + + def __str__(self): + return f"Comment by {self.author} on {self.issue}" diff --git a/apps/issues/serializers.py b/apps/issues/serializers.py deleted file mode 100644 index fbcbed8..0000000 --- a/apps/issues/serializers.py +++ /dev/null @@ -1,5 +0,0 @@ -"""generated with djinit""" - -from rest_framework import serializers - -# Create your serializers here. \ No newline at end of file diff --git a/apps/issues/urls.py b/apps/issues/urls.py index 8020533..c710c8b 100644 --- a/apps/issues/urls.py +++ b/apps/issues/urls.py @@ -1,7 +1,17 @@ -"""generated with djinit""" - from django.urls import path +from apps.issues.views import ( + IssueCommentCreateView, + IssueCreateView, + IssueDetailView, + IssueListView, + IssueUpdateView, +) + urlpatterns = [ - # Add your URL patterns here -] \ No newline at end of file + path("issues/", IssueListView.as_view(), name="issue_list"), + path("issues/create/", IssueCreateView.as_view(), name="issue_create"), + path("issues//", IssueDetailView.as_view(), name="issue_detail"), + path("issues//edit/", IssueUpdateView.as_view(), name="issue_edit"), + path("issues//comments/", IssueCommentCreateView.as_view(), name="issue_comment"), +] diff --git a/apps/issues/views.py b/apps/issues/views.py index 6630beb..9c4d22f 100644 --- a/apps/issues/views.py +++ b/apps/issues/views.py @@ -1,5 +1,66 @@ -"""generated with djinit""" +from django.contrib.auth.mixins import LoginRequiredMixin +from django.shortcuts import get_object_or_404, render +from django.urls import reverse_lazy +from django.views.generic import CreateView, DetailView, ListView, UpdateView, View -from rest_framework import viewsets +from apps.issues.models import Issue, IssueComment -# Create your views here. \ No newline at end of file + +class IssueListView(LoginRequiredMixin, ListView): + model = Issue + template_name = "pages/issues/issue_list.html" + context_object_name = "issues" + paginate_by = 20 + + def get_queryset(self): + user = self.request.user + qs = Issue.objects.select_related("project", "assignee", "reporter") + if user.is_admin(): + return qs.all() + if user.is_client(): + return qs.filter(project__client=user) + return qs.filter(assignee=user) + + +class IssueDetailView(LoginRequiredMixin, DetailView): + model = Issue + template_name = "pages/issues/issue_detail.html" + context_object_name = "issue" + + def get_context_data(self, **kwargs): + context = super().get_context_data(**kwargs) + context["comments"] = self.object.comments.select_related("author").all() + return context + + +class IssueCreateView(LoginRequiredMixin, CreateView): + model = Issue + template_name = "pages/issues/issue_form.html" + fields = ["project", "title", "description", "priority", "assignee"] + + def form_valid(self, form): + form.instance.reporter = self.request.user + return super().form_valid(form) + + def get_success_url(self): + return reverse_lazy("issue_detail", kwargs={"pk": self.object.pk}) + + +class IssueUpdateView(LoginRequiredMixin, UpdateView): + model = Issue + template_name = "pages/issues/issue_form.html" + fields = ["title", "description", "status", "priority", "assignee"] + + def get_success_url(self): + return reverse_lazy("issue_detail", kwargs={"pk": self.object.pk}) + + +class IssueCommentCreateView(LoginRequiredMixin, View): + def post(self, request, issue_pk): + issue = get_object_or_404(Issue, pk=issue_pk) + body = request.POST.get("body", "") + if body: + IssueComment.objects.create(issue=issue, author=request.user, body=body) + if request.htmx: + return render(request, "partials/issues/comment_list.html", {"comments": issue.comments.all()}) + return render(request, "pages/issues/issue_detail.html", {"issue": issue, "comments": issue.comments.all()}) diff --git a/apps/kanban/admin.py b/apps/kanban/admin.py index 0dc5f91..2b3170f 100644 --- a/apps/kanban/admin.py +++ b/apps/kanban/admin.py @@ -1,5 +1,30 @@ -"""generated with djinit""" - from django.contrib import admin -# Register your models here. \ No newline at end of file +from apps.kanban.models import Board, Card, Column + + +class ColumnInline(admin.TabularInline): + model = Column + extra = 1 + + +class CardInline(admin.TabularInline): + model = Card + extra = 1 + + +@admin.register(Board) +class BoardAdmin(admin.ModelAdmin): + list_display = ["name", "owner", "project"] + inlines = [ColumnInline] + + +@admin.register(Column) +class ColumnAdmin(admin.ModelAdmin): + list_display = ["name", "board", "order"] + inlines = [CardInline] + + +@admin.register(Card) +class CardAdmin(admin.ModelAdmin): + list_display = ["title", "column", "due_date", "order"] diff --git a/apps/kanban/models.py b/apps/kanban/models.py index d7b9f75..4f794ba 100644 --- a/apps/kanban/models.py +++ b/apps/kanban/models.py @@ -1,5 +1,56 @@ -"""generated with djinit""" - from django.db import models -# Create your models here. \ No newline at end of file + +class BoardQuerySet(models.QuerySet): + def for_user(self, user): + return self.filter(owner=user) + + +class Board(models.Model): + owner = models.ForeignKey( + "accounts.CustomUser", + on_delete=models.CASCADE, + related_name="boards", + ) + project = models.ForeignKey( + "projects.Project", + null=True, + blank=True, + on_delete=models.CASCADE, + related_name="boards", + ) + name = models.CharField(max_length=255, default="My Board") + created_at = models.DateTimeField(auto_now_add=True) + + objects = BoardQuerySet.as_manager() + + def __str__(self): + return f"{self.name} ({self.owner})" + + +class Column(models.Model): + board = models.ForeignKey(Board, on_delete=models.CASCADE, related_name="columns") + name = models.CharField(max_length=100) + order = models.PositiveIntegerField(default=0) + + class Meta: + ordering = ["order"] + + def __str__(self): + return f"{self.name}" + + +class Card(models.Model): + column = models.ForeignKey(Column, on_delete=models.CASCADE, related_name="cards") + title = models.CharField(max_length=255) + description = models.TextField(blank=True) + due_date = models.DateField(null=True, blank=True) + order = models.PositiveIntegerField(default=0) + created_at = models.DateTimeField(auto_now_add=True) + updated_at = models.DateTimeField(auto_now=True) + + class Meta: + ordering = ["order"] + + def __str__(self): + return self.title diff --git a/apps/kanban/serializers.py b/apps/kanban/serializers.py deleted file mode 100644 index fbcbed8..0000000 --- a/apps/kanban/serializers.py +++ /dev/null @@ -1,5 +0,0 @@ -"""generated with djinit""" - -from rest_framework import serializers - -# Create your serializers here. \ No newline at end of file diff --git a/apps/kanban/urls.py b/apps/kanban/urls.py index 8020533..da21a8d 100644 --- a/apps/kanban/urls.py +++ b/apps/kanban/urls.py @@ -1,7 +1,25 @@ -"""generated with djinit""" - from django.urls import path +from apps.kanban.views import ( + BoardCreateView, + BoardDeleteView, + BoardDetailView, + BoardListView, + BoardUpdateView, + CardCreateView, + CardMoveView, + CardUpdateView, + ColumnCreateView, +) + urlpatterns = [ - # Add your URL patterns here -] \ No newline at end of file + path("boards/", BoardListView.as_view(), name="board_list"), + path("boards/create/", BoardCreateView.as_view(), name="board_create"), + path("boards//", BoardDetailView.as_view(), name="board_detail"), + path("boards//edit/", BoardUpdateView.as_view(), name="board_edit"), + path("boards//delete/", BoardDeleteView.as_view(), name="board_delete"), + path("boards//columns/create/", ColumnCreateView.as_view(), name="column_create"), + path("boards//columns//cards/create/", CardCreateView.as_view(), name="card_create"), + path("cards//edit/", CardUpdateView.as_view(), name="card_edit"), + path("cards//move/", CardMoveView.as_view(), name="card_move"), +] diff --git a/apps/kanban/views.py b/apps/kanban/views.py index 6630beb..aed8f9c 100644 --- a/apps/kanban/views.py +++ b/apps/kanban/views.py @@ -1,5 +1,113 @@ -"""generated with djinit""" +from django.contrib.auth.mixins import LoginRequiredMixin +from django.shortcuts import get_object_or_404, render +from django.urls import reverse_lazy +from django.views.generic import CreateView, DeleteView, DetailView, ListView, UpdateView, View -from rest_framework import viewsets +from apps.core.permissions import AdminRequiredMixin +from apps.kanban.models import Board, Card, Column -# Create your views here. \ No newline at end of file + +class BoardListView(LoginRequiredMixin, ListView): + model = Board + template_name = "pages/kanban/board_list.html" + context_object_name = "boards" + + def get_queryset(self): + user = self.request.user + if user.is_admin(): + return Board.objects.all() + return Board.objects.for_user(user) + + +class BoardDetailView(LoginRequiredMixin, DetailView): + model = Board + template_name = "pages/kanban/board_detail.html" + context_object_name = "board" + + def get_queryset(self): + user = self.request.user + if user.is_admin(): + return Board.objects.all() + return Board.objects.for_user(user) + + def get_context_data(self, **kwargs): + context = super().get_context_data(**kwargs) + context["columns"] = self.object.columns.all().prefetch_related("cards") + return context + + +class BoardCreateView(LoginRequiredMixin, CreateView): + model = Board + template_name = "pages/kanban/board_form.html" + fields = ["name", "project"] + + def form_valid(self, form): + form.instance.owner = self.request.user + return super().form_valid(form) + + def get_success_url(self): + return reverse_lazy("board_detail", kwargs={"pk": self.object.pk}) + + +class BoardUpdateView(LoginRequiredMixin, UpdateView): + model = Board + template_name = "pages/kanban/board_form.html" + fields = ["name", "project"] + + def get_success_url(self): + return reverse_lazy("board_detail", kwargs={"pk": self.object.pk}) + + +class BoardDeleteView(AdminRequiredMixin, DeleteView): + model = Board + template_name = "pages/kanban/board_confirm_delete.html" + success_url = reverse_lazy("board_list") + + +class ColumnCreateView(LoginRequiredMixin, CreateView): + model = Column + fields = ["name"] + + def form_valid(self, form): + board = get_object_or_404(Board, pk=self.kwargs["board_pk"]) + form.instance.board = board + form.instance.order = board.columns.count() + return super().form_valid(form) + + def get_success_url(self): + return reverse_lazy("board_detail", kwargs={"pk": self.kwargs["board_pk"]}) + + +class CardCreateView(LoginRequiredMixin, CreateView): + model = Card + fields = ["title", "description", "due_date"] + + def form_valid(self, form): + column = get_object_or_404(Column, pk=self.kwargs["column_pk"]) + form.instance.column = column + form.instance.order = column.cards.count() + return super().form_valid(form) + + def get_success_url(self): + return reverse_lazy("board_detail", kwargs={"pk": self.kwargs["board_pk"]}) + + +class CardUpdateView(LoginRequiredMixin, UpdateView): + model = Card + fields = ["title", "description", "due_date"] + template_name = "pages/kanban/card_form.html" + + def get_success_url(self): + return reverse_lazy("board_detail", kwargs={"pk": self.object.column.board.pk}) + + +class CardMoveView(LoginRequiredMixin, View): + def post(self, request, pk): + card = get_object_or_404(Card, pk=pk) + new_column_id = request.POST.get("column_id") + new_order = request.POST.get("order", 0) + if new_column_id: + card.column_id = new_column_id + card.order = new_order + card.save() + return render(request, "partials/kanban/card.html", {"card": card}) diff --git a/apps/projects/admin.py b/apps/projects/admin.py index 0dc5f91..7933a69 100644 --- a/apps/projects/admin.py +++ b/apps/projects/admin.py @@ -1,5 +1,10 @@ -"""generated with djinit""" - from django.contrib import admin -# Register your models here. \ No newline at end of file +from apps.projects.models import Project + + +@admin.register(Project) +class ProjectAdmin(admin.ModelAdmin): + list_display = ["name", "client", "status", "created_at"] + list_filter = ["status"] + search_fields = ["name"] diff --git a/apps/projects/models.py b/apps/projects/models.py index d7b9f75..5f06acc 100644 --- a/apps/projects/models.py +++ b/apps/projects/models.py @@ -1,5 +1,31 @@ -"""generated with djinit""" - from django.db import models -# Create your models here. \ No newline at end of file + +class Project(models.Model): + class Status(models.TextChoices): + PLANNING = "planning" + ACTIVE = "active" + REVIEW = "review" + DONE = "done" + + name = models.CharField(max_length=255) + client = models.ForeignKey( + "accounts.CustomUser", + on_delete=models.CASCADE, + related_name="client_projects", + ) + status = models.CharField( + max_length=20, + choices=Status.choices, + default=Status.PLANNING, + ) + members = models.ManyToManyField( + "accounts.CustomUser", + through="accounts.ProjectMembership", + related_name="projects", + ) + created_at = models.DateTimeField(auto_now_add=True) + updated_at = models.DateTimeField(auto_now=True) + + def __str__(self): + return self.name diff --git a/apps/projects/serializers.py b/apps/projects/serializers.py deleted file mode 100644 index fbcbed8..0000000 --- a/apps/projects/serializers.py +++ /dev/null @@ -1,5 +0,0 @@ -"""generated with djinit""" - -from rest_framework import serializers - -# Create your serializers here. \ No newline at end of file diff --git a/apps/projects/urls.py b/apps/projects/urls.py index 8020533..975e792 100644 --- a/apps/projects/urls.py +++ b/apps/projects/urls.py @@ -1,7 +1,18 @@ -"""generated with djinit""" - from django.urls import path +from apps.projects.views import ( + ProjectCreateView, + ProjectDeleteView, + ProjectDetailView, + ProjectListView, + ProjectUpdateView, +) + urlpatterns = [ - # Add your URL patterns here -] \ No newline at end of file + path("", ProjectListView.as_view(), name="home"), + path("projects/", ProjectListView.as_view(), name="project_list"), + path("projects//", ProjectDetailView.as_view(), name="project_detail"), + path("projects/create/", ProjectCreateView.as_view(), name="project_create"), + path("projects//edit/", ProjectUpdateView.as_view(), name="project_edit"), + path("projects//delete/", ProjectDeleteView.as_view(), name="project_delete"), +] diff --git a/apps/projects/views.py b/apps/projects/views.py index 6630beb..b558d00 100644 --- a/apps/projects/views.py +++ b/apps/projects/views.py @@ -1,5 +1,51 @@ -"""generated with djinit""" +from django.contrib.auth.mixins import LoginRequiredMixin +from django.urls import reverse_lazy +from django.views.generic import CreateView, DeleteView, DetailView, ListView, UpdateView -from rest_framework import viewsets +from apps.core.permissions import AdminRequiredMixin +from apps.projects.models import Project -# Create your views here. \ No newline at end of file + +class ProjectListView(LoginRequiredMixin, ListView): + model = Project + template_name = "pages/projects/project_list.html" + context_object_name = "projects" + paginate_by = 20 + + def get_queryset(self): + user = self.request.user + if user.is_admin(): + return Project.objects.all() + return Project.objects.filter(members=user) + + +class ProjectDetailView(LoginRequiredMixin, DetailView): + model = Project + template_name = "pages/projects/project_detail.html" + context_object_name = "project" + + def get_queryset(self): + user = self.request.user + if user.is_admin(): + return Project.objects.all() + return Project.objects.filter(members=user) + + +class ProjectCreateView(AdminRequiredMixin, CreateView): + model = Project + template_name = "pages/projects/project_form.html" + fields = ["name", "client", "status", "members"] + success_url = reverse_lazy("project_list") + + +class ProjectUpdateView(AdminRequiredMixin, UpdateView): + model = Project + template_name = "pages/projects/project_form.html" + fields = ["name", "client", "status", "members"] + success_url = reverse_lazy("project_list") + + +class ProjectDeleteView(AdminRequiredMixin, DeleteView): + model = Project + template_name = "pages/projects/project_confirm_delete.html" + success_url = reverse_lazy("project_list") diff --git a/apps/tickets/admin.py b/apps/tickets/admin.py index 0dc5f91..258939c 100644 --- a/apps/tickets/admin.py +++ b/apps/tickets/admin.py @@ -1,5 +1,10 @@ -"""generated with djinit""" - from django.contrib import admin -# Register your models here. \ No newline at end of file +from apps.tickets.models import Ticket + + +@admin.register(Ticket) +class TicketAdmin(admin.ModelAdmin): + list_display = ["title", "creator", "ticket_type", "status", "project", "created_at"] + list_filter = ["ticket_type", "status"] + search_fields = ["title"] diff --git a/apps/tickets/models.py b/apps/tickets/models.py index d7b9f75..e923fe5 100644 --- a/apps/tickets/models.py +++ b/apps/tickets/models.py @@ -1,5 +1,37 @@ -"""generated with djinit""" - from django.db import models -# Create your models here. \ No newline at end of file + +class Ticket(models.Model): + class TicketType(models.TextChoices): + BUG = "bug" + FEATURE = "feature_request" + SUPPORT = "support" + + class Status(models.TextChoices): + NEW = "new" + ACKNOWLEDGED = "acknowledged" + IN_PROGRESS = "in_progress" + DONE = "done" + REJECTED = "rejected" + + creator = models.ForeignKey( + "accounts.CustomUser", + on_delete=models.CASCADE, + related_name="created_tickets", + ) + project = models.ForeignKey( + "projects.Project", + null=True, + blank=True, + on_delete=models.CASCADE, + related_name="tickets", + ) + title = models.CharField(max_length=255) + description = models.TextField(blank=True) + ticket_type = models.CharField(max_length=30, choices=TicketType.choices, default=TicketType.SUPPORT) + status = models.CharField(max_length=30, choices=Status.choices, default=Status.NEW) + created_at = models.DateTimeField(auto_now_add=True) + updated_at = models.DateTimeField(auto_now=True) + + def __str__(self): + return f"[{self.ticket_type}] {self.title}" diff --git a/apps/tickets/serializers.py b/apps/tickets/serializers.py deleted file mode 100644 index fbcbed8..0000000 --- a/apps/tickets/serializers.py +++ /dev/null @@ -1,5 +0,0 @@ -"""generated with djinit""" - -from rest_framework import serializers - -# Create your serializers here. \ No newline at end of file diff --git a/apps/tickets/urls.py b/apps/tickets/urls.py index 8020533..6e877e8 100644 --- a/apps/tickets/urls.py +++ b/apps/tickets/urls.py @@ -1,7 +1,15 @@ -"""generated with djinit""" - from django.urls import path +from apps.tickets.views import ( + TicketCreateView, + TicketDetailView, + TicketListView, + TicketUpdateView, +) + urlpatterns = [ - # Add your URL patterns here -] \ No newline at end of file + path("tickets/", TicketListView.as_view(), name="ticket_list"), + path("tickets/create/", TicketCreateView.as_view(), name="ticket_create"), + path("tickets//", TicketDetailView.as_view(), name="ticket_detail"), + path("tickets//edit/", TicketUpdateView.as_view(), name="ticket_edit"), +] diff --git a/apps/tickets/views.py b/apps/tickets/views.py index 6630beb..11512ac 100644 --- a/apps/tickets/views.py +++ b/apps/tickets/views.py @@ -1,5 +1,49 @@ -"""generated with djinit""" +from django.contrib.auth.mixins import LoginRequiredMixin +from django.urls import reverse_lazy +from django.views.generic import CreateView, DetailView, ListView, UpdateView -from rest_framework import viewsets +from apps.tickets.models import Ticket -# Create your views here. \ No newline at end of file + +class TicketListView(LoginRequiredMixin, ListView): + model = Ticket + template_name = "pages/tickets/ticket_list.html" + context_object_name = "tickets" + paginate_by = 20 + + def get_queryset(self): + user = self.request.user + qs = Ticket.objects.select_related("creator", "project") + if user.is_admin(): + return qs.all() + if user.is_client(): + return qs.filter(creator=user) + return qs.filter(project__members=user) + + +class TicketDetailView(LoginRequiredMixin, DetailView): + model = Ticket + template_name = "pages/tickets/ticket_detail.html" + context_object_name = "ticket" + + +class TicketCreateView(LoginRequiredMixin, CreateView): + model = Ticket + template_name = "pages/tickets/ticket_form.html" + fields = ["project", "title", "description", "ticket_type"] + + def form_valid(self, form): + form.instance.creator = self.request.user + return super().form_valid(form) + + def get_success_url(self): + return reverse_lazy("ticket_detail", kwargs={"pk": self.object.pk}) + + +class TicketUpdateView(LoginRequiredMixin, UpdateView): + model = Ticket + template_name = "pages/tickets/ticket_form.html" + fields = ["title", "description", "ticket_type", "status"] + + def get_success_url(self): + return reverse_lazy("ticket_detail", kwargs={"pk": self.object.pk})