vignesh/bottleneckcrm
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #516 from MicroPyramid/new_release

Browse source 
new release
This commit is contained in:
Ashwin Kumar 2023-11-02 21:27:39 +05:30 committed by GitHub
commit 3c4d14c7b8
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
30 changed files with 371 additions and 166 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
accounts/serializer.py
View file

@ -5,6 +5,7 @@ from common.serializer import (
AttachmentsSerializer,
OrganizationSerializer,
ProfileSerializer,
UserSerializer
)
from contacts.serializer import ContactSerializer
from leads.serializer import LeadSerializer
@ -18,7 +19,7 @@ class TagsSerailizer(serializers.ModelSerializer):
class AccountSerializer(serializers.ModelSerializer):
created_by = ProfileSerializer()
created_by = UserSerializer()
lead = LeadSerializer()
org = OrganizationSerializer()
tags = TagsSerailizer(read_only=True, many=True)

34
accounts/views.py
View file

@ -30,8 +30,10 @@ from teams.serializer import TeamsSerializer
from accounts.tasks import send_email, send_email_to_assigned_user
from cases.serializer import CaseSerializer
from common.models import Attachments, Comment, Profile
from leads.models import Lead
from leads.serializer import LeadSerializer
# from common.custom_auth import JSONWebTokenAuthentication
from common.external_auth import CustomDualAuthentication
from common.serializer import (
AttachmentsSerializer,
CommentSerializer,
@ -55,7 +57,7 @@ from teams.models import Teams
class AccountsListView(APIView, LimitOffsetPagination):
# authentication_classes = (JSONWebTokenAuthentication,)
authentication_classes = (CustomDualAuthentication,)
permission_classes = (IsAuthenticated,)
model = Account
serializer_class = AccountReadSerializer
@ -65,7 +67,7 @@ class AccountsListView(APIView, LimitOffsetPagination):
queryset = self.model.objects.filter(org=self.request.profile.org).order_by("-id")
if self.request.profile.role != "ADMIN" and not self.request.profile.is_admin:
queryset = queryset.filter(
Q(created_by=self.request.profile) | Q(assigned_to=self.request.profile)
Q(created_by=self.request.profile.user.user) | Q(assigned_to=self.request.profile)
).distinct()
if params:
@ -77,7 +79,7 @@ class AccountsListView(APIView, LimitOffsetPagination):
queryset = queryset.filter(industry__icontains=params.get("industry"))
if params.get("tags"):
queryset = queryset.filter(
tags__in=json.loads(params.get("tags"))
tags__in=params.get("tags")
).distinct()
context = {}
@ -136,6 +138,12 @@ class AccountsListView(APIView, LimitOffsetPagination):
"id", "user__email"
)
context["users"] = users
leads = Lead.objects.filter(org=self.request.profile.org).exclude(
Q(status="converted") | Q(status="closed")
)
context["users"] = users
context["leads"] = LeadSerializer(leads, many=True).data
context["status"] = ["open","close"]
return context
@extend_schema(tags=["Accounts"], parameters=swagger_params1.account_get_params)
@ -207,7 +215,7 @@ class AccountsListView(APIView, LimitOffsetPagination):
class AccountDetailView(APIView):
# authentication_classes = (JSONWebTokenAuthentication,)
authentication_classes = (CustomDualAuthentication,)
permission_classes = (IsAuthenticated,)
serializer_class = AccountReadSerializer
@ -226,7 +234,6 @@ class AccountDetailView(APIView):
serializer = AccountCreateSerializer(
account_object, data=data, request_obj=request, account=True
)
serializer.data['org'] = request.profile.org
if serializer.is_valid():
if (
@ -285,7 +292,7 @@ class AccountDetailView(APIView):
if self.request.FILES.get("account_attachment"):
attachment = Attachments()
attachment.created_by = self.request.profile
attachment.created_by = self.request.profile.user
attachment.file_name = self.request.FILES.get("account_attachment").name
attachment.account = account_object
attachment.attachment = self.request.FILES.get("account_attachment")
@ -375,6 +382,9 @@ class AccountDetailView(APIView):
users_mention = []
else:
users_mention = []
leads = Lead.objects.filter(org=self.request.profile.org).exclude(
Q(status="converted") | Q(status="closed")
)
context.update(
{
"attachments": AttachmentsSerializer(
@ -419,6 +429,8 @@ class AccountDetailView(APIView):
self.account.sent_email.all(), many=True
).data,
"users_mention": users_mention,
"leads" : LeadSerializer(leads, many=True).data,
"status" : ["open","close"]
}
)
return Response(context)
@ -460,7 +472,7 @@ class AccountDetailView(APIView):
if self.request.FILES.get("account_attachment"):
attachment = Attachments()
attachment.created_by = self.request.profile
attachment.created_by = self.request.profile.user
attachment.file_name = self.request.FILES.get("account_attachment").name
attachment.account = self.account_obj
attachment.attachment = self.request.FILES.get("account_attachment")
@ -484,7 +496,7 @@ class AccountDetailView(APIView):
class AccountCommentView(APIView):
model = Comment
# authentication_classes = (JSONWebTokenAuthentication,)
authentication_classes = (CustomDualAuthentication,)
permission_classes = (IsAuthenticated,)
serializer_class = AccountCommentEditSwaggerSerializer
@ -546,7 +558,7 @@ class AccountCommentView(APIView):
class AccountAttachmentView(APIView):
model = Attachments
# authentication_classes = (JSONWebTokenAuthentication,)
authentication_classes = (CustomDualAuthentication,)
permission_classes = (IsAuthenticated,)
serializer_class = AccountDetailEditSwaggerSerializer
@ -573,7 +585,7 @@ class AccountAttachmentView(APIView):
class AccountCreateMailView(APIView):
# authentication_classes = (JSONWebTokenAuthentication,)
authentication_classes = (CustomDualAuthentication,)
permission_classes = (IsAuthenticated,)
model = Account
serializer_class = EmailWriteSerializer

21
cases/migrations/0003_alter_case_created_by.py Normal file
View file

@ -0,0 +1,21 @@
# Generated by Django 4.2.1 on 2023-10-31 12:42
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),
('cases', '0002_initial'),
]
operations = [
migrations.AlterField(
model_name='case',
name='created_by',
field=models.ForeignKey(null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='%(class)s_created_by', to=settings.AUTH_USER_MODEL, verbose_name='Created By'),
),
]

6
cases/models.py
View file

