feat(pricing): add workspace user rates and price units

This commit is contained in:
2026-04-26 10:19:04 +03:30
parent f960ca8221
commit fadf898486
19 changed files with 731 additions and 266 deletions

View File

@@ -1,12 +1,10 @@
from rest_framework import serializers
from core.serializers.base import BaseModelSerializer
from apps.projects.models import (
Project,
ProjectMembership,
ProjectRate,
ProjectUserRate,
)
from core.serializers.mini import UserMiniSerializer
from rest_framework import serializers
from core.serializers.base import BaseModelSerializer
from apps.projects.models import (
Project,
ProjectMembership,
)
from core.serializers.mini import UserMiniSerializer
class ProjectMemberInputSerializer(serializers.Serializer):
@@ -94,52 +92,6 @@ class ProjectMembershipCreateSerializer(serializers.Serializer):
role = serializers.ChoiceField(choices=ProjectMembership.Role.choices)
class ProjectMembershipUpdateSerializer(serializers.Serializer):
role = serializers.ChoiceField(choices=ProjectMembership.Role.choices, required=False)
is_active = serializers.BooleanField(required=False)
class ProjectRateSerializer(BaseModelSerializer):
class Meta:
model = ProjectRate
fields = BaseModelSerializer.Meta.fields + (
"project",
"hourly_rate",
"currency",
)
read_only_fields = fields
class ProjectRateCreateSerializer(serializers.Serializer):
project_id = serializers.UUIDField()
hourly_rate = serializers.DecimalField(max_digits=10, decimal_places=2)
currency = serializers.CharField(max_length=3, default="USD")
class ProjectRateUpdateSerializer(serializers.Serializer):
hourly_rate = serializers.DecimalField(max_digits=10, decimal_places=2, required=False)
currency = serializers.CharField(max_length=3, required=False)
class ProjectUserRateSerializer(BaseModelSerializer):
class Meta:
model = ProjectUserRate
fields = BaseModelSerializer.Meta.fields + (
"project",
"user",
"hourly_rate",
"currency",
)
read_only_fields = fields
class ProjectUserRateCreateSerializer(serializers.Serializer):
project_id = serializers.UUIDField()
user_id = serializers.UUIDField()
hourly_rate = serializers.DecimalField(max_digits=10, decimal_places=2)
currency = serializers.CharField(max_length=3, default="USD")
class ProjectUserRateUpdateSerializer(serializers.Serializer):
hourly_rate = serializers.DecimalField(max_digits=10, decimal_places=2, required=False)
currency = serializers.CharField(max_length=3, required=False)
class ProjectMembershipUpdateSerializer(serializers.Serializer):
role = serializers.ChoiceField(choices=ProjectMembership.Role.choices, required=False)
is_active = serializers.BooleanField(required=False)

View File

@@ -1,21 +1,17 @@
from django.urls import path, include
from rest_framework.routers import DefaultRouter
from apps.projects.api.views import (
ProjectViewSet,
ProjectMembershipViewSet,
ProjectRateViewSet,
ProjectUserRateViewSet
)
from apps.projects.api.views import (
ProjectViewSet,
ProjectMembershipViewSet,
)
app_name = "projects"
router = DefaultRouter()
router.register(r"projects", ProjectViewSet, basename="project")
router.register(r"memberships", ProjectMembershipViewSet, basename="membership")
router.register(r"rates", ProjectRateViewSet, basename="rate")
router.register(r"user-rates", ProjectUserRateViewSet, basename="user-rate")
urlpatterns = [
path("", include(router.urls)),
]
router = DefaultRouter()
router.register(r"projects", ProjectViewSet, basename="project")
router.register(r"memberships", ProjectMembershipViewSet, basename="membership")
urlpatterns = [
path("", include(router.urls)),
]

View File

