API re-structure (#414)

Co-authored-by: Ashwin <ashwin@micropyramid.com>
This commit is contained in:
rayudu4u 2020-11-09 19:19:50 +05:30 committed by GitHub
parent ee45ec9458
commit 2582253de9
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
10 changed files with 317 additions and 414 deletions

View file

@ -4,9 +4,6 @@ from accounts import api_views
app_name = 'api_accounts'
urlpatterns = [
path("accounts-list/", api_views.AccountsListView.as_view()),
path("accounts-create/", api_views.CreateAccountView.as_view()),
path("<int:pk>/view/", api_views.AccountDetailView.as_view()),
path("accounts/<int:pk>/update/", api_views.AccountUpdateView.as_view()),
path("accounts/<int:pk>/delete/", api_views.AccountDeleteView.as_view()),
path("", api_views.AccountsListView.as_view()),
path("<int:pk>/", api_views.AccountDetailView.as_view()),
]

View file

@ -9,7 +9,7 @@ from accounts.forms import (
from accounts.models import Account, Tags
from accounts.tasks import send_email_to_assigned_user
from accounts import swagger_params
from accounts.serializer import AccountSerializer, TagsSerailizer
from accounts.serializer import AccountSerializer, TagsSerailizer, AccountCreateSerializer
from common.models import User, Attachments
from common.utils import (
COUNTRIES,
@ -53,6 +53,8 @@ class AccountsListView(APIView):
model = Account
def get_queryset(self):
params = self.request.query_params if len(
self.request.data) == 0 else self.request.data
queryset = self.model.objects.all()
if self.request.user.role != "ADMIN" and not self.request.user.is_superuser:
queryset = queryset.filter(
@ -63,23 +65,23 @@ class AccountsListView(APIView):
if self.request.GET.get("tag", None):
queryset = queryset.filter(
tags__in=self.request.GET.getlist("tag"))
request_post = self.request.POST
if request_post:
if request_post.get("name"):
queryset = queryset.filter(
name__icontains=request_post.get("name"))
if request_post.get("city"):
queryset = queryset.filter(
billing_city__contains=request_post.get("city")
)
if request_post.get("industry"):
queryset = queryset.filter(
industry__icontains=request_post.get("industry")
)
if request_post.get("tag"):
queryset = queryset.filter(
tags__in=request_post.getlist("tag"))
if params.get('is_filter'):
request_post = params
if request_post:
if request_post.get("name"):
queryset = queryset.filter(
name__icontains=request_post.get("name"))
if request_post.get("city"):
queryset = queryset.filter(
billing_city__contains=request_post.get("city")
)
if request_post.get("industry"):
queryset = queryset.filter(
industry__icontains=request_post.get("industry")
)
if request_post.get("tag"):
queryset = queryset.filter(
tags__in=request_post.getlist("tag"))
return queryset.filter(company=self.request.company).distinct()
@ -133,34 +135,21 @@ class AccountsListView(APIView):
context = self.get_context_data(**kwargs)
return Response(context)
@swagger_auto_schema(tags=["accounts"], manual_parameters=swagger_params.account_list_post_params)
def post(self, request, *args, **kwargs):
context = self.get_context_data(**kwargs)
return Response(context)
class CreateAccountView(APIView):
authentication_classes = (JSONWebTokenAuthentication,)
permission_classes = (IsAuthenticated,)
model = Account
@swagger_auto_schema(tags=["accounts"], manual_parameters=swagger_params.account_create_post_params)
def post(self, request):
def post(self, request, *args, **kwargs):
params = request.query_params if len(
request.data) == 0 else request.data
context = {}
form = AccountForm(
params, request.FILES, request_obj=request, account=True, request_user=self.request.user
serializer = AccountCreateSerializer(
data=params, request_obj=request, account=True
)
# Save Account
if form.is_valid():
account_object = form.save(commit=False)
account_object.created_by = self.request.user
account_object.company = self.request.company
account_object.save()
if serializer.is_valid():
account_object = serializer.save(
created_by=request.user, company=request.company)
if self.request.POST.get("tags", ""):
tags = self.request.POST.get("tags")
tags = params.get("tags")
splitted_tags = tags.split(",")
for t in splitted_tags:
tag = Tags.objects.filter(name=t)
@ -169,24 +158,24 @@ class CreateAccountView(APIView):
else:
tag = Tags.objects.create(name=t)
account_object.tags.add(tag)
if self.request.POST.getlist("contacts", []):
if params.getlist("contacts", []):
account_object.contacts.add(
*self.request.POST.getlist("contacts"))
if self.request.POST.getlist("assigned_to", []):
*params.getlist("contacts"))
if params.getlist("assigned_to", []):
account_object.assigned_to.add(
*self.request.POST.getlist("assigned_to"))
*params.getlist("assigned_to"))
if self.request.FILES.get("account_attachment"):
attachment = Attachments()
attachment.created_by = self.request.user
attachment.file_name = self.request.FILES.get(
attachment.created_by = request.user
attachment.file_name = request.FILES.get(
"account_attachment").name
attachment.account = account_object
attachment.attachment = self.request.FILES.get(
attachment.attachment = request.FILES.get(
"account_attachment")
attachment.save()
if self.request.POST.getlist("teams", []):
if params.getlist("teams", []):
user_ids = Teams.objects.filter(
id__in=self.request.POST.getlist("teams")
id__in=params.getlist("teams")
).values_list("users", flat=True)
assinged_to_users_ids = account_object.assigned_to.all().values_list(
"id", flat=True
@ -194,13 +183,13 @@ class CreateAccountView(APIView):
for user_id in user_ids:
if user_id not in assinged_to_users_ids:
account_object.assigned_to.add(user_id)
if self.request.POST.getlist("teams", []):
account_object.teams.add(*self.request.POST.getlist("teams"))
if params.getlist("teams", []):
account_object.teams.add(*params.getlist("teams"))
assigned_to_list = list(
account_object.assigned_to.all().values_list("id", flat=True)
)
current_site = get_current_site(self.request)
current_site = get_current_site(request)
recipients = assigned_to_list
send_email_to_assigned_user.delay(
recipients,
@ -208,91 +197,42 @@ class CreateAccountView(APIView):
domain=current_site.domain,
protocol=self.request.scheme,
)
return Response({'error': False})
context["errors"] = form.errors
return Response({'error': False,
'message': 'Account Created Successfully'})
context["errors"] = serializer.errors
return Response(context, status=status.HTTP_400_BAD_REQUEST)
def get_context_data(self, **kwargs):
context = {}
if self.request.user.role == "ADMIN" or self.request.user.is_superuser:
self.users = User.objects.filter(
is_active=True, company=self.request.company
).order_by("email")
elif self.request.user.google.all():
self.users = []
else:
self.users = User.objects.filter(
role="ADMIN", company=self.request.company
).order_by("email")
context["users"] = UserSerializer(self.users, many=True).data
context["industries"] = INDCHOICES
context["countries"] = COUNTRIES
contacts = Contact.objects.filter(company=self.request.company)
leads = Lead.objects.exclude(
status__in=["converted", "closed"], company=self.request.company)
if self.request.user.role == "ADMIN" or self.request.user.is_superuser:
context["leads"] = LeadSerializer(leads, many=True).data
context["contacts"] = ContactSerializer(contacts, many=True).data
else:
leads = filter(
Q(assigned_to__in=[self.request.user])
| Q(created_by=self.request.user))
context["leads"] = LeadSerializer(leads, many=True).data
context["lead_count"] = leads.count()
if self.request.user.role != "ADMIN" and not self.request.user.is_superuser:
context["lead_count"] = (
Lead.objects.filter(
Q(assigned_to__in=[self.request.user])
| Q(created_by=self.request.user)
)
.filter(company=self.request.company,)
.exclude(status="closed")
.count()
)
contacts = contacts.filter(
Q(assigned_to__in=[self.request.user]) | Q(
created_by=self.request.user)
)
context["contacts"] = ContactSerializer(contacts, many=True).data
context["contact_count"] = contacts.count()
context["teams"] = TeamsSerializer(Teams.objects.filter(
company=self.request.company,), many=True).data
return context
@swagger_auto_schema(tags=["accounts"], manual_parameters=swagger_params.account_create_get_params)
def get(self, request, *args, **kwargs):
context = self.get_context_data(**kwargs)
return Response(context)
class AccountUpdateView(APIView):
class AccountDetailView(APIView):
authentication_classes = (JSONWebTokenAuthentication,)
permission_classes = (IsAuthenticated,)
model = Account
def get_object(self, pk):
return Account.objects.filter(id=pk).first()
def dispatch(self, request, *args, **kwargs):
self.users = User.objects.filter(is_active=True).order_by("email")
self.account_obj = Account.objects.filter(id=kwargs.get('pk')).first()
if self.account_obj.company != request.company:
self.account = self.get_object(pk=kwargs.get('pk'))
if self.account.company != request.company:
raise PermissionDenied
return super(AccountUpdateView, self).dispatch(request, *args, **kwargs)
return super(AccountDetailView, self).dispatch(request, *args, **kwargs)
@swagger_auto_schema(tags=["accounts"], manual_parameters=swagger_params.account_update_post_params)
def post(self, request, *args, **kwargs):
def put(self, request, pk, format=None):
params = request.query_params if len(
request.data) == 0 else request.data
context = {}
form = AccountForm(params, request.FILES, instance=self.account_obj, request_obj=request, account=True, request_user=self.request.user
)
if form.is_valid():
account_object = form.save(commit=False)
account_object.save()
serializer = AccountCreateSerializer(
data=params, instance=self.account,
request_obj=request, account=True
)
if serializer.is_valid():
account_object = serializer.save()
previous_assigned_to_users = list(
account_object.assigned_to.all().values_list("id", flat=True)
)
account_object.tags.clear()
if self.request.POST.get("tags", ""):
tags = self.request.POST.get("tags")
if params.get("tags", ""):
tags = params.get("tags")
splitted_tags = tags.split(",")
for t in splitted_tags:
tag = Tags.objects.filter(name=t.lower())
@ -301,14 +241,14 @@ class AccountUpdateView(APIView):
else:
tag = Tags.objects.create(name=t.lower())
account_object.tags.add(tag)
if self.request.POST.getlist("contacts", []):
if params.getlist("contacts", []):
account_object.contacts.clear()
account_object.contacts.add(
*self.request.POST.getlist("contacts"))
if self.request.POST.getlist("assigned_to", []):
*params.getlist("contacts"))
if params.getlist("assigned_to", []):
account_object.assigned_to.clear()
account_object.assigned_to.add(
*self.request.POST.getlist("assigned_to"))
*params.getlist("assigned_to"))
else:
account_object.assigned_to.clear()
if self.request.FILES.get("account_attachment"):
@ -321,12 +261,12 @@ class AccountUpdateView(APIView):
"account_attachment")
attachment.save()
if self.request.POST.getlist("teams", []):
if params.getlist("teams", []):
account_object.teams.clear()
account_object.teams.add(*self.request.POST.getlist("teams"))
account_object.teams.add(*params.getlist("teams"))
else:
account_object.teams.clear()
if self.request.POST.getlist("teams", []):
if params.getlist("teams", []):
user_ids = Teams.objects.filter(
id__in=self.request.POST.getlist("teams")
).values_list("users", flat=True)
@ -349,67 +289,14 @@ class AccountUpdateView(APIView):
domain=current_site.domain,
protocol=self.request.scheme,
)
return Response({'error': False})
context['errors'] = form.errors
return Response({'error': False,
'message': 'Account Updated Successfully'})
context['errors'] = serializer.errors
return Response(context, status=status.HTTP_400_BAD_REQUEST)
def get_context_data(self, **kwargs):
context = {}
self.users = User.objects.filter(is_active=True).order_by("email")
context["account_obj"] = AccountSerializer(self.account_obj).data
if self.request.user.role != "ADMIN" and not self.request.user.is_superuser:
if (self.request.user != context["account_obj"].created_by) and (
self.request.user not in context[
"account_obj"].assigned_to.all()
):
raise PermissionDenied
if self.request.user.role != "ADMIN" and not self.request.user.is_superuser:
self.users = self.users.filter(
Q(role="ADMIN") | Q(id__in=[self.request.user.id, ])
)
context["users"] = UserSerializer(self.users, many=True).data
context["industries"] = INDCHOICES
context["countries"] = COUNTRIES
context["contact_count"] = Contact.objects.count()
context["edit_view"] = True
leads = Lead.objects.exclude(
status__in=["converted", "closed"])
if self.request.user.role == "ADMIN":
context["leads"] = LeadSerializer(leads, many=True).data
else:
leads = leads.filter(Q(assigned_to__in=[self.request.user]) | Q(
created_by=self.request.user))
context["leads"] = LeadSerializer(leads, many=True).data
context["lead_count"] = leads.count()
if self.request.user.role != "ADMIN" and not self.request.user.is_superuser:
context["lead_count"] = (
Lead.objects.filter(
Q(assigned_to__in=[self.request.user])
| Q(created_by=self.request.user)
)
.exclude(status="closed")
.count()
)
context["teams"] = TeamsSerializer(Teams.objects.all(), many=True).data
return context
@swagger_auto_schema(tags=["accounts"], manual_parameters=swagger_params.account_update_get_params)
def get(self, request, *args, **kwargs):
context = self.get_context_data(**kwargs)
return Response(context)
class AccountDeleteView(APIView):
authentication_classes = (JSONWebTokenAuthentication,)
permission_classes = (IsAuthenticated,)
model = Account
def get_object(self):
return Account.objects.filter(id=self.kwargs.get('pk')).first()
@swagger_auto_schema(tags=["accounts"], manual_parameters=swagger_params.account_delete_params)
def get(self, request, *args, **kwargs):
self.object = self.get_object()
@swagger_auto_schema(tags=["accounts"], manual_parameters=swagger_params.company_params)
def delete(self, request, pk, format=None):
self.object = self.get_object(pk)
if self.object.company != request.company:
raise PermissionDenied
if self.request.user.role != "ADMIN" and not self.request.user.is_superuser:
@ -418,22 +305,8 @@ class AccountDeleteView(APIView):
self.object.delete()
return Response({'status': 'success'}, status=status.HTTP_204_NO_CONTENT)
class AccountDetailView(APIView):
authentication_classes = (JSONWebTokenAuthentication,)
permission_classes = (IsAuthenticated,)
model = Account
def get_object(self):
return Account.objects.filter(id=self.kwargs.get('pk')).first()
def dispatch(self, request, *args, **kwargs):
self.account = self.get_object()
if self.account.company != request.company:
raise PermissionDenied
return super(AccountDetailView, self).dispatch(request, *args, **kwargs)
def get_context_data(self, **kwargs):
@swagger_auto_schema(tags=["accounts"], manual_parameters=swagger_params.account_list_get_params)
def get(self, request, pk, format=None):
context = {}
context["account_obj"] = AccountSerializer(self.account).data
if self.request.user.role != "ADMIN" and not self.request.user.is_superuser:
@ -461,7 +334,8 @@ class AccountDetailView(APIView):
)
elif self.request.user != self.account.created_by:
if self.account.created_by:
users_mention = [{"username": self.account.created_by.username}]
users_mention = [
{"username": self.account.created_by.username}]
else:
users_mention = []
else:
@ -469,14 +343,21 @@ class AccountDetailView(APIView):
context.update(
{
"comments": CommentSerializer(self.account.accounts_comments.all(), many=True).data,
"attachments": AttachmentsSerializer(self.account.account_attachment.all(), many=True).data,
"opportunity_list": OpportunitySerializer(Opportunity.objects.filter(account=self.account), many=True).data,
"contacts": ContactSerializer(self.account.contacts.all(), many=True).data,
"comments": CommentSerializer(
self.account.accounts_comments.all(), many=True).data,
"attachments": AttachmentsSerializer(
self.account.account_attachment.all(), many=True).data,
"opportunity_list": OpportunitySerializer(
Opportunity.objects.filter(
account=self.account), many=True).data,
"contacts": ContactSerializer(
self.account.contacts.all(), many=True).data,
"users": UserSerializer(User.objects.filter(
is_active=True, company=self.request.company,
).order_by("email"), many=True).data,
"cases": CaseSerializer(Case.objects.filter(account=self.account), many=True).data,
"cases": CaseSerializer(
Case.objects.filter(
account=self.account), many=True).data,
"stages": STAGES,
"sources": SOURCES,
"countries": COUNTRIES,
@ -485,16 +366,13 @@ class AccountDetailView(APIView):
"case_priority": PRIORITY_CHOICE,
"case_status": STATUS_CHOICE,
"comment_permission": comment_permission,
"tasks": TaskSerializer(self.account.accounts_tasks.all(), many=True).data,
"invoices": InvoiceSerailizer(self.account.accounts_invoices.all(), many=True).data,
"emails": EmailSerailizer(self.account.sent_email.all(), many=True).data,
"tasks": TaskSerializer(
self.account.accounts_tasks.all(), many=True).data,
"invoices": InvoiceSerailizer(
self.account.accounts_invoices.all(), many=True).data,
"emails": EmailSerailizer(
self.account.sent_email.all(), many=True).data,
"users_mention": users_mention,
}
)
return context
@swagger_auto_schema(tags=["accounts"], manual_parameters=swagger_params.account_list_get_params)
def get(self, request, *args, **kwargs):
context = self.get_context_data(**kwargs)
return Response(context)

View file

@ -7,6 +7,7 @@ from contacts.serializer import ContactSerializer
class TagsSerailizer(serializers.ModelSerializer):
class Meta:
model = Tags
fields = (
@ -83,3 +84,62 @@ class EmailLogSerializer(serializers.ModelSerializer):
"contact"
"is_sent"
)
class AccountCreateSerializer(serializers.ModelSerializer):
def __init__(self, *args, **kwargs):
account_view = kwargs.pop("account", False)
request_obj = kwargs.pop("request_obj", None)
super(AccountCreateSerializer, self).__init__(*args, **kwargs)
self.fields["status"].required = False
if account_view:
self.fields["billing_address_line"].required = True
self.fields["billing_street"].required = True
self.fields["billing_city"].required = True
self.fields["billing_state"].required = True
self.fields["billing_postcode"].required = True
self.fields["billing_country"].required = True
if self.instance:
self.fields["lead"].required = False
self.fields["lead"].required = False
self.company = request_obj.company
def validate_name(self, name):
if self.instance:
if self.instance.name != name:
if not Account.objects.filter(
name__iexact=name,
company=self.company
).exists():
return name
raise serializers.ValidationError(
"Account already exists with this name")
return name
if not Account.objects.filter(
name__iexact=name,
company=self.company).exists():
return name
raise serializers.ValidationError(
"Account already exists with this name")
class Meta:
model = Account
fields = (
"name",
"phone",
"email",
"website",
"industry",
"description",
"status",
"billing_address_line",
"billing_street",
"billing_city",
"billing_state",
"billing_postcode",
"billing_country",
"lead",
"contacts",
)

View file

@ -61,6 +61,6 @@ account_update_post_params = [
required=True, type=openapi.TYPE_STRING),
]
account_delete_params = [
company_params = [
company_params_in_header,
]

View file

@ -7,18 +7,15 @@ app_name = "api_common"
urlpatterns = [
path("dashboard/", api_views.ApiHomeView.as_view()),
path("registration/", api_views.RegistrationView.as_view()),
path("login/", api_views.LoginView.as_view()),
path("validate-subdomain/", api_views.check_sub_domain),
path("auth/register/", api_views.RegistrationView.as_view()),
path("auth/login/", api_views.LoginView.as_view()),
path("auth/validate-subdomain/", api_views.check_sub_domain),
path("profile/", api_views.ProfileView.as_view()),
path("get_teams_and_users/", api_views.GetTeamsAndUsersView.as_view()),
path("change-password/", api_views.ChangePasswordView.as_view(), name="change_password"),
path("forgot-password/", api_views.ForgotPasswordView.as_view()),
path("reset-password/", api_views.ResetPasswordView.as_view(), name='reset_password'),
path("users/list/", api_views.UsersListView.as_view(), name="users_list"),
path("users/<int:pk>/view/", api_views.UserDetailView.as_view(), name="view_user"),
# path("users/create/", api_views.CreateUserView.as_view(), name="create_user"),
path("documents/create/", api_views.DocumentCreate.as_view(), name="create_doc"),
#To be checked
path("users/<int:pk>/delete/", api_views.UserDeleteView.as_view(), name="remove_user"),
path("users/get_teams_and_users/", api_views.GetTeamsAndUsersView.as_view()),
path("profile/change-password/", api_views.ChangePasswordView.as_view()),
path("auth/forgot-password/", api_views.ForgotPasswordView.as_view()),
path("auth/reset-password/", api_views.ResetPasswordView.as_view()),
path("users/", api_views.UsersListView.as_view()),
path("users/<int:pk>/", api_views.UserDetailView.as_view()),
path("documents/create/", api_views.DocumentCreate.as_view()),
]

View file

@ -46,56 +46,18 @@ from django.db.models import Q
from rest_framework.decorators import api_view
class UserDetailView(APIView):
authentication_classes = (JSONWebTokenAuthentication,)
permission_classes = (IsAuthenticated,)
@swagger_auto_schema(tags=["users"], manual_parameters=swagger_params.dashboard_params)
def get(self, request, *args, **kwargs):
company = request.headers['company']
user_id = kwargs['pk']
user_obj = get_object_or_404(
User, pk=user_id, company__sub_domain=company)
users_data = []
for each in User.objects.all():
assigned_dict = {}
assigned_dict["id"] = each.id
assigned_dict["name"] = each.username
users_data.append(assigned_dict)
context = {}
context["user_obj"] = UserSerializer(user_obj).data
opportunity_list = Opportunity.objects.filter(assigned_to=user_obj.id)
context["opportunity_list"] = OpportunitySerializer(
opportunity_list, many=True).data
contacts = Contact.objects.filter(assigned_to=user_obj.id)
context["contacts"] = ContactSerializer(contacts, many=True).data
cases = Case.objects.filter(assigned_to=user_obj.id)
context["cases"] = CaseSerializer(cases, many=True).data
# "accounts": Account.objects.filter(assigned_to=user_obj.id)
# context["assigned_data"] = json.dumps(users_data)
context["assigned_data"] = users_data
comments = user_obj.user_comments.all()
context["comments"] = CommentSerializer(comments, many=True).data
return Response(context)
class GetTeamsAndUsersView(APIView):
authentication_classes = (JSONWebTokenAuthentication,)
permission_classes = (IsAuthenticated,)
@swagger_auto_schema(tags=["users"], manual_parameters=swagger_params.dashboard_params)
@swagger_auto_schema(tags=["Users"], manual_parameters=swagger_params.dashboard_params)
def get(self, request, *args, **kwargs):
data = {}
teams = Teams.objects.filter(company=request.company)
# teams_data = [
# {"team": team.id, "users": [user.id for user in team.users.all()]}
# for team in teams
# ]
teams_data = TeamsSerializer(teams, many=True).data
users = User.objects.filter(company=request.company)
users_data = UserSerializer(users, many=True).data
users = User.objects.all().values_list("id", flat=True)
data["teams"] = teams_data
data["users_data"] = users_data
@ -104,15 +66,74 @@ class GetTeamsAndUsersView(APIView):
# to be checked
class UserDeleteView(APIView):
model = User
class UserDetailView(APIView):
authentication_classes = (JSONWebTokenAuthentication,)
permission_classes = (IsAuthenticated,)
@swagger_auto_schema(tags=["users"], manual_parameters=swagger_params.dashboard_params)
def get(self, request, *args, **kwargs):
self.object = self.get_object()
def get_object(self, pk):
try:
return User.objects.get(pk=pk)
except User.DoesNotExist:
raise Http404
@swagger_auto_schema(tags=["Users"], manual_parameters=swagger_params.dashboard_params)
def get(self, request, pk, format=None):
user_obj = self.get_object(pk)
users_data = []
for each in User.objects.all():
assigned_dict = {}
assigned_dict["id"] = each.id
assigned_dict["name"] = each.username
users_data.append(assigned_dict)
context = {}
context["user_obj"] = UserSerializer(user_obj).data
opportunity_list = Opportunity.objects.filter(assigned_to=user_obj)
context["opportunity_list"] = OpportunitySerializer(
opportunity_list, many=True).data
contacts = Contact.objects.filter(assigned_to=user_obj)
context["contacts"] = ContactSerializer(contacts, many=True).data
cases = Case.objects.filter(assigned_to=user_obj)
context["cases"] = CaseSerializer(cases, many=True).data
context["assigned_data"] = users_data
comments = user_obj.user_comments.all()
context["comments"] = CommentSerializer(comments, many=True).data
return Response({'error': False, 'data': context})
@swagger_auto_schema(tags=["Users"], manual_parameters=swagger_params.user_update_params)
def put(self, request, pk, format=None):
params = request.query_params if len(
request.data) == 0 else request.data
user = self.get_object(pk)
serializer = CreateUserSerializer(
user, data=params, request_user=request.user)
if serializer.is_valid():
user = serializer.save()
if request.user.role != "ADMIN" and not request.user.is_superuser:
if request.user.id != self.user.id:
return Response({'error': True}, status=status.HTTP_403_FORBIDDEN)
if user.role == "USER":
user.is_superuser = False
user.save()
if params.getlist("teams"):
user_teams = user.user_teams.all()
for user_team in user_teams:
user_team.users.remove(user)
for team in params.getlist("teams"):
team_obj = Teams.objects.filter(id=team).first()
team_obj.users.add(user)
return Response({'error': False,
'message': 'User Updated Successfully'},
status=status.HTTP_200_OK)
return Response({'error': True, 'errors': user_serializer.errors}, status=status.HTTP_400_BAD_REQUEST)
@swagger_auto_schema(tags=["Users"], manual_parameters=swagger_params.dashboard_params)
def delete(self, request, pk, format=None):
self.object = self.get_object(pk)
if self.object.company != request.company:
return Response(
{"error": True,
"message": "You don't have permission to delete this user"})
current_site = request.get_host()
deleted_by = self.request.user.email
send_email_user_delete.delay(
@ -129,7 +150,7 @@ class ChangePasswordView(APIView):
authentication_classes = (JSONWebTokenAuthentication,)
permission_classes = (IsAuthenticated,)
@swagger_auto_schema(tags=["profile"], operation_description="This is change password api",
@swagger_auto_schema(tags=["Profile"], operation_description="This is change password api",
manual_parameters=swagger_params.change_password_params)
def post(self, request, format=None):
params = request.query_params if len(
@ -204,7 +225,7 @@ class ApiHomeView(APIView):
class LoginView(APIView):
@swagger_auto_schema(tags=["common"], operation_description="This is login api",
@swagger_auto_schema(tags=["Auth"], operation_description="This is login api",
manual_parameters=swagger_params.login_page_params)
def post(self, request, format=None):
params = request.query_params if len(
@ -247,7 +268,7 @@ class LoginView(APIView):
class RegistrationView(APIView):
@swagger_auto_schema(tags=["common"], operation_description="This is registration api",
@swagger_auto_schema(tags=["Auth"], operation_description="This is registration api",
manual_parameters=swagger_params.registration_page_params)
def post(self, request, format=None):
params = request.query_params if len(
@ -289,7 +310,7 @@ class RegistrationView(APIView):
return Response({'status': 'success'}, status=201)
@swagger_auto_schema(method='post', tags=["common"], manual_parameters=swagger_params.check_sub_domain_params)
@swagger_auto_schema(method='post', tags=["Auth"], manual_parameters=swagger_params.check_sub_domain_params)
@api_view(['POST'])
def check_sub_domain(request):
if request.method == "POST":
@ -314,7 +335,7 @@ class ProfileView(APIView):
authentication_classes = (JSONWebTokenAuthentication,)
permission_classes = (IsAuthenticated,)
@swagger_auto_schema(tags=["profile"], manual_parameters=swagger_params.dashboard_params)
@swagger_auto_schema(tags=["Profile"], manual_parameters=swagger_params.dashboard_params)
def get(self, request, format=None):
context = {}
context["user_obj"] = UserSerializer(request.user).data
@ -326,14 +347,14 @@ class UsersListView(APIView):
authentication_classes = (JSONWebTokenAuthentication,)
permission_classes = (IsAuthenticated,)
@swagger_auto_schema(tags=["users"], manual_parameters=swagger_params.user_list_params)
@swagger_auto_schema(tags=["Users"], manual_parameters=swagger_params.user_create_params)
def post(self, request, format=None):
context = {}
queryset = User.objects.filter(company=self.request.company)
params = request.query_params if len(
request.data) == 0 else request.data
if params:
if params.get('is_filter'):
context = {}
queryset = User.objects.filter(company=self.request.company)
if params.get("username"):
queryset = queryset.filter(
username__icontains=params.get("username")
@ -345,19 +366,40 @@ class UsersListView(APIView):
queryset = queryset.filter(role=params.get("role"))
if params.get("status"):
queryset = queryset.filter(is_active=params.get("status"))
active_users = queryset.filter(is_active=True)
inactive_users = queryset.filter(is_active=False)
context["active_users"] = UserSerializer(active_users, many=True).data
context["inactive_users"] = UserSerializer(
inactive_users, many=True).data
context["per_page"] = self.request.POST.get("per_page")
context["admin_email"] = settings.ADMIN_EMAIL
context["roles"] = ROLES
context["status"] = [("True", "Active"), ("False", "In Active")]
active_users = queryset.filter(is_active=True)
inactive_users = queryset.filter(is_active=False)
context["active_users"] = UserSerializer(
active_users, many=True).data
context["inactive_users"] = UserSerializer(
inactive_users, many=True).data
return Response(context)
else:
user_serializer = CreateUserSerializer(
data=params, request_user=request.user)
if user_serializer.is_valid():
user = user_serializer.save()
if params.get("password"):
user.set_password(params.get("password"))
user.company = self.request.company
user.save()
if params.getlist("teams"):
for team in params.getlist("teams"):
Teams.objects.filter(id=team).first().users.add(user)
return Response(context)
current_site = request.get_host()
protocol = request.scheme
send_email_to_new_user.delay(
user.email, self.request.user.email, domain=current_site,
protocol=protocol
)
return Response({'error': False,
'message': 'User Created Successfully'},
status=status.HTTP_201_CREATED)
return Response({'error': True,
'errors': user_serializer.errors},
status=status.HTTP_400_BAD_REQUEST)
@swagger_auto_schema(tags=["users"], manual_parameters=swagger_params.dashboard_params)
@swagger_auto_schema(tags=["Users"], manual_parameters=swagger_params.dashboard_params)
def get(self, request, format=None):
queryset = User.objects.filter(company=self.request.company)
@ -439,93 +481,10 @@ class DocumentCreate(APIView):
context["errors"] = form.errors
return Response(context)
# from common.forms import UserForm
# from common.utils import ROLES
# class CreateUserView(APIView):
# # model = User
# # form_class = UserForm
# # template_name = "create.html"
# # success_url = '/users/list/'
# authentication_classes = (JSONWebTokenAuthentication,)
# permission_classes = (IsAuthenticated,)
# # def form_valid(self, form):
# # user = form.save(commit=False)
# # if form.cleaned_data.get("password"):
# # user.set_password(form.cleaned_data.get("password"))
# # user.company = self.request.company
# # user.save()
# # if self.request.POST.getlist("teams"):
# # for team in self.request.POST.getlist("teams"):
# # Teams.objects.filter(id=team).first().users.add(user)
# # current_site = self.request.get_host()
# # protocol = self.request.scheme
# # send_email_to_new_user.delay(
# # user.email, self.request.user.email, domain=current_site, protocol=protocol
# # )
# # if self.request.is_ajax():
# # data = {"success_url": reverse_lazy("common:users_list"), "error": False}
# # return Response(data)
# # return super(CreateUserView, self).form_valid(form)
# # def form_invalid(self, form):
# # response = super(CreateUserView, self).form_invalid(form)
# # if self.request.is_ajax():
# # return Response({"error": True, "errors": form.errors})
# # return response
# # def get_form_kwargs(self):
# # kwargs = super(CreateUserView, self).get_form_kwargs()
# # kwargs.update({"request_user": self.request.user})
# # return kwargs
# # def get_context_data(self, **kwargs):
# # context = super(CreateUserView, self).get_context_data(**kwargs)
# # context["user_form"] = context["form"]
# # context["teams"] = Teams.objects.all()
# # if "errors" in kwargs:
# # context["errors"] = kwargs["errors"]
# # return context
# @swagger_auto_schema(tags=["user create"], manual_parameters=swagger_params.dashboard_params)
# def get(self, request, format=None):
# context = {}
# context['role'] = ROLES
# teams = Teams.objects.filter(company=request.company)
# context["teams"] = TeamsSerializer(teams, many=True).data
# return Response(context)
# @swagger_auto_schema(tags=["user create"], operation_description="Create user",
# manual_parameters=swagger_params.user_create_params)
# def post(self, request, format=None):
# params = request.query_params if len(request.data) == 0 else request.data
# form = UserForm(params, request_user=self.request)
# if form.is_valid():
# user = form.save(commit=False)
# if form.cleaned_data.get("password"):
# user.set_password(form.cleaned_data.get("password"))
# user.company = self.request.company
# user.save()
# if self.request.POST.getlist("teams"):
# for team in self.request.POST.getlist("teams"):
# Teams.objects.filter(id=team).first().users.add(user)
# data = { "error": False}
# return Response(data)
# # if self.request.is_ajax():
# return Response({"error": True, "errors": form.errors})
class ForgotPasswordView(APIView):
@swagger_auto_schema(tags=["common"], manual_parameters=swagger_params.forgot_password_params)
@swagger_auto_schema(tags=["Auth"], manual_parameters=swagger_params.forgot_password_params)
def post(self, request, format=None):
params = request.query_params if len(
request.data) == 0 else request.data
@ -547,7 +506,7 @@ class ForgotPasswordView(APIView):
class ResetPasswordView(APIView):
@swagger_auto_schema(tags=["common"], manual_parameters=swagger_params.reset_password_params)
@swagger_auto_schema(tags=["Auth"], manual_parameters=swagger_params.reset_password_params)
def post(self, request, format=None):
params = request.query_params if len(
request.data) == 0 else request.data

View file

@ -0,0 +1,8 @@
from django.urls import include, path
app_name = 'common_urls'
urlpatterns = [
path('', include(('common.api_urls'))),
path("accounts/", include("accounts.api_urls", namespace="api_accounts")),
path("contacts/", include("contacts.api_urls", namespace="api_contacts")),
]

View file

@ -38,7 +38,7 @@ class UserSerializer(serializers.ModelSerializer):
"has_sales_access",
"has_marketing_access",
"company",
"get_app_name"
"get_app_name",
)
@ -64,19 +64,21 @@ class CreateUserSerializer(serializers.ModelSerializer):
"profile_pic",
"has_sales_access",
"has_marketing_access",
"password"
)
def __init__(self, *args, **kwargs):
self.request_user = kwargs.pop("request_user", None)
super(CreateUserSerializer, self).__init__(*args, **kwargs)
self.fields["first_name"].required = True
if not self.instance.pk:
if not self.instance:
self.fields["password"].required = True
else:
self.fields['password'].required = False
self.fields['email'].required = False
self.fields['role'].required = False
# self.fields['password'].required = True
def validate_password(self):
password = self.cleaned_data.get("password")
def validate_password(self, password):
if password:
if len(password) < 4:
raise serializers.ValidationError(
@ -84,47 +86,40 @@ class CreateUserSerializer(serializers.ModelSerializer):
)
return password
def validate_has_sales_access(self):
sales = self.cleaned_data.get("has_sales_access", False)
user_role = self.cleaned_data.get("role")
def validate_has_sales_access(self, has_sales_access):
user_role = self.initial_data.get("role")
if user_role == "ADMIN":
is_admin = True
else:
is_admin = False
if self.request_user.role == "ADMIN" or self.request_user.is_superuser:
if not is_admin:
marketing = self.data.get("has_marketing_access", False)
if not sales and not marketing:
marketing = self.initial_data.get("has_marketing_access", False)
if not has_sales_access and not marketing:
raise serializers.ValidationError(
"Select atleast one option.")
# if not (self.instance.role == 'ADMIN' or self.instance.is_superuser):
# marketing = self.data.get('has_marketing_access', False)
# if not sales and not marketing:
# raise forms.ValidationError('Select atleast one option.')
if self.request_user.role == "USER":
sales = self.instance.has_sales_access
return sales
has_sales_access = self.instance.has_sales_access
return has_sales_access
def validate_has_marketing_access(self):
marketing = self.cleaned_data.get("has_marketing_access", False)
def validate_has_marketing_access(self, marketing):
if self.request_user.role == "USER":
marketing = self.instance.has_marketing_access
return marketing
def validate_email(self):
email = self.cleaned_data.get("email")
if self.instance.id:
def validate_email(self, email):
if self.instance:
if self.instance.email != email:
if not User.objects.filter(
email=self.cleaned_data.get("email")
email=email
).exists():
return self.cleaned_data.get("email")
return email
raise serializers.ValidationError("Email already exists")
else:
return self.cleaned_data.get("email")
return email
else:
if not User.objects.filter(email=self.cleaned_data.get("email")).exists():
return self.cleaned_data.get("email")
if not User.objects.filter(email=email).exists():
return email
raise serializers.ValidationError(
"User already exists with this email")

View file

@ -26,6 +26,17 @@ dashboard_params = [
company_params_in_header
]
user_update_params = [
company_params_in_header,
openapi.Parameter('username', openapi.IN_QUERY, type=openapi.TYPE_STRING, required=True),
openapi.Parameter('first_name', openapi.IN_QUERY, type=openapi.TYPE_STRING, required=True),
openapi.Parameter('last_name', openapi.IN_QUERY, type=openapi.TYPE_STRING),
openapi.Parameter('profile_pic', openapi.IN_QUERY, type=openapi.TYPE_FILE),
openapi.Parameter('has_sales_access', openapi.IN_QUERY, type=openapi.TYPE_BOOLEAN),
openapi.Parameter('has_marketing_access', openapi.IN_QUERY, type=openapi.TYPE_BOOLEAN),
openapi.Parameter('teams', openapi.IN_QUERY, type=openapi.TYPE_STRING)
]
user_delete_params = [
company_params_in_header,
openapi.Parameter('user_id', openapi.IN_QUERY, required=True, type=openapi.TYPE_NUMBER),

View file

@ -31,9 +31,7 @@ urlpatterns = [
url(r'^redoc/$', schema_view.with_ui('redoc',
cache_timeout=0), name='schema-redoc'),
path("", include("common.urls", namespace="common")),
path("api-common/", include("common.api_urls", namespace="api_common")),
path("api-accounts/", include("accounts.api_urls", namespace="api_accounts")),
path("api-contacts/", include("contacts.api_urls", namespace="api_contacts")),
path("api/", include("common.app_urls", namespace="common_urls")),
path("", include("django.contrib.auth.urls")),
path("marketing/", include("marketing.urls", namespace="marketing")),
path("accounts/", include("accounts.urls", namespace="accounts")),