diff --git a/main/extra_func.py b/main/extra_func.py index 81ccaf9..6ae7266 100644 --- a/main/extra_func.py +++ b/main/extra_func.py @@ -2,15 +2,11 @@ import os from datetime import timedelta, datetime, date from django.contrib.auth.models import User +from django.core.exceptions import ObjectDoesNotExist from django.utils import timezone from zenpy import Zenpy from zenpy.lib.exception import APIException -from main.models import UserProfile, RoleChangeLogs -from django.core.exceptions import ObjectDoesNotExist - - -from access_controller.settings import ZENDESK_ROLES as ROLES, ONE_DAY from access_controller.settings import ZENDESK_ROLES as ROLES, ONE_DAY, ZENDESK_GROUPS, SOLVED_TICKETS_EMAIL from main.models import UserProfile, RoleChangeLogs, UnassignedTicket, UnassignedTicketStatus diff --git a/main/views.py b/main/views.py index 406ed45..9f8a48a 100644 --- a/main/views.py +++ b/main/views.py @@ -1,7 +1,8 @@ import logging -import os +from django.contrib.auth.decorators import login_required from django.contrib.auth.forms import PasswordResetForm +from django.contrib.auth.mixins import LoginRequiredMixin, PermissionRequiredMixin from django.contrib.auth.models import User, Permission from django.contrib.auth.tokens import default_token_generator from django.contrib.auth.views import LoginView @@ -13,29 +14,19 @@ from django.shortcuts import render, get_list_or_404, redirect from django.urls import reverse_lazy, reverse from django.views.generic import FormView from django_registration.views import RegistrationView -from django.contrib.auth.decorators import login_required -from django.contrib.auth.mixins import LoginRequiredMixin, PermissionRequiredMixin - -from zenpy import Zenpy +# Django REST +from rest_framework import viewsets +from rest_framework.response import Response from zenpy.lib.api_objects import User as ZenpyUser -from access_controller.settings import EMAIL_HOST_USER, ZENDESK_ROLES, ZENDESK_GROUPS -from main.extra_func import check_user_exist, update_profile, get_user_organization, make_engineer, make_light_agent, \ - get_users_list, StatisticData, get_tickets_list, ZendeskAdmin +from access_controller.settings import EMAIL_HOST_USER, ZENDESK_ROLES +from main.extra_func import ZendeskAdmin from main.extra_func import check_user_exist, update_profile, get_user_organization, \ make_engineer, make_light_agent, get_users_list, update_users_in_model, count_users, \ StatisticData -from main.models import UserProfile from main.forms import AdminPageUsers, CustomRegistrationForm, CustomAuthenticationForm, StatisticForm -from .models import UserProfile, UnassignedTicket, UnassignedTicketStatus - - -from access_controller.settings import EMAIL_HOST_USER, ZENDESK_ROLES - -# Django REST -from rest_framework import viewsets, status from main.serializers import ProfileSerializer -from rest_framework.response import Response +from .models import UserProfile class CustomRegistrationView(RegistrationView):