Merge pull request #150 from rackerlabs/issue148-remove-StringRelated…

…Field-serializers Issue148 remove string related field serializers
rackerlabs · Jan 13, 2020 · b724ae8 · b724ae8
2 parents 56298ff + df7910a
commit b724ae8
Show file tree

Hide file tree

Showing 4 changed files with 25 additions and 17 deletions.
diff --git a/master/django_scantron/__init__.py b/master/django_scantron/__init__.py
@@ -1 +1 @@
-__version__ = "1.15"
+__version__ = "1.16"
diff --git a/master/django_scantron/api/serializers.py b/master/django_scantron/api/serializers.py
@@ -1,6 +1,5 @@
 from rest_framework import serializers
 
-# fmt: off
 from django_scantron.models import (
     Agent,
     ScanCommand,
@@ -17,19 +16,24 @@
 class AgentSerializer(serializers.ModelSerializer):
     class Meta:
         model = Agent
-        fields = ("scan_agent", "description", "api_token",)
+        fields = (
+            "scan_agent",
+            "description",
+            "api_token",
+        )
 
 
 class ScanCommandSerializer(serializers.ModelSerializer):
     class Meta:
         model = ScanCommand
-        fields = ("scan_binary", "scan_command_name", "scan_command",)
+        fields = (
+            "scan_binary",
+            "scan_command_name",
+            "scan_command",
+        )
 
 
 class SiteSerializer(serializers.ModelSerializer):
-    scan_command = serializers.StringRelatedField(many=False)
-    scan_agent = serializers.StringRelatedField(many=False)
-
     # Separate validation needed for DRF; doesn't use model's clean() function anymore.
     # https://www.django-rest-framework.org/community/3.0-announcement/#differences-between-modelserializer-validation-and-modelform
     def validate(self, attrs):
@@ -39,7 +43,9 @@ def validate(self, attrs):
         if "targets" in attrs:
             targets = attrs["targets"]
 
-            target_extractor = extract_targets.TargetExtractor(targets_string=targets, private_ips_allowed=True, sort_targets=True)
+            target_extractor = extract_targets.TargetExtractor(
+                targets_string=targets, private_ips_allowed=True, sort_targets=True
+            )
             targets_dict = target_extractor.targets_dict
 
             if targets_dict["invalid_targets"]:
@@ -50,7 +56,9 @@ def validate(self, attrs):
         if "excluded_targets" in attrs:
             excluded_targets = attrs["excluded_targets"]
 
-            target_extractor = extract_targets.TargetExtractor(targets_string=excluded_targets, private_ips_allowed=True, sort_targets=True)
+            target_extractor = extract_targets.TargetExtractor(
+                targets_string=excluded_targets, private_ips_allowed=True, sort_targets=True
+            )
             targets_dict = target_extractor.targets_dict
 
             if targets_dict["invalid_targets"]:
@@ -79,7 +87,12 @@ class ScanSerializer(serializers.ModelSerializer):
 
     class Meta:
         model = Scan
-        fields = ("id", "site", "scan_name", "start_time",)
+        fields = (
+            "id",
+            "site",
+            "scan_name",
+            "start_time",
+        )
 
 
 class ScheduledScanSerializer(serializers.ModelSerializer):
@@ -98,5 +111,3 @@ class Meta:
             "completed_time",
             "result_file_base_name",
         )
-
-# fmt: on
diff --git a/master/django_scantron/api/views.py b/master/django_scantron/api/views.py
@@ -12,15 +12,14 @@
     SiteSerializer,
 )
 
-# fmt: off
+
 from django_scantron.models import (
     Agent,
     ScanCommand,
     Scan,
     ScheduledScan,
     Site,
 )
-# fmt: on
 
 
 def get_current_time():

diff --git a/master/django_scantron/scan/urls.py b/master/django_scantron/scan/urls.py
@@ -1,13 +1,11 @@
 from django.conf.urls import url
-# fmt:off
 from django_scantron.scan.views import (
     ScanListView,
     # ScanCreateView,
     # ScanDetailView,
     # ScanUpdateView,
-    # ScanDeleteView
+    # ScanDeleteView,
 )
-# fmt:on
 
 
 urlpatterns = [