@ -32,9 +32,9 @@ class Case(BaseModel):
closed_on = models.DateField()
description = models.TextField(blank=True, null=True)
assigned_to = models.ManyToManyField(Profile, related_name="case_assigned_users")
created_by = models.ForeignKey(
Profile, related_name="case_created_by", on_delete=models.SET_NULL, null=True
)
# created_by = models.ForeignKey(
# Profile, related_name="case_created_by", on_delete=models.SET_NULL, null=True
# )
is_active = models.BooleanField(default=False)
teams = models.ManyToManyField(Teams, related_name="cases_teams")
org = models.ForeignKey(

4
cases/serializer.py
View file

@ -2,7 +2,7 @@ from rest_framework import serializers
from accounts.serializer import AccountSerializer
from cases.models import Case
from common.serializer import OrganizationSerializer, ProfileSerializer
from common.serializer import OrganizationSerializer, ProfileSerializer,UserSerializer
from contacts.serializer import ContactSerializer
from teams.serializer import TeamsSerializer
@ -11,7 +11,7 @@ class CaseSerializer(serializers.ModelSerializer):
account = AccountSerializer()
contacts = ContactSerializer(read_only=True, many=True)
assigned_to = ProfileSerializer(read_only=True, many=True)
created_by = ProfileSerializer(read_only=True)
created_by = UserSerializer(read_only=True)
teams = TeamsSerializer(read_only=True, many=True)
org = OrganizationSerializer()

36
cases/views.py
View file

@ -16,7 +16,7 @@ from cases.serializer import CaseCreateSerializer, CaseSerializer,CaseCreateSwag
from cases.tasks import send_email_to_assigned_user
from common.models import Attachments, Comment, Profile
# from common.custom_auth import JSONWebTokenAuthentication
from common.external_auth import CustomDualAuthentication
from common.serializer import AttachmentsSerializer, CommentSerializer
from common.utils import CASE_TYPE, PRIORITY_CHOICE, STATUS_CHOICE
from contacts.models import Contact
@ -25,7 +25,7 @@ from teams.models import Teams
class CaseListView(APIView, LimitOffsetPagination):
# authentication_classes = (JSONWebTokenAuthentication,)
authentication_classes = (CustomDualAuthentication,)
permission_classes = (IsAuthenticated,)
model = Case
@ -37,13 +37,13 @@ class CaseListView(APIView, LimitOffsetPagination):
profiles = Profile.objects.filter(is_active=True, org=self.request.profile.org)
if self.request.profile.role != "ADMIN" and not self.request.profile.is_admin:
queryset = queryset.filter(
Q(created_by=self.request.profile) | Q(assigned_to=self.request.profile)
Q(created_by=self.request.profile.user) | Q(assigned_to=self.request.profile)
).distinct()
accounts = accounts.filter(
Q(created_by=self.request.profile) | Q(assigned_to=self.request.profile)
Q(created_by=self.request.profile.user) | Q(assigned_to=self.request.profile)
).distinct()
contacts = contacts.filter(
Q(created_by=self.request.profile) | Q(assigned_to=self.request.profile)
Q(created_by=self.request.profile.user) | Q(assigned_to=self.request.profile)
).distinct()
profiles = profiles.filter(role="ADMIN")
@ -97,26 +97,26 @@ class CaseListView(APIView, LimitOffsetPagination):
serializer = CaseCreateSerializer(data=params, request_obj=request)
if serializer.is_valid():
cases_obj = serializer.save(
created_by=request.profile,
created_by=request.profile.user,
org=request.profile.org,
closed_on=params.get("closed_on"),
case_type=params.get("case_type"),
)
if params.get("contacts"):
contacts_list = json.loads(params.get("contacts"))
contacts_list = params.get("contacts")
contacts = Contact.objects.filter(id__in=contacts_list, org=request.profile.org)
if contacts:
cases_obj.contacts.add(*contacts)
if params.get("teams"):
teams_list = json.loads(params.get("teams"))
teams_list = params.get("teams")
teams = Teams.objects.filter(id__in=teams_list, org=request.profile.org)
if teams.exists():
cases_obj.teams.add(*teams)
if params.get("assigned_to"):
assinged_to_list = json.loads(params.get("assigned_to"))
assinged_to_list = params.get("assigned_to")
profiles = Profile.objects.filter(
id__in=assinged_to_list, org=request.profile.org, is_active=True
)
@ -125,7 +125,7 @@ class CaseListView(APIView, LimitOffsetPagination):
if self.request.FILES.get("case_attachment"):
attachment = Attachments()
attachment.created_by = self.request.profile
attachment.created_by = self.request.profile.user
attachment.file_name = self.request.FILES.get("case_attachment").name
attachment.cases = cases_obj
attachment.attachment = self.request.FILES.get("case_attachment")
@ -148,7 +148,7 @@ class CaseListView(APIView, LimitOffsetPagination):
class CaseDetailView(APIView):
# authentication_classes = (JSONWebTokenAuthentication,)
authentication_classes = (CustomDualAuthentication,)
permission_classes = (IsAuthenticated,)
model = Case
@ -194,21 +194,21 @@ class CaseDetailView(APIView):
)
cases_object.contacts.clear()
if params.get("contacts"):
contacts_list = json.loads(params.get("contacts"))
contacts_list = params.get("contacts")
contacts = Contact.objects.filter(id__in=contacts_list, org=request.profile.org)
if contacts:
cases_object.contacts.add(*contacts)
cases_object.teams.clear()
if params.get("teams"):
teams_list = json.loads(params.get("teams"))
teams_list = params.get("teams")
teams = Teams.objects.filter(id__in=teams_list, org=request.profile.org)
if teams.exists():
cases_object.teams.add(*teams)
cases_object.assigned_to.clear()
if params.get("assigned_to"):
assinged_to_list = json.loads(params.get("assigned_to"))
assinged_to_list = params.get("assigned_to")
profiles = Profile.objects.filter(
id__in=assinged_to_list, org=request.profile.org, is_active=True
)
@ -217,7 +217,7 @@ class CaseDetailView(APIView):
if self.request.FILES.get("case_attachment"):
attachment = Attachments()
attachment.created_by = self.request.profile
attachment.created_by = self.request.profile.user
attachment.file_name = self.request.FILES.get("case_attachment").name
attachment.case = cases_object
attachment.attachment = self.request.FILES.get("case_attachment")
@ -366,7 +366,7 @@ class CaseDetailView(APIView):
if self.request.FILES.get("case_attachment"):
attachment = Attachments()
attachment.created_by = self.request.profile
attachment.created_by = self.request.profile.user
attachment.file_name = self.request.FILES.get("case_attachment").name
attachment.case = self.cases_obj
attachment.attachment = self.request.FILES.get("case_attachment")
@ -387,7 +387,7 @@ class CaseDetailView(APIView):
class CaseCommentView(APIView):
model = Comment
# authentication_classes = (JSONWebTokenAuthentication,)
authentication_classes = (CustomDualAuthentication,)
permission_classes = (IsAuthenticated,)
def get_object(self, pk):
@ -450,7 +450,7 @@ class CaseCommentView(APIView):
class CaseAttachmentView(APIView):
model = Attachments
# authentication_classes = (JSONWebTokenAuthentication,)
authentication_classes = (CustomDualAuthentication,)
permission_classes = (IsAuthenticated,)
@extend_schema(

57
common/external_auth.py Normal file
View file

@ -0,0 +1,57 @@
import jwt
from rest_framework.authentication import BaseAuthentication
from rest_framework.exceptions import AuthenticationFailed
from rest_framework.request import Request
from common.models import Org,Profile,User
from django.conf import settings
def verify_jwt_token(token1):
secret_key = (settings.SECRET_KEY) # Replace with your secret key used for token encoding/decoding
try:
token = token1.split(" ")[1] # getting the token value
payload = jwt.decode(token, (settings.SECRET_KEY), algorithms=[settings.JWT_ALGO])
return True, payload
except jwt.ExpiredSignatureError:
return False, "Token is expired"
except jwt.InvalidTokenError:
return False, "Invalid token"
class CustomDualAuthentication(BaseAuthentication):
def authenticate(self, request: Request):
jwt_user = None
profile = None
# Check JWT authentication
# Implement your JWT authentication logic here
# You might use a library like `python_jwt` to decode and verify the JWT token
# Example code assumes a method `verify_jwt_token` for JWT verification
jwt_token = request.META.get('HTTP_AUTHORIZATION')
if jwt_token:
is_valid, jwt_payload = verify_jwt_token(jwt_token)
if is_valid:
# JWT authentication successful
jwt_user = (User.objects.get(id=jwt_payload['user_id']),True)
if jwt_payload['user_id'] is not None:
if request.headers.get("org"):
profile = Profile.objects.get(
user_id=jwt_payload['user_id'], org=request.headers.get("org"), is_active=True
)
if profile:
request.profile = profile
# Check API key authentication
api_key = request.headers.get('Token') # Get API key from request query params
if api_key:
try:
organization = Org.objects.get(api_key=api_key)
# API key authentication successful
api_key_user = organization
request.META['org'] = api_key_user.id
profile = Profile.objects.filter(org=api_key_user,role="ADMIN").first()
request.profile = profile
profile = (profile.user,True)
except Org.DoesNotExist:
raise AuthenticationFailed('Invalid API Key')
# Select the appropriate user based on authentication method
# Return the user if any authentication method succeeded
return jwt_user or profile

1
common/middleware/get_company.py
View file

@ -61,4 +61,5 @@ class GetProfileAndOrg(object):
if profile:
request.profile = profile
except :
print('test1')
raise PermissionDenied()

19
common/migrations/0005_org_api_key.py Normal file
View file

@ -0,0 +1,19 @@
# Generated by Django 4.2.1 on 2023-11-02 11:19
import common.models
from django.db import migrations, models
class Migration(migrations.Migration):
dependencies = [
('common', '0004_alter_profile_alternate_phone'),
]
operations = [
migrations.AddField(
model_name='org',
name='api_key',
field=models.TextField(default=common.models.generate_unique_key, editable=False),
),
]

30
common/migrations/0006_alter_org_api_key.py Normal file
View file

@ -0,0 +1,30 @@
# Generated by Django 4.2.1 on 2023-11-02 11:20
import common.models
from django.db import migrations, models
import uuid
def generate_unique_key():
return str(uuid.uuid4())
def set_unique_api_keys(apps, schema_editor):
Org = apps.get_model('common', 'Org')
for org in Org.objects.all():
org.api_key = generate_unique_key()
org.save()
class Migration(migrations.Migration):
dependencies = [
('common', '0005_org_api_key'),
]
operations = [
migrations.RunPython(set_unique_api_keys),
migrations.AlterField(
model_name='org',
name='api_key',
field=models.TextField(default=common.models.generate_unique_key, editable=False, unique=True),
),
]

18
common/migrations/0007_org_is_active.py Normal file
View file

@ -0,0 +1,18 @@
# Generated by Django 4.2.1 on 2023-11-02 11:42
from django.db import migrations, models
class Migration(migrations.Migration):
dependencies = [
('common', '0006_alter_org_api_key'),
]
operations = [
migrations.AddField(
model_name='org',
name='is_active',
field=models.BooleanField(default=True),
),
]

7
common/models.py
View file

@ -3,7 +3,6 @@ import datetime
import os
import time
import uuid
import arrow
from django.contrib.auth.models import AbstractUser
from django.contrib.auth.models import AbstractBaseUser, PermissionsMixin, UserManager
@ -115,9 +114,15 @@ class Address(BaseModel):
address += self.get_country_display()
return address
def generate_unique_key():
return str(uuid.uuid4())
class Org(BaseModel):
name = models.CharField(max_length=100, blank=True, null=True)
api_key = models.TextField(
default=generate_unique_key, unique=True, editable=False
)
is_active = models.BooleanField(default=True)
# address = models.TextField(blank=True, null=True)
# user_limit = models.IntegerField(default=5)
# country = models.CharField(max_length=3, choices=COUNTRIES, blank=True, null=True)

6
common/serializer.py
View file

@ -22,7 +22,7 @@ from common.models import (
class OrganizationSerializer(serializers.ModelSerializer):
class Meta:
model = Org
fields = ("id", "name")
fields = ("id", "name","api_key")
class SocialLoginSerializer(serializers.Serializer):
@ -217,7 +217,7 @@ class AttachmentsSerializer(serializers.ModelSerializer):
class DocumentSerializer(serializers.ModelSerializer):
shared_to = ProfileSerializer(read_only=True, many=True)
teams = serializers.SerializerMethodField()
created_by = ProfileSerializer()
created_by = UserSerializer()
org = OrganizationSerializer()
def get_teams(self, obj):
@ -299,7 +299,7 @@ class APISettingsSerializer(serializers.ModelSerializer):
class APISettingsListSerializer(serializers.ModelSerializer):
created_by = ProfileSerializer()
created_by = UserSerializer()
lead_assigned_to = ProfileSerializer(read_only=True, many=True)
tags = serializers.SerializerMethodField()
org = OrganizationSerializer()

43
common/views.py
View file

@ -1,4 +1,5 @@
import json
import secrets
from multiprocessing import context
from re import template
@ -23,6 +24,7 @@ from django.views.decorators.csrf import csrf_exempt
from django.views.decorators.http import require_http_methods
from drf_spectacular.types import OpenApiTypes
from drf_spectacular.utils import OpenApiExample, OpenApiParameter, extend_schema
from common.external_auth import CustomDualAuthentication
from rest_framework import status
from rest_framework.authtoken.models import Token
from rest_framework.pagination import LimitOffsetPagination
@ -340,19 +342,19 @@ class ApiHomeView(APIView):
if self.request.profile.role != "ADMIN" and not self.request.user.is_superuser:
accounts = accounts.filter(
Q(assigned_to=self.request.profile) | Q(created_by=self.request.profile)
Q(assigned_to=self.request.profile) | Q(created_by=self.request.profile.user)
)
contacts = contacts.filter(
Q(assigned_to__id__in=self.request.profile)
| Q(created_by=self.request.profile)
| Q(created_by=self.request.profile.user)
)
leads = leads.filter(
Q(assigned_to__id__in=self.request.profile)
| Q(created_by=self.request.profile)
| Q(created_by=self.request.profile.user)
).exclude(status="closed")
opportunities = opportunities.filter(
Q(assigned_to__id__in=self.request.profile)
| Q(created_by=self.request.profile)
| Q(created_by=self.request.profile.user)
)
context = {}
context["accounts_count"] = accounts.count()
@ -367,7 +369,7 @@ class ApiHomeView(APIView):
class OrgProfileCreateView(APIView):
##authentication_classes = (JSONWebTokenAuthentication,)
authentication_classes = (CustomDualAuthentication,)
permission_classes = (IsAuthenticated,)
model1 = Org
@ -380,8 +382,9 @@ class OrgProfileCreateView(APIView):
request=OrgProfileCreateSerializer
)
def post(self, request, format=None):
params = request.data
serializer = self.serializer_class(data=params)
data = request.data
data['api_key'] = secrets.token_hex(16)
serializer = self.serializer_class(data=data)
if serializer.is_valid():
org_obj = serializer.save()
@ -438,7 +441,7 @@ class ProfileView(APIView):
return Response(context, status=status.HTTP_200_OK)
class DocumentListView(APIView, LimitOffsetPagination):
##authentication_classes = (JSONWebTokenAuthentication,)
authentication_classes = (CustomDualAuthentication,)
permission_classes = (IsAuthenticated,)
model = Document
@ -545,19 +548,19 @@ class DocumentListView(APIView, LimitOffsetPagination):
serializer = DocumentCreateSerializer(data=params, request_obj=request)
if serializer.is_valid():
doc = serializer.save(
created_by=request.profile,
created_by=request.profile.user,
org=request.profile.org,
document_file=request.FILES.get("document_file"),
)
if params.get("shared_to"):
assinged_to_list = json.loads(params.get("shared_to"))
assinged_to_list = params.get("shared_to")
profiles = Profile.objects.filter(
id__in=assinged_to_list, org=request.profile.org, is_active=True
)
if profiles:
doc.shared_to.add(*profiles)
if params.get("teams"):
teams_list = json.loads(params.get("teams"))
teams_list = params.get("teams")
teams = Teams.objects.filter(id__in=teams_list, org=request.profile.org)
if teams:
doc.teams.add(*teams)
@ -573,7 +576,7 @@ class DocumentListView(APIView, LimitOffsetPagination):
class DocumentDetailView(APIView):
##authentication_classes = (JSONWebTokenAuthentication,)
authentication_classes = (CustomDualAuthentication,)
permission_classes = (IsAuthenticated,)
def get_object(self, pk):
@ -694,7 +697,7 @@ class DocumentDetailView(APIView):
)
doc.shared_to.clear()
if params.get("shared_to"):
assinged_to_list = json.loads(params.get("shared_to"))
assinged_to_list = params.get("shared_to")
profiles = Profile.objects.filter(
id__in=assinged_to_list, org=request.profile.org, is_active=True
)
@ -703,7 +706,7 @@ class DocumentDetailView(APIView):
doc.teams.clear()
if params.get("teams"):
teams_list = json.loads(params.get("teams"))
teams_list = params.get("teams")
teams = Teams.objects.filter(id__in=teams_list, org=request.profile.org)
if teams:
doc.teams.add(*teams)
@ -787,12 +790,12 @@ class DomainList(APIView):
params = request.data
assign_to_list = []
if params.get("lead_assigned_to"):
assign_to_list = json.loads(params.get("lead_assigned_to"))
assign_to_list = params.get("lead_assigned_to")
serializer = APISettingsSerializer(data=params)
if serializer.is_valid():
settings_obj = serializer.save(created_by=request.profile, org=request.profile.org)
settings_obj = serializer.save(created_by=request.profile.user, org=request.profile.org)
if params.get("tags"):
tags = json.loads(params.get("tags"))
tags = params.get("tags")
for tag in tags:
tag_obj = Tags.objects.filter(name=tag).first()
if not tag_obj:
@ -812,7 +815,7 @@ class DomainList(APIView):
class DomainDetailView(APIView):
model = APISettings
##authentication_classes = (JSONWebTokenAuthentication,)
authentication_classes = (CustomDualAuthentication,)
permission_classes = (IsAuthenticated,)
@extend_schema(
@ -833,14 +836,14 @@ class DomainDetailView(APIView):
params = request.data
assign_to_list = []
if params.get("lead_assigned_to"):
assign_to_list = json.loads(params.get("lead_assigned_to"))
assign_to_list = params.get("lead_assigned_to")
serializer = APISettingsSerializer(data=params, instance=api_setting)
if serializer.is_valid():
api_setting = serializer.save()
api_setting.tags.clear()
api_setting.lead_assigned_to.clear()
if params.get("tags"):
tags = json.loads(params.get("tags"))
tags = params.get("tags")
for tag in tags:
tag_obj = Tags.objects.filter(name=tag).first()
if not tag_obj:

20
contacts/views.py
View file

@ -17,7 +17,7 @@ from common.serializer import (
)
from common.utils import COUNTRIES
# from common.custom_auth import JSONWebTokenAuthentication
from common.external_auth import CustomDualAuthentication
from contacts import swagger_params1
from contacts.models import Contact, Profile
from contacts.serializer import *
@ -27,7 +27,7 @@ from teams.models import Teams
class ContactsListView(APIView, LimitOffsetPagination):
# authentication_classes = (JSONWebTokenAuthentication,)
authentication_classes = (CustomDualAuthentication,)
permission_classes = (IsAuthenticated,)
model = Contact
@ -37,7 +37,7 @@ class ContactsListView(APIView, LimitOffsetPagination):
if self.request.profile.role != "ADMIN" and not self.request.profile.is_admin:
queryset = queryset.filter(
Q(assigned_to__in=[self.request.profile])
| Q(created_by=self.request.profile)
| Q(created_by=self.request.profile.user)
).distinct()
if params:
@ -51,7 +51,7 @@ class ContactsListView(APIView, LimitOffsetPagination):
queryset = queryset.filter(primary_email__icontains=params.get("email"))
if params.getlist("assigned_to"):
queryset = queryset.filter(
assigned_to__id__in=json.loads(params.get("assigned_to"))
assigned_to__id__in=params.get("assigned_to")
).distinct()
context = {}
@ -111,12 +111,12 @@ class ContactsListView(APIView, LimitOffsetPagination):
contact_obj.save()
if params.get("teams"):
teams_list = json.loads(params.get("teams"))
teams_list = params.get("teams")
teams = Teams.objects.filter(id__in=teams_list, org=request.profile.org)
contact_obj.teams.add(*teams)
if params.get("assigned_to"):
assinged_to_list = json.loads(params.get("assigned_to"))
assinged_to_list = params.get("assigned_to")
profiles = Profile.objects.filter(id__in=assinged_to_list, org=request.profile.org)
contact_obj.assigned_to.add(*profiles)
@ -140,7 +140,7 @@ class ContactsListView(APIView, LimitOffsetPagination):
class ContactDetailView(APIView):
# authentication_classes = (JSONWebTokenAuthentication,)
# authentication_classes = (CustomDualAuthentication,)
permission_classes = (IsAuthenticated,)
model = Contact
@ -366,7 +366,7 @@ class ContactDetailView(APIView):
if self.request.FILES.get("contact_attachment"):
attachment = Attachments()
attachment.created_by = self.request.profile
attachment.created_by = self.request.profile.user
attachment.file_name = self.request.FILES.get("contact_attachment").name
attachment.contact = self.contact_obj
attachment.attachment = self.request.FILES.get("contact_attachment")
@ -390,7 +390,7 @@ class ContactDetailView(APIView):
class ContactCommentView(APIView):
model = Comment
# authentication_classes = (JSONWebTokenAuthentication,)
# authentication_classes = (CustomDualAuthentication,)
permission_classes = (IsAuthenticated,)
def get_object(self, pk):
@ -452,7 +452,7 @@ class ContactCommentView(APIView):
class ContactAttachmentView(APIView):
model = Attachments
# authentication_classes = (JSONWebTokenAuthentication,)
# authentication_classes = (CustomDualAuthentication,)
permission_classes = (IsAuthenticated,)
@extend_schema(

2
crm/settings.py
View file

@ -87,7 +87,7 @@ MIDDLEWARE = [
"django.middleware.clickjacking.XFrameOptionsMiddleware",
"corsheaders.middleware.CorsMiddleware",
"crum.CurrentRequestUserMiddleware",
"common.middleware.get_company.GetProfileAndOrg",
# "common.middleware.get_company.GetProfileAndOrg",
"wagtail.contrib.redirects.middleware.RedirectMiddleware",
]

3
events/serializer.py
View file

@ -7,6 +7,7 @@ from common.serializer import (
CommentSerializer,
OrganizationSerializer,
ProfileSerializer,
UserSerializer
)
from contacts.serializer import ContactSerializer
from events.models import Event
@ -14,7 +15,7 @@ from teams.serializer import TeamsSerializer
class EventSerializer(serializers.ModelSerializer):
created_by = ProfileSerializer()
created_by = UserSerializer()
assigned_to = ProfileSerializer(read_only=True, many=True)
contacts = ContactSerializer(read_only=True, many=True)
teams = TeamsSerializer(read_only=True, many=True)

34
events/views.py
View file

@ -12,7 +12,7 @@ from rest_framework.views import APIView
from common.models import Attachments, Comment, Profile, User
# from common.custom_auth import JSONWebTokenAuthentication
from common.external_auth import CustomDualAuthentication
from common.serializer import (
AttachmentsSerializer,
CommentSerializer,
@ -40,7 +40,7 @@ WEEKDAYS = (
class EventListView(APIView, LimitOffsetPagination):
model = Event
# authentication_classes = (JSONWebTokenAuthentication,)
authentication_classes = (CustomDualAuthentication,)
permission_classes = (IsAuthenticated,)
def get_context_data(self, **kwargs):
@ -50,10 +50,10 @@ class EventListView(APIView, LimitOffsetPagination):
if self.request.profile.role != "ADMIN" and not self.request.profile.is_admin:
queryset = queryset.filter(
Q(assigned_to__in=[self.request.profile])
| Q(created_by=self.request.profile)
| Q(created_by=self.request.profile.user)
)
contacts = contacts.filter(
Q(created_by=self.request.profile) | Q(assigned_to=self.request.profile)
Q(created_by=self.request.profile.user) | Q(assigned_to=self.request.profile)
).distinct()
if params:
@ -63,7 +63,7 @@ class EventListView(APIView, LimitOffsetPagination):
queryset = queryset.filter(created_by=params.get("created_by"))
if params.getlist("assigned_users"):
queryset = queryset.filter(
assigned_to__id__in=json.loads(params.get("assigned_users"))
assigned_to__id__in=params.get("assigned_users")
)
if params.get("date_of_meeting"):
queryset = queryset.filter(
@ -104,7 +104,7 @@ class EventListView(APIView, LimitOffsetPagination):
recurring_days = json.dumps(params.get("recurring_days"))
if params.get("event_type") == "Non-Recurring":
event_obj = serializer.save(
created_by=request.profile,
created_by=request.profile.user,
date_of_meeting=params.get("start_date"),
is_active=True,
disabled=False,
@ -118,12 +118,12 @@ class EventListView(APIView, LimitOffsetPagination):
event_obj.contacts.add(obj_contact)
if params.get("teams"):
teams_list = json.loads(params.get("teams"))
teams_list = params.get("teams")
teams = Teams.objects.filter(id__in=teams_list, org=request.profile.org)
event_obj.teams.add(*teams)
if params.get("assigned_to"):
assinged_to_list = json.loads(params.get("assigned_to"))
assinged_to_list = params.get("assigned_to")
profiles = Profile.objects.filter(
id__in=assinged_to_list, org=request.profile.org
)
@ -159,7 +159,7 @@ class EventListView(APIView, LimitOffsetPagination):
data = serializer.validated_data
event = Event.objects.create(
created_by=request.profile,
created_by=request.profile.user,
start_date=start_date,
end_date=end_date,
name=data["name"],
@ -178,12 +178,12 @@ class EventListView(APIView, LimitOffsetPagination):
event.contacts.add(obj_contact)
if params.get("teams"):
teams_list = json.loads(params.get("teams"))
teams_list = params.get("teams")
teams = Teams.objects.filter(id__in=teams_list, org=request.profile.org)
event.teams.add(*teams)
if params.get("assigned_to"):
assinged_to_list = json.loads(params.get("assigned_to"))
assinged_to_list = params.get("assigned_to")
profiles = Profile.objects.filter(
id__in=assinged_to_list, org=request.profile.org
)
@ -208,7 +208,7 @@ class EventListView(APIView, LimitOffsetPagination):
class EventDetailView(APIView):
model = Event
# authentication_classes = (JSONWebTokenAuthentication,)
authentication_classes = (CustomDualAuthentication,)
permission_classes = (IsAuthenticated,)
def get_object(self, pk):
@ -343,7 +343,7 @@ class EventDetailView(APIView):
if self.request.FILES.get("event_attachment"):
attachment = Attachments()
attachment.created_by = self.request.profile
attachment.created_by = self.request.profile.user
attachment.file_name = self.request.FILES.get("event_attachment").name
attachment.event = self.event_obj
attachment.attachment = self.request.FILES.get("event_attachment")
@ -396,13 +396,13 @@ class EventDetailView(APIView):
event_obj.teams.clear()
if params.get("teams"):
teams_list = json.loads(params.get("teams"))
teams_list = params.get("teams")
teams = Teams.objects.filter(id__in=teams_list, org=request.profile.org)
event_obj.teams.add(*teams)
event_obj.assigned_to.clear()
if params.get("assigned_to"):
assinged_to_list = json.loads(params.get("assigned_to"))
assinged_to_list = params.get("assigned_to")
profiles = Profile.objects.filter(
id__in=assinged_to_list, org=request.profile.org
)
@ -448,7 +448,7 @@ class EventDetailView(APIView):
class EventCommentView(APIView):
model = Comment
# authentication_classes = (JSONWebTokenAuthentication,)
authentication_classes = (CustomDualAuthentication,)
permission_classes = (IsAuthenticated,)
def get_object(self, pk):
@ -510,7 +510,7 @@ class EventCommentView(APIView):
class EventAttachmentView(APIView):
model = Attachments
# authentication_classes = (JSONWebTokenAuthentication,)
authentication_classes = (CustomDualAuthentication,)
permission_classes = (IsAuthenticated,)
@extend_schema(

24
invoices/api_views.py
View file

@ -15,7 +15,7 @@ from accounts.models import Account
from accounts.serializer import AccountSerializer
from common.models import Attachments, Comment, User
# from common.custom_auth import JSONWebTokenAuthentication
from common.external_auth import CustomDualAuthentication
from common.serializer import (
AttachmentsSerializer,
BillingAddressSerializer,
@ -50,7 +50,7 @@ INVOICE_STATUS = (
class InvoiceListView(APIView, LimitOffsetPagination):
# authentication_classes = (JSONWebTokenAuthentication,)
authentication_classes = (CustomDualAuthentication,)
permission_classes = (IsAuthenticated,)
model = Invoice
@ -77,7 +77,7 @@ class InvoiceListView(APIView, LimitOffsetPagination):
queryset = queryset.filter(created_by=params.get("created_by"))
if params.get("assigned_users"):
queryset = queryset.filter(
assigned_to__in=json.loads(params.get("assigned_users"))
assigned_to__in=params.get("assigned_users")
)
if params.get("status"):
queryset = queryset.filter(status=params.get("status"))
@ -184,7 +184,7 @@ class InvoiceListView(APIView, LimitOffsetPagination):
)
if params.get("accounts"):
accounts = json.loads(params.get("accounts"))
accounts = params.get("accounts")
for account in accounts:
obj_account = Account.objects.filter(
id=account, company=request.company
@ -198,7 +198,7 @@ class InvoiceListView(APIView, LimitOffsetPagination):
if self.request.user.role == "ADMIN":
if params.get("teams"):
teams = json.loads(params.get("teams"))
teams = params.get("teams")
for team in teams:
obj_team = Teams.objects.filter(
id=team, company=request.company
@ -210,7 +210,7 @@ class InvoiceListView(APIView, LimitOffsetPagination):
data["team"] = "Please enter valid Team"
return Response({"error": True}, data)
if params.get("assigned_to"):
assinged_to_users_ids = json.loads(params.get("assigned_to"))
assinged_to_users_ids = params.get("assigned_to")
for user_id in assinged_to_users_ids:
user = User.objects.filter(id=user_id, company=request.company)
@ -240,7 +240,7 @@ class InvoiceListView(APIView, LimitOffsetPagination):
class InvoiceDetailView(APIView):
# authentication_classes = (JSONWebTokenAuthentication,)
authentication_classes = (CustomDualAuthentication,)
permission_classes = (IsAuthenticated,)
model = Invoice
@ -325,7 +325,7 @@ class InvoiceDetailView(APIView):
invoice_obj.accounts.clear()
if params.get("accounts"):
accounts = json.loads(params.get("accounts"))
accounts = params.get("accounts")
for account in accounts:
obj_account = Account.objects.filter(
id=account, company=request.company
@ -339,7 +339,7 @@ class InvoiceDetailView(APIView):
if self.request.user.role == "ADMIN":
invoice_obj.teams.clear()
if params.get("teams"):
teams = json.loads(params.get("teams"))
teams = params.get("teams")
for team in teams:
obj_team = Teams.objects.filter(
id=team, company=request.company
@ -352,7 +352,7 @@ class InvoiceDetailView(APIView):
invoice_obj.assigned_to.clear()
if params.get("assigned_to"):
assinged_to_users_ids = json.loads(params.get("assigned_to"))
assinged_to_users_ids = params.get("assigned_to")
for user_id in assinged_to_users_ids:
user = User.objects.filter(id=user_id, company=request.company)
if user.exists():
@ -540,7 +540,7 @@ class InvoiceDetailView(APIView):
class InvoiceCommentView(APIView):
model = Comment
# authentication_classes = (JSONWebTokenAuthentication,)
authentication_classes = (CustomDualAuthentication,)
permission_classes = (IsAuthenticated,)
def get_object(self, pk):
@ -603,7 +603,7 @@ class InvoiceCommentView(APIView):
class InvoiceAttachmentView(APIView):
model = Attachments
# authentication_classes = (JSONWebTokenAuthentication,)
authentication_classes = (CustomDualAuthentication,)
permission_classes = (IsAuthenticated,)
@swagger_auto_schema(

12
leads/views.py
View file

@ -10,7 +10,7 @@ from rest_framework.views import APIView
from accounts.models import Account, Tags
from common.models import APISettings, Attachments, Comment, Profile
# from common.custom_auth import JSONWebTokenAuthentication
from common.external_auth import CustomDualAuthentication
from common.serializer import (
AttachmentsSerializer,
CommentSerializer,
@ -63,7 +63,7 @@ class LeadListView(APIView, LimitOffsetPagination):
if self.request.profile.role != "ADMIN" and not self.request.user.is_superuser:
queryset = queryset.filter(
Q(assigned_to__in=[self.request.profile])
| Q(created_by=self.request.profile.user)
| Q(created_by=self.request.profile.user.user)
)
if params:
@ -258,7 +258,7 @@ class LeadListView(APIView, LimitOffsetPagination):
class LeadDetailView(APIView):
model = Lead
# authentication_classes = (JSONWebTokenAuthentication,)
authentication_classes = (CustomDualAuthentication,)
permission_classes = (IsAuthenticated,)
def get_object(self, pk):
@ -563,7 +563,7 @@ class LeadDetailView(APIView):
class LeadUploadView(APIView):
model = Lead
# authentication_classes = (JSONWebTokenAuthentication,)
authentication_classes = (CustomDualAuthentication,)
permission_classes = (IsAuthenticated,)
@extend_schema(tags=["Leads"], parameters=swagger_params1.organization_params,request=LeadUploadSwaggerSerializer)
@ -589,7 +589,7 @@ class LeadUploadView(APIView):
class LeadCommentView(APIView):
model = Comment
# authentication_classes = (JSONWebTokenAuthentication,)
authentication_classes = (CustomDualAuthentication,)
permission_classes = (IsAuthenticated,)
def get_object(self, pk):
@ -648,7 +648,7 @@ class LeadCommentView(APIView):
class LeadAttachmentView(APIView):
model = Attachments
# authentication_classes = (JSONWebTokenAuthentication,)
authentication_classes = (CustomDualAuthentication,)
permission_classes = (IsAuthenticated,)
@extend_schema(tags=["Leads"], parameters=swagger_params1.organization_params)

21
opportunity/migrations/0002_alter_opportunity_created_by.py Normal file
View file

@ -0,0 +1,21 @@
# Generated by Django 4.2.1 on 2023-10-31 12:35
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),
('opportunity', '0001_initial'),
]
operations = [
migrations.AlterField(
model_name='opportunity',
name='created_by',
field=models.ForeignKey(null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='%(class)s_created_by', to=settings.AUTH_USER_MODEL, verbose_name='Created By'),
),
]

6
opportunity/models.py
View file

@ -47,12 +47,6 @@ class Opportunity(BaseModel):
assigned_to = models.ManyToManyField(
Profile, related_name="opportunity_assigned_to"
)
created_by = models.ForeignKey(
Profile,
related_name="opportunity_created_by",
on_delete=models.SET_NULL,
null=True,
)
is_active = models.BooleanField(default=False)
tags = models.ManyToManyField(Tags, blank=True)
teams = models.ManyToManyField(Teams, related_name="oppurtunity_teams")

4
opportunity/serializer.py
View file

@ -2,7 +2,7 @@ from rest_framework import serializers
from accounts.models import Tags
from accounts.serializer import AccountSerializer
from common.serializer import AttachmentsSerializer, ProfileSerializer
from common.serializer import AttachmentsSerializer, ProfileSerializer,UserSerializer
from contacts.serializer import ContactSerializer
from opportunity.models import Opportunity
from teams.serializer import TeamsSerializer
@ -17,7 +17,7 @@ class TagsSerializer(serializers.ModelSerializer):
class OpportunitySerializer(serializers.ModelSerializer):
account = AccountSerializer()
closed_by = ProfileSerializer()
created_by = ProfileSerializer()
created_by = UserSerializer()
tags = TagsSerializer(read_only=True, many=True)
assigned_to = ProfileSerializer(read_only=True, many=True)
contacts = ContactSerializer(read_only=True, many=True)

42
opportunity/views.py
View file

@ -12,7 +12,7 @@ from accounts.models import Account, Tags
from accounts.serializer import AccountSerializer, TagsSerailizer
from common.models import Attachments, Comment, Profile
# from common.custom_auth import JSONWebTokenAuthentication
from common.external_auth import CustomDualAuthentication
from common.serializer import (
AttachmentsSerializer,
CommentSerializer,
@ -30,7 +30,7 @@ from teams.models import Teams
class OpportunityListView(APIView, LimitOffsetPagination):
# authentication_classes = (JSONWebTokenAuthentication,)
authentication_classes = (CustomDualAuthentication,)
permission_classes = (IsAuthenticated,)
model = Opportunity
@ -41,13 +41,13 @@ class OpportunityListView(APIView, LimitOffsetPagination):
contacts = Contact.objects.filter(org=self.request.profile.org)
if self.request.profile.role != "ADMIN" and not self.request.user.is_superuser:
queryset = queryset.filter(
Q(created_by=self.request.profile) | Q(assigned_to=self.request.profile)
Q(created_by=self.request.profile.user) | Q(assigned_to=self.request.profile)
).distinct()
accounts = accounts.filter(
Q(created_by=self.request.profile) | Q(assigned_to=self.request.profile)
Q(created_by=self.request.profile.user) | Q(assigned_to=self.request.profile)
).distinct()
contacts = contacts.filter(
Q(created_by=self.request.profile) | Q(assigned_to=self.request.profile)
Q(created_by=self.request.profile.user) | Q(assigned_to=self.request.profile)
).distinct()
if params:
@ -63,7 +63,7 @@ class OpportunityListView(APIView, LimitOffsetPagination):
)
if params.get("tags"):
queryset = queryset.filter(
tags__in=json.loads(params.get("tags"))
tags__in=params.get("tags")
).distinct()
context = {}
@ -113,18 +113,18 @@ class OpportunityListView(APIView, LimitOffsetPagination):
serializer = OpportunityCreateSerializer(data=params, request_obj=request)
if serializer.is_valid():
opportunity_obj = serializer.save(
created_by=request.profile,
created_by=request.profile.user,
closed_on=params.get("due_date"),
org=request.profile.org,
)
if params.get("contacts"):
contacts_list = json.loads(params.get("contacts"))
contacts_list = params.get("contacts")
contacts = Contact.objects.filter(id__in=contacts_list, org=request.profile.org)
opportunity_obj.contacts.add(*contacts)
if params.get("tags"):
tags = json.loads(params.get("tags"))
tags = params.get("tags")
for tag in tags:
obj_tag = Tags.objects.filter(slug=tag.lower())
if obj_tag.exists():
@ -139,12 +139,12 @@ class OpportunityListView(APIView, LimitOffsetPagination):
opportunity_obj.closed_by = self.request.profile
if params.get("teams"):
teams_list = json.loads(params.get("teams"))
teams_list = params.get("teams")
teams = Teams.objects.filter(id__in=teams_list, org=request.profile.org)
opportunity_obj.teams.add(*teams)
if params.get("assigned_to"):
assinged_to_list = json.loads(params.get("assigned_to"))
assinged_to_list = params.get("assigned_to")
profiles = Profile.objects.filter(
id__in=assinged_to_list, org=request.profile.org, is_active=True
)
@ -152,7 +152,7 @@ class OpportunityListView(APIView, LimitOffsetPagination):
if self.request.FILES.get("opportunity_attachment"):
attachment = Attachments()
attachment.created_by = self.request.profile
attachment.created_by = self.request.profile.user
attachment.file_name = self.request.FILES.get(
"opportunity_attachment"
).name
@ -180,7 +180,7 @@ class OpportunityListView(APIView, LimitOffsetPagination):
class OpportunityDetailView(APIView):
# authentication_classes = (JSONWebTokenAuthentication,)
authentication_classes = (CustomDualAuthentication,)
permission_classes = (IsAuthenticated,)
model = Opportunity
@ -226,13 +226,13 @@ class OpportunityDetailView(APIView):
)
opportunity_object.contacts.clear()
if params.get("contacts"):
contacts_list = json.loads(params.get("contacts"))
contacts_list = params.get("contacts")
contacts = Contact.objects.filter(id__in=contacts_list, org=request.profile.org)
opportunity_object.contacts.add(*contacts)
opportunity_object.tags.clear()
if params.get("tags"):
tags = json.loads(params.get("tags"))
tags = params.get("tags")
for tag in tags:
obj_tag = Tags.objects.filter(slug=tag.lower())
if obj_tag.exists():
@ -248,13 +248,13 @@ class OpportunityDetailView(APIView):
opportunity_object.teams.clear()
if params.get("teams"):
teams_list = json.loads(params.get("teams"))
teams_list = params.get("teams")
teams = Teams.objects.filter(id__in=teams_list, org=request.profile.org)
opportunity_object.teams.add(*teams)
opportunity_object.assigned_to.clear()
if params.get("assigned_to"):
assinged_to_list = json.loads(params.get("assigned_to"))
assinged_to_list = params.get("assigned_to")
profiles = Profile.objects.filter(
id__in=assinged_to_list, org=request.profile.org, is_active=True
)
@ -262,7 +262,7 @@ class OpportunityDetailView(APIView):
if self.request.FILES.get("opportunity_attachment"):
attachment = Attachments()
attachment.created_by = self.request.profile
attachment.created_by = self.request.profile.user
attachment.file_name = self.request.FILES.get(
"opportunity_attachment"
).name
@ -423,7 +423,7 @@ class OpportunityDetailView(APIView):
if self.request.FILES.get("opportunity_attachment"):
attachment = Attachments()
attachment.created_by = self.request.profile
attachment.created_by = self.request.profile.user
attachment.file_name = self.request.FILES.get(
"opportunity_attachment"
).name
@ -449,7 +449,7 @@ class OpportunityDetailView(APIView):
class OpportunityCommentView(APIView):
model = Comment
# authentication_classes = (JSONWebTokenAuthentication,)
authentication_classes = (CustomDualAuthentication,)
permission_classes = (IsAuthenticated,)
def get_object(self, pk):
@ -513,7 +513,7 @@ class OpportunityCommentView(APIView):
class OpportunityAttachmentView(APIView):
model = Attachments
# authentication_classes = (JSONWebTokenAuthentication,)
authentication_classes = (CustomDualAuthentication,)
permission_classes = (IsAuthenticated,)
@extend_schema(

21
tasks/migrations/0002_alter_task_created_by.py Normal file
View file

@ -0,0 +1,21 @@
# Generated by Django 4.2.1 on 2023-10-31 12:42
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),
('tasks', '0001_initial'),
]
operations = [
migrations.AlterField(
model_name='task',
name='created_by',
field=models.ForeignKey(null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='%(class)s_created_by', to=settings.AUTH_USER_MODEL, verbose_name='Created By'),
),
]

14
tasks/models.py
View file

@ -35,13 +35,13 @@ class Task(BaseModel):
assigned_to = models.ManyToManyField(Profile, related_name="users_tasks")
created_by = models.ForeignKey(
Profile,
related_name="task_created",
blank=True,
null=True,
on_delete=models.SET_NULL,
)
# created_by = models.ForeignKey(
# Profile,
# related_name="task_created",
# blank=True,
# null=True,
# on_delete=models.SET_NULL,
# )
teams = models.ManyToManyField(Teams, related_name="tasks_teams")
org = models.ForeignKey(
Org, on_delete=models.SET_NULL, null=True, blank=True, related_name="task_org"

3
tasks/serializer.py
View file

@ -4,6 +4,7 @@ from common.serializer import (
AttachmentsSerializer,
CommentSerializer,
ProfileSerializer,
UserSerializer
)
from contacts.serializer import ContactSerializer
from tasks.models import Task
@ -11,7 +12,7 @@ from teams.serializer import TeamsSerializer
class TaskSerializer(serializers.ModelSerializer):
created_by = ProfileSerializer()
created_by = UserSerializer()
assigned_to = ProfileSerializer(read_only=True, many=True)
contacts = ContactSerializer(read_only=True, many=True)
teams = TeamsSerializer(read_only=True, many=True)

32
tasks/views.py
View file

@ -12,7 +12,7 @@ from accounts.models import Account
from accounts.serializer import AccountSerializer
from common.models import Attachments, Comment, Profile
# from common.custom_auth import JSONWebTokenAuthentication
from common.external_auth import CustomDualAuthentication
from common.serializer import (
AttachmentsSerializer,
CommentSerializer,
@ -30,7 +30,7 @@ from teams.serializer import TeamsSerializer
class TaskListView(APIView, LimitOffsetPagination):
model = Task
# authentication_classes = (JSONWebTokenAuthentication,)
authentication_classes = (CustomDualAuthentication,)
permission_classes = (IsAuthenticated,)
def get_context_data(self, **kwargs):
@ -41,13 +41,13 @@ class TaskListView(APIView, LimitOffsetPagination):
if self.request.profile.role != "ADMIN" and not self.request.profile.is_admin:
queryset = queryset.filter(
Q(assigned_to__in=[self.request.profile])
| Q(created_by=self.request.profile)
| Q(created_by=self.request.profile.user)
)
accounts = accounts.filter(
Q(created_by=self.request.profile) | Q(assigned_to=self.request.profile)
Q(created_by=self.request.profile.user) | Q(assigned_to=self.request.profile)
).distinct()
contacts = contacts.filter(
Q(created_by=self.request.profile) | Q(assigned_to=self.request.profile)
Q(created_by=self.request.profile.user) | Q(assigned_to=self.request.profile)
).distinct()
if params:
@ -96,22 +96,22 @@ class TaskListView(APIView, LimitOffsetPagination):
serializer = TaskCreateSerializer(data=params, request_obj=request)
if serializer.is_valid():
task_obj = serializer.save(
created_by=request.profile,
created_by=request.profile.user,
due_date=params.get("due_date"),
org=request.profile.org,
)
if params.get("contacts"):
contacts_list = json.loads(params.get("contacts"))
contacts_list = params.get("contacts")
contacts = Contact.objects.filter(id__in=contacts_list, org=request.profile.org)
task_obj.contacts.add(*contacts)
if params.get("teams"):
teams_list = json.loads(params.get("teams"))
teams_list = params.get("teams")
teams = Teams.objects.filter(id__in=teams_list, org=request.profile.org)
task_obj.teams.add(*teams)
if params.get("assigned_to"):
assinged_to_list = json.loads(params.get("assigned_to"))
assinged_to_list = params.get("assigned_to")
profiles = Profile.objects.filter(
id__in=assinged_to_list, org=request.profile.org, is_active=True
)
@ -129,7 +129,7 @@ class TaskListView(APIView, LimitOffsetPagination):
class TaskDetailView(APIView):
model = Task
# authentication_classes = (JSONWebTokenAuthentication,)
authentication_classes = (CustomDualAuthentication,)
permission_classes = (IsAuthenticated,)
def get_object(self, pk):
@ -246,7 +246,7 @@ class TaskDetailView(APIView):
if self.request.FILES.get("task_attachment"):
attachment = Attachments()
attachment.created_by = self.request.profile
attachment.created_by = self.request.profile.user
attachment.file_name = self.request.FILES.get("task_attachment").name
attachment.task = self.task_obj
attachment.attachment = self.request.FILES.get("task_attachment")
@ -283,19 +283,19 @@ class TaskDetailView(APIView):
)
task_obj.contacts.clear()
if params.get("contacts"):
contacts_list = json.loads(params.get("contacts"))
contacts_list = params.get("contacts")
contacts = Contact.objects.filter(id__in=contacts_list, org=request.profile.org)
task_obj.contacts.add(*contacts)
task_obj.teams.clear()
if params.get("teams"):
teams_list = json.loads(params.get("teams"))
teams_list = params.get("teams")
teams = Teams.objects.filter(id__in=teams_list, org=request.profile.org)
task_obj.teams.add(*teams)
task_obj.assigned_to.clear()
if params.get("assigned_to"):
assinged_to_list = json.loads(params.get("assigned_to"))
assinged_to_list = params.get("assigned_to")
profiles = Profile.objects.filter(
id__in=assinged_to_list, org=request.profile.org, is_active=True
)
@ -333,7 +333,7 @@ class TaskDetailView(APIView):
class TaskCommentView(APIView):
model = Comment
# authentication_classes = (JSONWebTokenAuthentication,)
authentication_classes = (CustomDualAuthentication,)
permission_classes = (IsAuthenticated,)
def get_object(self, pk):
@ -397,7 +397,7 @@ class TaskCommentView(APIView):
class TaskAttachmentView(APIView):
model = Attachments
# authentication_classes = (JSONWebTokenAuthentication,)
authentication_classes = (CustomDualAuthentication,)
permission_classes = (IsAuthenticated,)
@extend_schema(

4
teams/serializer.py
View file

@ -1,12 +1,12 @@
from rest_framework import serializers
from common.serializer import ProfileSerializer
from common.serializer import ProfileSerializer,UserSerializer
from teams.models import Teams
class TeamsSerializer(serializers.ModelSerializer):
users = ProfileSerializer(read_only=True, many=True)
created_by = ProfileSerializer()
created_by = UserSerializer()
class Meta:
model = Teams

10
teams/views.py
View file

@ -1,7 +1,7 @@
import json
from drf_spectacular.utils import OpenApiExample, OpenApiParameter, extend_schema
# from common.custom_auth import JSONWebTokenAuthentication
from common.external_auth import CustomDualAuthentication
from rest_framework import status
from rest_framework.pagination import LimitOffsetPagination
from rest_framework.permissions import IsAuthenticated
@ -17,7 +17,7 @@ from teams.tasks import remove_users, update_team_users
class TeamsListView(APIView, LimitOffsetPagination):
model = Teams
# authentication_classes = (JSONWebTokenAuthentication,)
authentication_classes = (CustomDualAuthentication,)
permission_classes = (IsAuthenticated,)
def get_context_data(self, **kwargs):
@ -30,7 +30,7 @@ class TeamsListView(APIView, LimitOffsetPagination):
queryset = queryset.filter(created_by=params.get("created_by"))
if params.get("assigned_users"):
queryset = queryset.filter(
users__id__in=json.loads(params.get("assigned_users"))
users__id__in=params.get("assigned_users")
)
context = {}
@ -85,7 +85,7 @@ class TeamsListView(APIView, LimitOffsetPagination):
team_obj = serializer.save(org=request.profile.org)
if params.get("assign_users"):
assinged_to_list = json.loads(params.get("users"))
assinged_to_list = params.get("users")
profiles = Profile.objects.filter(
id__in=assinged_to_list, org=request.profile.org
)
@ -103,7 +103,7 @@ class TeamsListView(APIView, LimitOffsetPagination):
class TeamsDetailView(APIView):
model = Teams
# authentication_classes = (JSONWebTokenAuthentication,)
authentication_classes = (CustomDualAuthentication,)
permission_classes = (IsAuthenticated,)
def get_object(self, pk):