diff --git a/app/core/models/ticket/ticket_linked_items.py b/app/core/models/ticket/ticket_linked_items.py index 7c573c37..bd4a987a 100644 --- a/app/core/models/ticket/ticket_linked_items.py +++ b/app/core/models/ticket/ticket_linked_items.py @@ -7,9 +7,11 @@ from rest_framework.reverse import reverse from access.models.tenancy import TenancyObject +from assistance.models.knowledge_base import KnowledgeBase + from core.lib.feature_not_used import FeatureNotUsed from core.middleware.get_request import get_request -from core.models.ticket.ticket import Ticket, KnowledgeBase +from core.models.ticket.ticket import Ticket deleted_model = dispatch.Signal() diff --git a/app/core/viewsets/related_ticket.py b/app/core/viewsets/related_ticket.py index 93d8019d..cffec6e6 100644 --- a/app/core/viewsets/related_ticket.py +++ b/app/core/viewsets/related_ticket.py @@ -4,8 +4,8 @@ from drf_spectacular.utils import extend_schema, extend_schema_view, OpenApiPara from api.viewsets.common import ModelListRetrieveDeleteViewSet +from core.models.ticket.ticket import Ticket from core.serializers.ticket_related import ( # pylint: disable=W0611:unused-import - Ticket, RelatedTickets, RelatedTicketModelSerializer, RelatedTicketViewSerializer, diff --git a/app/itam/models/__init__.py b/app/itam/models/__init__.py index 624d775f..fe66c0be 100644 --- a/app/itam/models/__init__.py +++ b/app/itam/models/__init__.py @@ -1,2 +1,2 @@ -from .device_software_history import DeviceSoftwareHistory -from .itam_asset_base import ITAMAssetBase +from .device_software_history import DeviceSoftwareHistory # pylint: disable=W0611:unused-import +from .itam_asset_base import ITAMAssetBase # pylint: disable=W0611:unused-import diff --git a/app/itam/models/device.py b/app/itam/models/device.py index b3a09ac1..a23c4568 100644 --- a/app/itam/models/device.py +++ b/app/itam/models/device.py @@ -9,10 +9,8 @@ from django.dispatch import receiver from django.forms import ValidationError from rest_framework import serializers -from rest_framework.reverse import reverse from access.fields import * -from access.models.tenancy import TenancyObject from centurion.helpers.merge_software import merge_software diff --git a/app/itam/models/device_models.py b/app/itam/models/device_models.py index 24383f76..6ca7cec4 100644 --- a/app/itam/models/device_models.py +++ b/app/itam/models/device_models.py @@ -2,8 +2,6 @@ from django.db import models from itam.models.device_common import DeviceCommonFieldsName -from access.models.tenancy import TenancyObject - from core.mixin.history_save import SaveHistory from core.models.manufacturer import Manufacturer diff --git a/app/itam/serializers/device.py b/app/itam/serializers/device.py index 28217d21..d8807c3b 100644 --- a/app/itam/serializers/device.py +++ b/app/itam/serializers/device.py @@ -1,16 +1,13 @@ import json -from drf_spectacular.utils import extend_schema, extend_schema_view, OpenApiResponse - from rest_framework.reverse import reverse from rest_framework import serializers from access.serializers.organization import TenantBaseSerializer from api.serializers import common -from api.viewsets.common import ModelViewSet -from core.fields.icon import Icon, IconField +from core.fields.icon import IconField from itam.models.device import Device from itam.serializers.device_model import DeviceModelBaseSerializer diff --git a/app/itam/serializers/device_model.py b/app/itam/serializers/device_model.py index 84276aef..8b1a3d19 100644 --- a/app/itam/serializers/device_model.py +++ b/app/itam/serializers/device_model.py @@ -1,5 +1,3 @@ -from rest_framework.reverse import reverse - from rest_framework import serializers from access.serializers.organization import TenantBaseSerializer diff --git a/app/itam/serializers/device_model_notes.py b/app/itam/serializers/device_model_notes.py index e226bae7..bd26593a 100644 --- a/app/itam/serializers/device_model_notes.py +++ b/app/itam/serializers/device_model_notes.py @@ -1,7 +1,4 @@ -from centurion.serializers.user import UserBaseSerializer - from core.serializers.model_notes import ( - ModelNotes, ModelNoteBaseSerializer, ModelNoteModelSerializer, ModelNoteViewSerializer diff --git a/app/itam/serializers/device_notes.py b/app/itam/serializers/device_notes.py index 6d0e9165..cf269238 100644 --- a/app/itam/serializers/device_notes.py +++ b/app/itam/serializers/device_notes.py @@ -1,14 +1,4 @@ -from rest_framework.reverse import reverse -from rest_framework import serializers - -from access.serializers.organization import TenantBaseSerializer - -from api.serializers import common - -from centurion.serializers.user import UserBaseSerializer - from core.serializers.model_notes import ( - ModelNotes, ModelNoteBaseSerializer, ModelNoteModelSerializer, ModelNoteViewSerializer @@ -17,7 +7,6 @@ from core.serializers.model_notes import ( from itam.models.device_notes import ( DeviceNotes ) -from itam.serializers.device import DeviceBaseSerializer diff --git a/app/itam/serializers/device_operating_system.py b/app/itam/serializers/device_operating_system.py index 64f3f266..cb887e23 100644 --- a/app/itam/serializers/device_operating_system.py +++ b/app/itam/serializers/device_operating_system.py @@ -1,5 +1,4 @@ from rest_framework import serializers -from rest_framework.fields import empty from rest_framework.reverse import reverse from access.serializers.organization import TenantBaseSerializer @@ -7,11 +6,10 @@ from access.serializers.organization import TenantBaseSerializer from api.serializers import common from core import exceptions as centurion_exception -from core.fields.badge import Badge, BadgeField from itam.models.device import Device, DeviceOperatingSystem from itam.serializers.device import DeviceBaseSerializer -from itam.serializers.operating_system_version import OperatingSystem, OperatingSystemVersionBaseSerializer +from itam.serializers.operating_system_version import OperatingSystemVersionBaseSerializer diff --git a/app/itam/serializers/device_software.py b/app/itam/serializers/device_software.py index 3c51ac8f..68bd0555 100644 --- a/app/itam/serializers/device_software.py +++ b/app/itam/serializers/device_software.py @@ -1,5 +1,4 @@ from rest_framework import serializers -from rest_framework.fields import empty from rest_framework.reverse import reverse from access.serializers.organization import TenantBaseSerializer @@ -7,7 +6,7 @@ from access.serializers.organization import TenantBaseSerializer from api.serializers import common from core import exceptions as centurion_exception -from core.fields.badge import Badge, BadgeField +from core.fields.badge import BadgeField from itam.models.device import Device, DeviceSoftware from itam.serializers.device import DeviceBaseSerializer diff --git a/app/itam/serializers/device_type.py b/app/itam/serializers/device_type.py index c49b04f9..48c57718 100644 --- a/app/itam/serializers/device_type.py +++ b/app/itam/serializers/device_type.py @@ -1,4 +1,3 @@ -from rest_framework.reverse import reverse from rest_framework import serializers from access.serializers.organization import TenantBaseSerializer diff --git a/app/itam/serializers/device_type_notes.py b/app/itam/serializers/device_type_notes.py index 5d2d951a..197cc449 100644 --- a/app/itam/serializers/device_type_notes.py +++ b/app/itam/serializers/device_type_notes.py @@ -1,7 +1,4 @@ -from centurion.serializers.user import UserBaseSerializer - from core.serializers.model_notes import ( - ModelNotes, ModelNoteBaseSerializer, ModelNoteModelSerializer, ModelNoteViewSerializer @@ -10,7 +7,6 @@ from core.serializers.model_notes import ( from itam.models.device_type_notes import ( DeviceTypeNotes ) -from itam.serializers.device import DeviceBaseSerializer diff --git a/app/itam/serializers/inventory.py b/app/itam/serializers/inventory.py index 9d78b1e7..96a28953 100644 --- a/app/itam/serializers/inventory.py +++ b/app/itam/serializers/inventory.py @@ -1,5 +1,4 @@ from django.db.models import Q -from django.urls import reverse from rest_framework import serializers diff --git a/app/itam/serializers/operating_system_notes.py b/app/itam/serializers/operating_system_notes.py index c4af2897..37097772 100644 --- a/app/itam/serializers/operating_system_notes.py +++ b/app/itam/serializers/operating_system_notes.py @@ -1,8 +1,4 @@ - -from centurion.serializers.user import UserBaseSerializer - from core.serializers.model_notes import ( - ModelNotes, ModelNoteBaseSerializer, ModelNoteModelSerializer, ModelNoteViewSerializer diff --git a/app/itam/serializers/operating_system_version.py b/app/itam/serializers/operating_system_version.py index 76a929ca..ec752131 100644 --- a/app/itam/serializers/operating_system_version.py +++ b/app/itam/serializers/operating_system_version.py @@ -1,13 +1,9 @@ -from rest_framework.reverse import reverse - from rest_framework import serializers from access.serializers.organization import TenantBaseSerializer from api.serializers import common -from core.serializers.manufacturer import ManufacturerBaseSerializer - from itam.models.operating_system import OperatingSystem, OperatingSystemVersion from itam.serializers.operating_system import OperatingSystemBaseSerializer diff --git a/app/itam/serializers/operating_system_version_notes.py b/app/itam/serializers/operating_system_version_notes.py index 41e547b1..d823630d 100644 --- a/app/itam/serializers/operating_system_version_notes.py +++ b/app/itam/serializers/operating_system_version_notes.py @@ -1,8 +1,4 @@ - -from centurion.serializers.user import UserBaseSerializer - from core.serializers.model_notes import ( - ModelNotes, ModelNoteBaseSerializer, ModelNoteModelSerializer, ModelNoteViewSerializer diff --git a/app/itam/serializers/software_category.py b/app/itam/serializers/software_category.py index c0aba9dd..71516aa8 100644 --- a/app/itam/serializers/software_category.py +++ b/app/itam/serializers/software_category.py @@ -1,12 +1,9 @@ -from rest_framework.reverse import reverse from rest_framework import serializers from access.serializers.organization import TenantBaseSerializer from api.serializers import common -from core.serializers.manufacturer import ManufacturerBaseSerializer - from itam.models.software import SoftwareCategory diff --git a/app/itam/serializers/software_category_notes.py b/app/itam/serializers/software_category_notes.py index ac7b804c..15fa3086 100644 --- a/app/itam/serializers/software_category_notes.py +++ b/app/itam/serializers/software_category_notes.py @@ -1,5 +1,4 @@ from core.serializers.model_notes import ( - ModelNotes, ModelNoteBaseSerializer, ModelNoteModelSerializer, ModelNoteViewSerializer diff --git a/app/itam/serializers/software_notes.py b/app/itam/serializers/software_notes.py index 9373fdf7..9222f66d 100644 --- a/app/itam/serializers/software_notes.py +++ b/app/itam/serializers/software_notes.py @@ -1,5 +1,4 @@ from core.serializers.model_notes import ( - ModelNotes, ModelNoteBaseSerializer, ModelNoteModelSerializer, ModelNoteViewSerializer diff --git a/app/itam/serializers/software_version_notes.py b/app/itam/serializers/software_version_notes.py index c7d4e860..04bca1ad 100644 --- a/app/itam/serializers/software_version_notes.py +++ b/app/itam/serializers/software_version_notes.py @@ -1,5 +1,4 @@ from core.serializers.model_notes import ( - ModelNotes, ModelNoteBaseSerializer, ModelNoteModelSerializer, ModelNoteViewSerializer diff --git a/app/itam/tasks/inventory.py b/app/itam/tasks/inventory.py index 5eed3b5f..9dbf17ef 100644 --- a/app/itam/tasks/inventory.py +++ b/app/itam/tasks/inventory.py @@ -3,15 +3,14 @@ import re from django.utils import timezone -from celery import shared_task, current_task +from celery import shared_task from celery.utils.log import get_task_logger -from celery import states from access.models.tenant import Tenant as Organization from itam.serializers.inventory import InventorySerializer -from itam.models.device import Device, DeviceType, DeviceOperatingSystem, DeviceSoftware +from itam.models.device import Device, DeviceOperatingSystem, DeviceSoftware from itam.models.operating_system import OperatingSystem, OperatingSystemVersion from itam.models.software import Software, SoftwareCategory, SoftwareVersion diff --git a/app/itam/urls.py b/app/itam/urls.py index e010dc8b..80f60386 100644 --- a/app/itam/urls.py +++ b/app/itam/urls.py @@ -1,7 +1,6 @@ from django.urls import path -from . import views -from .views import device, device_type, software, software_category, software_version, operating_system, operating_system_version +from .views import device, software, software_version, operating_system, operating_system_version app_name = "ITAM" urlpatterns = [ diff --git a/app/itam/viewsets/device.py b/app/itam/viewsets/device.py index 492cdbc6..217bd15d 100644 --- a/app/itam/viewsets/device.py +++ b/app/itam/viewsets/device.py @@ -2,7 +2,7 @@ from drf_spectacular.utils import extend_schema, extend_schema_view, OpenApiResp from api.viewsets.common import ModelViewSet -from itam.serializers.device import ( +from itam.serializers.device import ( # pylint: disable=W0611:unused-import Device, DeviceModelSerializer, DeviceViewSerializer diff --git a/app/itam/viewsets/device_model.py b/app/itam/viewsets/device_model.py index 7070011e..0d161998 100644 --- a/app/itam/viewsets/device_model.py +++ b/app/itam/viewsets/device_model.py @@ -4,14 +4,12 @@ from api.viewsets.common import ModelViewSet # THis import only exists so that the migrations can be created from itam.models.device_model_history import DeviceModelHistory # pylint: disable=W0611:unused-import -from itam.serializers.device_model import ( +from itam.serializers.device_model import ( # pylint: disable=W0611:unused-import DeviceModel, DeviceModelModelSerializer, DeviceModelViewSerializer ) -from api.views.mixin import OrganizationPermissionAPI - @extend_schema_view( diff --git a/app/itam/viewsets/device_operating_system.py b/app/itam/viewsets/device_operating_system.py index 567cd0a2..efd10c76 100644 --- a/app/itam/viewsets/device_operating_system.py +++ b/app/itam/viewsets/device_operating_system.py @@ -1,29 +1,15 @@ -from django_filters.rest_framework import DjangoFilterBackend -from rest_framework import filters - -from django.db.models import Q -from django.shortcuts import get_object_or_404 - from drf_spectacular.utils import extend_schema, extend_schema_view, OpenApiParameter, OpenApiResponse -from rest_framework.fields import empty -from rest_framework import generics, viewsets -from rest_framework.response import Response - -from access.mixin import OrganizationMixin - -from api.views.mixin import OrganizationPermissionAPI - from api.viewsets.common import ModelViewSet # THis import only exists so that the migrations can be created from itam.models.device_operating_system_history import DeviceOperatingSystemHistory # pylint: disable=W0611:unused-import -from itam.serializers.device_operating_system import ( +from itam.models.operating_system import OperatingSystem +from itam.serializers.device_operating_system import ( # pylint: disable=W0611:unused-import Device, DeviceOperatingSystem, DeviceOperatingSystemModelSerializer, DeviceOperatingSystemViewSerializer, - OperatingSystem, ) diff --git a/app/itam/viewsets/device_software.py b/app/itam/viewsets/device_software.py index 16e07972..424b58e9 100644 --- a/app/itam/viewsets/device_software.py +++ b/app/itam/viewsets/device_software.py @@ -1,22 +1,8 @@ -from django_filters.rest_framework import DjangoFilterBackend -from rest_framework import filters - -from django.db.models import Q -from django.shortcuts import get_object_or_404 - from drf_spectacular.utils import extend_schema, extend_schema_view, OpenApiParameter, OpenApiResponse -from rest_framework.fields import empty -from rest_framework import generics, viewsets -from rest_framework.response import Response - -from access.mixin import OrganizationMixin - -from api.views.mixin import OrganizationPermissionAPI - from api.viewsets.common import ModelViewSet -from itam.serializers.device_software import ( +from itam.serializers.device_software import ( # pylint: disable=W0611:unused-import Device, DeviceSoftware, DeviceSoftwareModelSerializer, diff --git a/app/itam/viewsets/device_type.py b/app/itam/viewsets/device_type.py index d756332e..e70ed305 100644 --- a/app/itam/viewsets/device_type.py +++ b/app/itam/viewsets/device_type.py @@ -4,14 +4,12 @@ from api.viewsets.common import ModelViewSet # THis import only exists so that the migrations can be created from itam.models.device_type_history import DeviceTypeHistory # pylint: disable=W0611:unused-import -from itam.serializers.device_type import ( +from itam.serializers.device_type import ( # pylint: disable=W0611:unused-import DeviceType, DeviceTypeModelSerializer, DeviceTypeViewSerializer ) -from api.views.mixin import OrganizationPermissionAPI - @extend_schema_view( diff --git a/app/itam/viewsets/inventory.py b/app/itam/viewsets/inventory.py index 9b614693..1598510d 100644 --- a/app/itam/viewsets/inventory.py +++ b/app/itam/viewsets/inventory.py @@ -1,5 +1,3 @@ -import json - from django.db.models import Q from kombu.exceptions import OperationalError diff --git a/app/itam/viewsets/operating_system.py b/app/itam/viewsets/operating_system.py index b8b327d3..e8cfdf9d 100644 --- a/app/itam/viewsets/operating_system.py +++ b/app/itam/viewsets/operating_system.py @@ -2,7 +2,7 @@ from drf_spectacular.utils import extend_schema, extend_schema_view, OpenApiResp # THis import only exists so that the migrations can be created from itam.models.operating_system_history import OperatingSystemHistory # pylint: disable=W0611:unused-import -from itam.serializers.operating_system import ( +from itam.serializers.operating_system import ( # pylint: disable=W0611:unused-import OperatingSystem, OperatingSystemModelSerializer, OperatingSystemViewSerializer diff --git a/app/itam/viewsets/operating_system_version.py b/app/itam/viewsets/operating_system_version.py index c7588f12..c88de1df 100644 --- a/app/itam/viewsets/operating_system_version.py +++ b/app/itam/viewsets/operating_system_version.py @@ -4,7 +4,7 @@ from drf_spectacular.utils import extend_schema, extend_schema_view, OpenApiPara # THis import only exists so that the migrations can be created from itam.models.operating_system_version_history import OperatingSystemVersionHistory # pylint: disable=W0611:unused-import -from itam.serializers.operating_system_version import ( +from itam.serializers.operating_system_version import ( # pylint: disable=W0611:unused-import OperatingSystem, OperatingSystemVersion, OperatingSystemVersionModelSerializer, diff --git a/app/itam/viewsets/software.py b/app/itam/viewsets/software.py index 28946531..4fa6930c 100644 --- a/app/itam/viewsets/software.py +++ b/app/itam/viewsets/software.py @@ -2,7 +2,7 @@ from drf_spectacular.utils import extend_schema, extend_schema_view, OpenApiResp # THis import only exists so that the migrations can be created from itam.models.software_history import SoftwareHistory # pylint: disable=W0611:unused-import -from itam.serializers.software import ( +from itam.serializers.software import ( # pylint: disable=W0611:unused-import Software, SoftwareModelSerializer, SoftwareViewSerializer diff --git a/app/itam/viewsets/software_category.py b/app/itam/viewsets/software_category.py index 997e1fc3..114f31f6 100644 --- a/app/itam/viewsets/software_category.py +++ b/app/itam/viewsets/software_category.py @@ -2,7 +2,7 @@ from drf_spectacular.utils import extend_schema, extend_schema_view, OpenApiResp # THis import only exists so that the migrations can be created from itam.models.software_category_history import SoftwareCategoryHistory # pylint: disable=W0611:unused-import -from itam.serializers.software_category import ( +from itam.serializers.software_category import ( # pylint: disable=W0611:unused-import SoftwareCategory, SoftwareCategoryModelSerializer, SoftwareCategoryViewSerializer diff --git a/app/itam/viewsets/software_version.py b/app/itam/viewsets/software_version.py index d1d3f7ca..4c7d4afc 100644 --- a/app/itam/viewsets/software_version.py +++ b/app/itam/viewsets/software_version.py @@ -4,7 +4,7 @@ from drf_spectacular.utils import extend_schema, extend_schema_view, OpenApiPara # THis import only exists so that the migrations can be created from itam.models.software_version_history import SoftwareVersionHistory # pylint: disable=W0611:unused-import -from itam.serializers.software_version import ( +from itam.serializers.software_version import ( # pylint: disable=W0611:unused-import Software, SoftwareVersion, SoftwareVersionModelSerializer,