Clean up filtersets

netbox/core/filtersets.py

@@ -3,7 +3,8 @@ from django.utils.translation import gettext as _
 
 import django_filters
 
-from netbox.filtersets import NetBoxModelFilterSet
+from netbox.filtersets import ChangeLoggedModelFilterSet, NetBoxModelFilterSet
+from .choices import *
 from .models import *
 
 __all__ = (
@@ -13,10 +14,18 @@ __all__ = (
 
 
 class DataSourceFilterSet(NetBoxModelFilterSet):
+    type = django_filters.MultipleChoiceFilter(
+        choices=DataSourceTypeChoices,
+        null_value=None
+    )
+    status = django_filters.MultipleChoiceFilter(
+        choices=DataSourceStatusChoices,
+        null_value=None
+    )
 
     class Meta:
         model = DataSource
-        fields = ('id', 'name', 'type', 'enabled', 'status')
+        fields = ('id', 'name', 'enabled')
 
     def search(self, queryset, name, value):
         if not value.strip():
@@ -28,7 +37,7 @@ class DataSourceFilterSet(NetBoxModelFilterSet):
         )
 
 
-class DataFileFilterSet(django_filters.FilterSet):
+class DataFileFilterSet(ChangeLoggedModelFilterSet):
     q = django_filters.CharFilter(
         method='search'
     )

netbox/core/graphql/schema.py

@@ -5,8 +5,8 @@ from .types import *
 
 
 class CoreQuery(graphene.ObjectType):
-    datafile = ObjectField(DataFileType)
-    datafile_list = ObjectListField(DataFileType)
+    data_file = ObjectField(DataFileType)
+    data_file_list = ObjectListField(DataFileType)
 
-    datasource = ObjectField(DataSourceType)
-    datasource_list = ObjectListField(DataSourceType)
+    data_source = ObjectField(DataSourceType)
+    data_source_list = ObjectListField(DataSourceType)

netbox/core/graphql/types.py

@@ -1,5 +1,5 @@
 from core import filtersets, models
-from netbox.graphql.types import NetBoxObjectType
+from netbox.graphql.types import BaseObjectType, NetBoxObjectType
 
 __all__ = (
     'DataFileType',
@@ -7,7 +7,7 @@ __all__ = (
 )
 
 
-class DataFileType(NetBoxObjectType):
+class DataFileType(BaseObjectType):
     class Meta:
         model = models.DataFile
         exclude = ('data',)

netbox/core/migrations/0001_initial.py

@@ -1,4 +1,4 @@
-# Generated by Django 4.1.5 on 2023-02-02 01:47
+# Generated by Django 4.1.5 on 2023-02-02 02:37
 
 import django.core.validators
 from django.db import migrations, models
@@ -43,6 +43,7 @@ class Migration(migrations.Migration):
             name='DataFile',
             fields=[
                 ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False)),
+                ('created', models.DateTimeField(auto_now_add=True, null=True)),
                 ('path', models.CharField(editable=False, max_length=1000)),
                 ('last_updated', models.DateTimeField(editable=False)),
                 ('size', models.PositiveIntegerField(editable=False)),

netbox/core/models/data.py

@@ -15,6 +15,7 @@ from django.utils.translation import gettext as _
 
 from extras.models import JobResult
 from netbox.models import PrimaryModel
+from netbox.models.features import ChangeLoggingMixin
 from netbox.registry import registry
 from utilities.files import sha256_hash
 from utilities.querysets import RestrictedQuerySet
@@ -226,7 +227,7 @@ class DataSource(PrimaryModel):
         return False
 
 
-class DataFile(models.Model):
+class DataFile(ChangeLoggingMixin, models.Model):
     """
     The database representation of a remote file fetched from a remote DataSource. DataFile instances should be created,
     updated, or deleted only by calling DataSource.sync().