@@ -20,28 +20,20 @@ from apps.notifications.services import (
from apps.workspaces.models import Workspace
from apps.clients.models import Client
from apps.projects.models import (
Project,
ProjectMembership,
ProjectRate,
ProjectUserRate,
)
from apps.projects.api.serializers import (
ProjectSerializer, ProjectCreateSerializer, ProjectUpdateSerializer,
ProjectMembershipSerializer, ProjectMembershipCreateSerializer, ProjectMembershipUpdateSerializer,
ProjectRateSerializer, ProjectRateCreateSerializer, ProjectRateUpdateSerializer,
ProjectUserRateSerializer, ProjectUserRateCreateSerializer, ProjectUserRateUpdateSerializer
)
Project,
ProjectMembership,
)
from apps.projects.api.serializers import (
ProjectSerializer, ProjectCreateSerializer, ProjectUpdateSerializer,
ProjectMembershipSerializer, ProjectMembershipCreateSerializer, ProjectMembershipUpdateSerializer,
)
from apps.projects.api.permissions import IsProjectMember, IsProjectManager
from apps.projects.services.projects import (
from apps.projects.services.projects import (
create_project,
update_project,
toggle_project_archive
)
from apps.projects.services.memberships import add_project_member, update_project_member
from apps.projects.services.rates import (
create_project_rate, update_project_rate,
create_project_user_rate, update_project_user_rate
toggle_project_archive
)
from apps.projects.services.memberships import add_project_member, update_project_member
from apps.workspaces.services import (
PROJECTS_ARCHIVE,
PROJECTS_CREATE,
@@ -267,7 +259,7 @@ class BaseProjectNestedViewSet(ModelViewSet):
raise PermissionDenied("You must be a project manager to perform this action.")
class ProjectMembershipViewSet(BaseProjectNestedViewSet):
class ProjectMembershipViewSet(BaseProjectNestedViewSet):
filterset_fields = ["project", "user", "role", "is_active"]
def get_queryset(self):
@@ -363,96 +355,3 @@ class ProjectMembershipViewSet(BaseProjectNestedViewSet):
role=role,
)
return Response(status=status.HTTP_204_NO_CONTENT)
class ProjectRateViewSet(BaseProjectNestedViewSet):
filterset_fields = ["project", "currency"]
def get_queryset(self):
if not self.request.user.is_authenticated: return ProjectRate.objects.none()
return ProjectRate.objects.filter(
project__memberships__user=self.request.user,
project__memberships__is_active=True,
is_deleted=False
).distinct()
def get_serializer_class(self):
if self.action == "create": return ProjectRateCreateSerializer
if self.action in ["update", "partial_update"]: return ProjectRateUpdateSerializer
return ProjectRateSerializer
def create(self, request, *args, **kwargs):
serializer = self.get_serializer(data=request.data)
serializer.is_valid(raise_exception=True)
project_id = serializer.validated_data["project_id"]
self.verify_manager_access(project_id)
project = get_object_or_404(Project, id=project_id, is_deleted=False)
rate = create_project_rate(
project=project,
hourly_rate=serializer.validated_data["hourly_rate"],
currency=serializer.validated_data.get("currency", "USD")
)
return Response(ProjectRateSerializer(rate).data, status=status.HTTP_201_CREATED)
def update(self, request, *args, **kwargs):
rate = self.get_object()
serializer = self.get_serializer(data=request.data, partial=kwargs.pop("partial", False))
serializer.is_valid(raise_exception=True)
updated_rate = update_project_rate(rate, **serializer.validated_data)
return Response(ProjectRateSerializer(updated_rate).data, status=status.HTTP_200_OK)
def destroy(self, request, *args, **kwargs):
rate = self.get_object()
rate.is_deleted = True
rate.save(update_fields=["is_deleted", "updated_at"])
return Response(status=status.HTTP_204_NO_CONTENT)
class ProjectUserRateViewSet(BaseProjectNestedViewSet):
filterset_fields = ["project", "user", "currency"]
def get_queryset(self):
if not self.request.user.is_authenticated: return ProjectUserRate.objects.none()
return ProjectUserRate.objects.filter(
project__memberships__user=self.request.user,
project__memberships__is_active=True,
is_deleted=False
).distinct()
def get_serializer_class(self):
if self.action == "create": return ProjectUserRateCreateSerializer
if self.action in ["update", "partial_update"]: return ProjectUserRateUpdateSerializer
return ProjectUserRateSerializer
def create(self, request, *args, **kwargs):
serializer = self.get_serializer(data=request.data)
serializer.is_valid(raise_exception=True)
project_id = serializer.validated_data["project_id"]
self.verify_manager_access(project_id)
project = get_object_or_404(Project, id=project_id, is_deleted=False)
user_rate = create_project_user_rate(
project=project,
user_id=serializer.validated_data["user_id"],
hourly_rate=serializer.validated_data["hourly_rate"],
currency=serializer.validated_data.get("currency", "USD")
)
return Response(ProjectUserRateSerializer(user_rate).data, status=status.HTTP_201_CREATED)
def update(self, request, *args, **kwargs):
user_rate = self.get_object()
serializer = self.get_serializer(data=request.data, partial=kwargs.pop("partial", False))
serializer.is_valid(raise_exception=True)
updated_user_rate = update_project_user_rate(user_rate, **serializer.validated_data)
return Response(ProjectUserRateSerializer(updated_user_rate).data, status=status.HTTP_200_OK)
def destroy(self, request, *args, **kwargs):
user_rate = self.get_object()
user_rate.is_deleted = True
user_rate.save(update_fields=["is_deleted", "updated_at"])
return Response(status=status.HTTP_204_NO_CONTENT)

View File

@@ -1,42 +0,0 @@
from apps.projects.models import ProjectRate, ProjectUserRate
def create_project_rate(project, hourly_rate, currency="USD"):
return ProjectRate.objects.create(
project=project,
hourly_rate=hourly_rate,
currency=currency
)
def update_project_rate(rate_instance, **kwargs):
update_fields = []
for field, value in kwargs.items():
if hasattr(rate_instance, field) and getattr(rate_instance, field) != value:
setattr(rate_instance, field, value)
update_fields.append(field)
if update_fields:
update_fields.append("updated_at")
rate_instance.save(update_fields=update_fields)
return rate_instance
def create_project_user_rate(project, user_id, hourly_rate, currency="USD"):
return ProjectUserRate.objects.create(
project=project,
user_id=user_id,
hourly_rate=hourly_rate,
currency=currency
)
def update_project_user_rate(user_rate_instance, **kwargs):
update_fields = []
for field, value in kwargs.items():
if hasattr(user_rate_instance, field) and getattr(user_rate_instance, field) != value:
setattr(user_rate_instance, field, value)
update_fields.append(field)
if update_fields:
update_fields.append("updated_at")
user_rate_instance.save(update_fields=update_fields)
return user_rate_instance