diff --git a/crm_core/views.py b/crm_core/views.py index d07665b..5250949 100644 --- a/crm_core/views.py +++ b/crm_core/views.py @@ -1,9 +1,9 @@ from decimal import Decimal +from django.db import transaction, models from rest_framework import viewsets, status from rest_framework.decorators import action from rest_framework.response import Response from rest_framework.permissions import IsAuthenticated -from rest_framework.exceptions import ValidationError from .models import Account, Contact, Lead, Opportunity, Activity from .serializers import ( @@ -11,29 +11,63 @@ from .serializers import ( OpportunitySerializer, ActivitySerializer, LeadConvertSerializer ) from .services import convert_lead +from openforce.permissions import ScopedOwnerAccessPermission -class AccountViewSet(viewsets.ModelViewSet): - permission_classes = [IsAuthenticated] - queryset = Account.objects.all().order_by('-created_at') +class ScopedQuerySetMixin: + permission_classes = [IsAuthenticated, ScopedOwnerAccessPermission] + + def get_queryset(self): + qs = super().get_queryset() + user = self.request.user + if not user or not user.is_authenticated: + return qs.none() + if user.is_superuser or user.is_staff: + return qs + if hasattr(self.queryset.model, 'owner'): + return qs.filter(owner=user) + if hasattr(self.queryset.model, 'assigned_to'): + return qs.filter(assigned_to=user) + return qs + + +class AccountViewSet(ScopedQuerySetMixin, viewsets.ModelViewSet): + queryset = Account.objects.all() serializer_class = AccountSerializer - search_fields = ['name', 'industry'] + + def perform_create(self, serializer): + with transaction.atomic(): + serializer.save(owner=self.request.user) + + def perform_update(self, serializer): + with transaction.atomic(): + serializer.save() -class ContactViewSet(viewsets.ModelViewSet): - permission_classes = [IsAuthenticated] - queryset = Contact.objects.all().order_by('-created_at') +class ContactViewSet(ScopedQuerySetMixin, viewsets.ModelViewSet): + queryset = Contact.objects.all() serializer_class = ContactSerializer - filterset_fields = ['account', 'lead_source'] - search_fields = ['first_name', 'last_name', 'email'] + + def perform_create(self, serializer): + with transaction.atomic(): + serializer.save(owner=self.request.user) + + def perform_update(self, serializer): + with transaction.atomic(): + serializer.save() -class LeadViewSet(viewsets.ModelViewSet): - permission_classes = [IsAuthenticated] - queryset = Lead.objects.all().order_by('-created_at') +class LeadViewSet(ScopedQuerySetMixin, viewsets.ModelViewSet): + queryset = Lead.objects.all() serializer_class = LeadSerializer - filterset_fields = ['status', 'rating'] - search_fields = ['first_name', 'last_name', 'company', 'email'] + + def perform_create(self, serializer): + with transaction.atomic(): + serializer.save(owner=self.request.user) + + def perform_update(self, serializer): + with transaction.atomic(): + serializer.save() @action(detail=True, methods=['post'], url_path='convert') def convert(self, request, pk=None): @@ -42,42 +76,55 @@ class LeadViewSet(viewsets.ModelViewSet): serializer.is_valid(raise_exception=True) validated = serializer.validated_data - try: + account_name = validated.get('account_name') or lead.company + create_opportunity = validated.get('create_opportunity', False) + opportunity_name = validated.get('opportunity_name') or f"{account_name} - Opportunity" + opportunity_amount = validated.get('opportunity_amount') + opportunity_close_date = validated.get('opportunity_close_date') + + with transaction.atomic(): result = convert_lead( lead=lead, - account_name=validated.get('account_name'), - create_opportunity=validated.get('create_opportunity', False), - opportunity_name=validated.get('opportunity_name'), - opportunity_amount=validated.get('opportunity_amount'), - opportunity_close_date=validated.get('opportunity_close_date'), + account_name=account_name, + create_opportunity=create_opportunity, + opportunity_name=opportunity_name, + opportunity_amount=opportunity_amount, + opportunity_close_date=opportunity_close_date, user=request.user ) - return Response({ - 'account': result['account'].id, - 'contact': result['contact'].id, - 'opportunity': result['opportunity'].id if result['opportunity'] else None, - 'account_id': result['account'].id, - 'contact_id': result['contact'].id, - 'opportunity_id': result['opportunity'].id if result['opportunity'] else None, - 'status': 'converted' - }, status=status.HTTP_200_OK) - except ValidationError as e: - return Response({'error': str(e)}, status=status.HTTP_400_BAD_REQUEST) - except Exception as e: - return Response({'error': str(e)}, status=status.HTTP_400_BAD_REQUEST) + + return Response({ + 'account': result['account'].id, + 'contact': result['contact'].id, + 'opportunity': result['opportunity'].id if result['opportunity'] else None, + 'account_id': result['account'].id, + 'contact_id': result['contact'].id, + 'opportunity_id': result['opportunity'].id if result['opportunity'] else None, + 'status': 'converted' + }, status=status.HTTP_200_OK) -class OpportunityViewSet(viewsets.ModelViewSet): - permission_classes = [IsAuthenticated] - queryset = Opportunity.objects.all().order_by('-close_date') +class OpportunityViewSet(ScopedQuerySetMixin, viewsets.ModelViewSet): + queryset = Opportunity.objects.all() serializer_class = OpportunitySerializer - filterset_fields = ['stage', 'account'] - search_fields = ['name'] + + def perform_create(self, serializer): + with transaction.atomic(): + serializer.save(owner=self.request.user) + + def perform_update(self, serializer): + with transaction.atomic(): + serializer.save() -class ActivityViewSet(viewsets.ModelViewSet): - permission_classes = [IsAuthenticated] - queryset = Activity.objects.all().order_by('-due_date') +class ActivityViewSet(ScopedQuerySetMixin, viewsets.ModelViewSet): + queryset = Activity.objects.all() serializer_class = ActivitySerializer - filterset_fields = ['activity_type', 'status', 'priority'] - search_fields = ['subject', 'description'] + + def perform_create(self, serializer): + with transaction.atomic(): + serializer.save(assigned_to=self.request.user) + + def perform_update(self, serializer): + with transaction.atomic(): + serializer.save() diff --git a/custom_objects/views.py b/custom_objects/views.py index a84cad9..20ff462 100644 --- a/custom_objects/views.py +++ b/custom_objects/views.py @@ -1,6 +1,5 @@ -from django.db import models +from django.db import models, transaction from rest_framework import viewsets, status -from rest_framework.response import Response from rest_framework.permissions import IsAuthenticated from rest_framework.exceptions import NotFound @@ -10,23 +9,31 @@ from .serializers import ( CustomFieldDefinitionSerializer, CustomRecordSerializer ) +from openforce.permissions import ScopedOwnerAccessPermission class CustomObjectDefinitionViewSet(viewsets.ModelViewSet): permission_classes = [IsAuthenticated] - queryset = CustomObjectDefinition.objects.all().order_by('label') + queryset = CustomObjectDefinition.objects.all() serializer_class = CustomObjectDefinitionSerializer + def perform_create(self, serializer): + with transaction.atomic(): + serializer.save(created_by=self.request.user) + class CustomFieldDefinitionViewSet(viewsets.ModelViewSet): permission_classes = [IsAuthenticated] - queryset = CustomFieldDefinition.objects.all().order_by('name') + queryset = CustomFieldDefinition.objects.all() serializer_class = CustomFieldDefinitionSerializer - filterset_fields = ['custom_object'] + + def perform_create(self, serializer): + with transaction.atomic(): + serializer.save() class CustomRecordViewSet(viewsets.ModelViewSet): - permission_classes = [IsAuthenticated] + permission_classes = [IsAuthenticated, ScopedOwnerAccessPermission] serializer_class = CustomRecordSerializer def get_custom_object(self): @@ -40,8 +47,17 @@ class CustomRecordViewSet(viewsets.ModelViewSet): def get_queryset(self): custom_object = self.get_custom_object() - return CustomRecord.objects.filter(custom_object=custom_object).order_by('-created_at') + user = self.request.user + qs = CustomRecord.objects.filter(custom_object=custom_object) + if user.is_superuser or user.is_staff: + return qs + return qs.filter(owner=user) def perform_create(self, serializer): - custom_object = self.get_custom_object() - serializer.save(custom_object=custom_object, owner=self.request.user) + with transaction.atomic(): + custom_object = self.get_custom_object() + serializer.save(custom_object=custom_object, owner=self.request.user) + + def perform_update(self, serializer): + with transaction.atomic(): + serializer.save() diff --git a/frontend/src/views/FlowEditorView.vue b/frontend/src/views/FlowEditorView.vue index 5cbe4d7..1d5fe40 100644 --- a/frontend/src/views/FlowEditorView.vue +++ b/frontend/src/views/FlowEditorView.vue @@ -73,6 +73,9 @@