feat(itam): switch model DeviceModel to inheirt from CenturionModel
ref: #789 #800
This commit is contained in:
@ -0,0 +1,126 @@
|
|||||||
|
# Generated by Django 5.1.9 on 2025-06-06 03:22
|
||||||
|
|
||||||
|
import access.models.tenancy_abstract
|
||||||
|
import django.db.models.deletion
|
||||||
|
from django.db import migrations, models
|
||||||
|
|
||||||
|
|
||||||
|
class Migration(migrations.Migration):
|
||||||
|
|
||||||
|
dependencies = [
|
||||||
|
("access", "0012_teamusers_model_notes_alter_teamusers_id_and_more"),
|
||||||
|
("core", "0031_remove_ticketcategory_is_global_and_more"),
|
||||||
|
("itam", "0011_itamassetbase_alter_device_organization_and_more"),
|
||||||
|
]
|
||||||
|
|
||||||
|
operations = [
|
||||||
|
migrations.RemoveField(
|
||||||
|
model_name="devicemodel",
|
||||||
|
name="is_global",
|
||||||
|
),
|
||||||
|
migrations.RemoveField(
|
||||||
|
model_name="devicemodel",
|
||||||
|
name="slug",
|
||||||
|
),
|
||||||
|
migrations.AlterField(
|
||||||
|
model_name="devicemodel",
|
||||||
|
name="id",
|
||||||
|
field=models.AutoField(
|
||||||
|
help_text="ID of the item",
|
||||||
|
primary_key=True,
|
||||||
|
serialize=False,
|
||||||
|
unique=True,
|
||||||
|
verbose_name="ID",
|
||||||
|
),
|
||||||
|
),
|
||||||
|
migrations.AlterField(
|
||||||
|
model_name="devicemodel",
|
||||||
|
name="model_notes",
|
||||||
|
field=models.TextField(
|
||||||
|
blank=True,
|
||||||
|
help_text="Tid bits of information",
|
||||||
|
null=True,
|
||||||
|
verbose_name="Notes",
|
||||||
|
),
|
||||||
|
),
|
||||||
|
migrations.AlterField(
|
||||||
|
model_name="devicemodel",
|
||||||
|
name="organization",
|
||||||
|
field=models.ForeignKey(
|
||||||
|
help_text="Tenant this belongs to",
|
||||||
|
on_delete=django.db.models.deletion.CASCADE,
|
||||||
|
related_name="+",
|
||||||
|
to="access.tenant",
|
||||||
|
validators=[
|
||||||
|
access.models.tenancy_abstract.TenancyAbstractModel.validatate_organization_exists
|
||||||
|
],
|
||||||
|
verbose_name="Tenant",
|
||||||
|
),
|
||||||
|
),
|
||||||
|
migrations.CreateModel(
|
||||||
|
name="DeviceModelAuditHistory",
|
||||||
|
fields=[
|
||||||
|
(
|
||||||
|
"centurionaudit_ptr",
|
||||||
|
models.OneToOneField(
|
||||||
|
auto_created=True,
|
||||||
|
on_delete=django.db.models.deletion.CASCADE,
|
||||||
|
parent_link=True,
|
||||||
|
primary_key=True,
|
||||||
|
serialize=False,
|
||||||
|
to="core.centurionaudit",
|
||||||
|
),
|
||||||
|
),
|
||||||
|
(
|
||||||
|
"model",
|
||||||
|
models.ForeignKey(
|
||||||
|
help_text="Model this history belongs to",
|
||||||
|
on_delete=django.db.models.deletion.CASCADE,
|
||||||
|
related_name="audit_history",
|
||||||
|
to="itam.devicemodel",
|
||||||
|
verbose_name="Model",
|
||||||
|
),
|
||||||
|
),
|
||||||
|
],
|
||||||
|
options={
|
||||||
|
"verbose_name": "Device Model History",
|
||||||
|
"verbose_name_plural": "Device Model Histories",
|
||||||
|
"db_table": "itam_devicemodel_audithistory",
|
||||||
|
"managed": True,
|
||||||
|
},
|
||||||
|
bases=("core.centurionaudit", models.Model),
|
||||||
|
),
|
||||||
|
migrations.CreateModel(
|
||||||
|
name="DeviceModelCenturionModelNote",
|
||||||
|
fields=[
|
||||||
|
(
|
||||||
|
"centurionmodelnote_ptr",
|
||||||
|
models.OneToOneField(
|
||||||
|
auto_created=True,
|
||||||
|
on_delete=django.db.models.deletion.CASCADE,
|
||||||
|
parent_link=True,
|
||||||
|
primary_key=True,
|
||||||
|
serialize=False,
|
||||||
|
to="core.centurionmodelnote",
|
||||||
|
),
|
||||||
|
),
|
||||||
|
(
|
||||||
|
"model",
|
||||||
|
models.ForeignKey(
|
||||||
|
help_text="Model this note belongs to",
|
||||||
|
on_delete=django.db.models.deletion.CASCADE,
|
||||||
|
related_name="+",
|
||||||
|
to="itam.devicemodel",
|
||||||
|
verbose_name="Model",
|
||||||
|
),
|
||||||
|
),
|
||||||
|
],
|
||||||
|
options={
|
||||||
|
"verbose_name": "Device Model Note",
|
||||||
|
"verbose_name_plural": "Device Model Notes",
|
||||||
|
"db_table": "itam_devicemodel_centurionmodelnote",
|
||||||
|
"managed": True,
|
||||||
|
},
|
||||||
|
bases=("core.centurionmodelnote", models.Model),
|
||||||
|
),
|
||||||
|
]
|
@ -10,13 +10,15 @@ from django.forms import ValidationError
|
|||||||
|
|
||||||
from rest_framework import serializers
|
from rest_framework import serializers
|
||||||
|
|
||||||
from access.fields import *
|
from access.fields import AutoLastModifiedField
|
||||||
|
|
||||||
from centurion.helpers.merge_software import merge_software
|
from centurion.helpers.merge_software import merge_software
|
||||||
|
|
||||||
from core.classes.icon import Icon
|
from core.classes.icon import Icon
|
||||||
from core.lib.feature_not_used import FeatureNotUsed
|
from core.lib.feature_not_used import FeatureNotUsed
|
||||||
from core.mixin.history_save import SaveHistory
|
from core.mixin.history_save import SaveHistory
|
||||||
|
from core.models.centurion import CenturionModel
|
||||||
|
|
||||||
from core.signal.ticket_linked_item_delete import TicketLinkedItem, deleted_model
|
from core.signal.ticket_linked_item_delete import TicketLinkedItem, deleted_model
|
||||||
|
|
||||||
from itam.models.device_common import DeviceCommonFields, DeviceCommonFieldsName
|
from itam.models.device_common import DeviceCommonFields, DeviceCommonFieldsName
|
||||||
@ -42,6 +44,16 @@ class DeviceType(DeviceCommonFieldsName, SaveHistory):
|
|||||||
verbose_name_plural = 'Device Types'
|
verbose_name_plural = 'Device Types'
|
||||||
|
|
||||||
|
|
||||||
|
name = models.CharField(
|
||||||
|
blank = False,
|
||||||
|
help_text = 'The items name',
|
||||||
|
max_length = 50,
|
||||||
|
unique = True,
|
||||||
|
verbose_name = 'Name'
|
||||||
|
)
|
||||||
|
|
||||||
|
modified = AutoLastModifiedField()
|
||||||
|
|
||||||
page_layout: dict = [
|
page_layout: dict = [
|
||||||
{
|
{
|
||||||
"name": "Details",
|
"name": "Details",
|
||||||
@ -132,6 +144,16 @@ class Device(DeviceCommonFieldsName, SaveHistory):
|
|||||||
verbose_name_plural = 'Devices'
|
verbose_name_plural = 'Devices'
|
||||||
|
|
||||||
|
|
||||||
|
name = models.CharField(
|
||||||
|
blank = False,
|
||||||
|
help_text = 'The items name',
|
||||||
|
max_length = 50,
|
||||||
|
unique = True,
|
||||||
|
verbose_name = 'Name'
|
||||||
|
)
|
||||||
|
|
||||||
|
modified = AutoLastModifiedField()
|
||||||
|
|
||||||
reserved_config_keys: list = [
|
reserved_config_keys: list = [
|
||||||
'software'
|
'software'
|
||||||
]
|
]
|
||||||
@ -633,6 +655,8 @@ class DeviceSoftware(DeviceCommonFields, SaveHistory):
|
|||||||
verbose_name = 'Date Installed'
|
verbose_name = 'Date Installed'
|
||||||
)
|
)
|
||||||
|
|
||||||
|
modified = AutoLastModifiedField()
|
||||||
|
|
||||||
|
|
||||||
page_layout: list = []
|
page_layout: list = []
|
||||||
|
|
||||||
@ -765,6 +789,8 @@ class DeviceOperatingSystem(DeviceCommonFields, SaveHistory):
|
|||||||
verbose_name = 'Install Date',
|
verbose_name = 'Install Date',
|
||||||
)
|
)
|
||||||
|
|
||||||
|
modified = AutoLastModifiedField()
|
||||||
|
|
||||||
page_layout: list = [
|
page_layout: list = [
|
||||||
{
|
{
|
||||||
"name": "Details",
|
"name": "Details",
|
||||||
|
@ -1,15 +1,18 @@
|
|||||||
from django.db import models
|
from django.db import models
|
||||||
|
|
||||||
from itam.models.device_common import DeviceCommonFieldsName
|
from access.fields import AutoLastModifiedField
|
||||||
|
|
||||||
|
from core.models.centurion import CenturionModel
|
||||||
|
|
||||||
from core.mixin.history_save import SaveHistory
|
|
||||||
from core.models.manufacturer import Manufacturer
|
from core.models.manufacturer import Manufacturer
|
||||||
|
|
||||||
from settings.models.app_settings import AppSettings
|
from settings.models.app_settings import AppSettings
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
class DeviceModel(DeviceCommonFieldsName, SaveHistory):
|
class DeviceModel(
|
||||||
|
CenturionModel
|
||||||
|
):
|
||||||
|
|
||||||
|
|
||||||
class Meta:
|
class Meta:
|
||||||
@ -24,6 +27,14 @@ class DeviceModel(DeviceCommonFieldsName, SaveHistory):
|
|||||||
verbose_name_plural = 'Device Models'
|
verbose_name_plural = 'Device Models'
|
||||||
|
|
||||||
|
|
||||||
|
name = models.CharField(
|
||||||
|
blank = False,
|
||||||
|
help_text = 'The items name',
|
||||||
|
max_length = 50,
|
||||||
|
unique = True,
|
||||||
|
verbose_name = 'Name'
|
||||||
|
)
|
||||||
|
|
||||||
manufacturer = models.ForeignKey(
|
manufacturer = models.ForeignKey(
|
||||||
Manufacturer,
|
Manufacturer,
|
||||||
blank= True,
|
blank= True,
|
||||||
@ -34,6 +45,8 @@ class DeviceModel(DeviceCommonFieldsName, SaveHistory):
|
|||||||
verbose_name = 'Manufacturer'
|
verbose_name = 'Manufacturer'
|
||||||
)
|
)
|
||||||
|
|
||||||
|
modified = AutoLastModifiedField()
|
||||||
|
|
||||||
page_layout: dict = [
|
page_layout: dict = [
|
||||||
{
|
{
|
||||||
"name": "Details",
|
"name": "Details",
|
||||||
@ -88,7 +101,6 @@ class DeviceModel(DeviceCommonFieldsName, SaveHistory):
|
|||||||
if app_settings.device_model_is_global:
|
if app_settings.device_model_is_global:
|
||||||
|
|
||||||
self.organization = app_settings.global_organization
|
self.organization = app_settings.global_organization
|
||||||
self.is_global = app_settings.device_model_is_global
|
|
||||||
|
|
||||||
|
|
||||||
def __str__(self):
|
def __str__(self):
|
||||||
@ -98,16 +110,3 @@ class DeviceModel(DeviceCommonFieldsName, SaveHistory):
|
|||||||
return self.manufacturer.name + ' ' + self.name
|
return self.manufacturer.name + ' ' + self.name
|
||||||
|
|
||||||
return self.name
|
return self.name
|
||||||
|
|
||||||
def save_history(self, before: dict, after: dict) -> bool:
|
|
||||||
|
|
||||||
from itam.models.device_model_history import DeviceModelHistory
|
|
||||||
|
|
||||||
history = super().save_history(
|
|
||||||
before = before,
|
|
||||||
after = after,
|
|
||||||
history_model = DeviceModelHistory
|
|
||||||
)
|
|
||||||
|
|
||||||
|
|
||||||
return history
|
|
||||||
|
56
app/itam/serializers/centurionaudit_devicemodel.py
Normal file
56
app/itam/serializers/centurionaudit_devicemodel.py
Normal file
@ -0,0 +1,56 @@
|
|||||||
|
from rest_framework import serializers
|
||||||
|
|
||||||
|
from drf_spectacular.utils import extend_schema_serializer
|
||||||
|
|
||||||
|
from api.serializers import common
|
||||||
|
|
||||||
|
from centurion.models.meta import DeviceModelAuditHistory # pylint: disable=E0401:import-error disable=E0611:no-name-in-module
|
||||||
|
|
||||||
|
from core.serializers.centurionaudit import (
|
||||||
|
BaseSerializer,
|
||||||
|
ViewSerializer as AuditHistoryViewSerializer
|
||||||
|
)
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
@extend_schema_serializer(component_name = 'DeviceModelAuditHistoryModelSerializer')
|
||||||
|
class ModelSerializer(
|
||||||
|
common.CommonModelSerializer,
|
||||||
|
BaseSerializer
|
||||||
|
):
|
||||||
|
"""Git Group Audit History Base Model"""
|
||||||
|
|
||||||
|
|
||||||
|
_urls = serializers.SerializerMethodField('get_url')
|
||||||
|
|
||||||
|
|
||||||
|
class Meta:
|
||||||
|
|
||||||
|
model = DeviceModelAuditHistory
|
||||||
|
|
||||||
|
fields = [
|
||||||
|
'id',
|
||||||
|
'organization',
|
||||||
|
'display_name',
|
||||||
|
'content_type',
|
||||||
|
'model',
|
||||||
|
'before',
|
||||||
|
'after',
|
||||||
|
'action',
|
||||||
|
'user',
|
||||||
|
'created',
|
||||||
|
'_urls',
|
||||||
|
]
|
||||||
|
|
||||||
|
read_only_fields = fields
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
@extend_schema_serializer(component_name = 'DeviceModelAuditHistoryViewSerializer')
|
||||||
|
class ViewSerializer(
|
||||||
|
ModelSerializer,
|
||||||
|
AuditHistoryViewSerializer,
|
||||||
|
):
|
||||||
|
"""Git Group Audit History Base View Model"""
|
||||||
|
pass
|
87
app/itam/serializers/centurionmodelnote_devicemodel.py
Normal file
87
app/itam/serializers/centurionmodelnote_devicemodel.py
Normal file
@ -0,0 +1,87 @@
|
|||||||
|
from rest_framework import serializers
|
||||||
|
|
||||||
|
from drf_spectacular.utils import extend_schema_serializer
|
||||||
|
|
||||||
|
from access.serializers.organization import (TenantBaseSerializer)
|
||||||
|
|
||||||
|
from centurion.models.meta import DeviceModelCenturionModelNote # pylint: disable=E0401:import-error disable=E0611:no-name-in-module
|
||||||
|
|
||||||
|
from core.serializers.centurionmodelnote import ( # pylint: disable=W0611:unused-import
|
||||||
|
BaseSerializer,
|
||||||
|
ModelSerializer as BaseModelModelSerializer,
|
||||||
|
ViewSerializer as BaseModelViewSerializer
|
||||||
|
)
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
@extend_schema_serializer(component_name = 'DeviceModelModelNoteModelSerializer')
|
||||||
|
class ModelSerializer(
|
||||||
|
BaseModelModelSerializer,
|
||||||
|
):
|
||||||
|
|
||||||
|
|
||||||
|
_urls = serializers.SerializerMethodField('get_url')
|
||||||
|
|
||||||
|
def get_url(self, item) -> dict:
|
||||||
|
|
||||||
|
return {
|
||||||
|
'_self': item.get_url( request = self._context['view'].request ),
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
class Meta:
|
||||||
|
|
||||||
|
model = DeviceModelCenturionModelNote
|
||||||
|
|
||||||
|
fields = [
|
||||||
|
'id',
|
||||||
|
'organization',
|
||||||
|
'display_name',
|
||||||
|
'body',
|
||||||
|
'created_by',
|
||||||
|
'modified_by',
|
||||||
|
'content_type',
|
||||||
|
'model',
|
||||||
|
'created',
|
||||||
|
'modified',
|
||||||
|
'_urls',
|
||||||
|
]
|
||||||
|
|
||||||
|
read_only_fields = [
|
||||||
|
'id',
|
||||||
|
'display_name',
|
||||||
|
'organization',
|
||||||
|
'created_by',
|
||||||
|
'modified_by',
|
||||||
|
'content_type',
|
||||||
|
'model',
|
||||||
|
'created',
|
||||||
|
'modified',
|
||||||
|
'_urls',
|
||||||
|
]
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
def validate(self, attrs):
|
||||||
|
|
||||||
|
is_valid = False
|
||||||
|
|
||||||
|
note_model = self.Meta.model.model.field.related_model
|
||||||
|
|
||||||
|
attrs['model'] = note_model.objects.get(
|
||||||
|
id = int( self.context['view'].kwargs['model_id'] )
|
||||||
|
)
|
||||||
|
|
||||||
|
|
||||||
|
is_valid = super().validate(attrs)
|
||||||
|
|
||||||
|
return is_valid
|
||||||
|
|
||||||
|
|
||||||
|
@extend_schema_serializer(component_name = 'DeviceModelModelNoteViewSerializer')
|
||||||
|
class ViewSerializer(
|
||||||
|
ModelSerializer,
|
||||||
|
BaseModelViewSerializer,
|
||||||
|
):
|
||||||
|
|
||||||
|
organization = TenantBaseSerializer( many = False, read_only = True )
|
@ -17,7 +17,7 @@ from core.viewsets import (
|
|||||||
)
|
)
|
||||||
|
|
||||||
from itam.viewsets import (
|
from itam.viewsets import (
|
||||||
device_model as device_model_v2,
|
device_model,
|
||||||
device_type as device_type_v2,
|
device_type as device_type_v2,
|
||||||
software_category as software_category_v2,
|
software_category as software_category_v2,
|
||||||
)
|
)
|
||||||
@ -64,8 +64,8 @@ router.register(
|
|||||||
basename = '_api_v2_cluster_type'
|
basename = '_api_v2_cluster_type'
|
||||||
)
|
)
|
||||||
router.register(
|
router.register(
|
||||||
prefix = 'device_model', viewset = device_model_v2.ViewSet,
|
prefix = 'device_model', viewset = device_model.ViewSet,
|
||||||
basename = '_api_v2_device_model'
|
basename = '_api_devicemodel'
|
||||||
)
|
)
|
||||||
router.register(
|
router.register(
|
||||||
prefix = 'device_type', viewset = device_type_v2.ViewSet,
|
prefix = 'device_type', viewset = device_type_v2.ViewSet,
|
||||||
|
Reference in New Issue
Block a user