Merge branch 'feature/refactor-project-features-view' into develop

# Conflicts:
#	src/features/views.py
#	src/projects/views.py

Author: Matt Elwell

src/api/tests.py

@@ -278,6 +278,7 @@ def test_should_remove_identityfeature_when_delete(self):
 
 class ProjectFeatureTestCase(TestCase):
     project_features_url = '/api/v1/projects/%s/features/'
+    project_feature_detail_url = '/api/v1/projects/%s/features/%d/'
     post_template = '{ "name": "%s", "project": %d, "initial_value": "%s" }'
 
     def set_up(self):
@@ -341,12 +342,12 @@ def test_should_delete_feature_states_when_feature_deleted(self):
         feature = Feature.objects.get(name="test feature", project=project.id)
 
         # When
-        response = client.delete(self.project_features_url % project.id, data='{"id": %d}' %
-                                                                              feature.id,
+        response = client.delete(self.project_feature_detail_url % (project.id, feature.id),
+                                 data='{"id": %d}' % feature.id,
                                  content_type='application/json')
 
         # Then
-        self.assertEquals(response.status_code, status.HTTP_200_OK)
+        self.assertEquals(response.status_code, status.HTTP_204_NO_CONTENT)
         # check feature was deleted succesfully
         self.assertEquals(0, Feature.objects.filter(name="test feature",
                                                     project=project.id).count())

src/features/migrations/0009_auto_20180815_1011.py

@@ -0,0 +1,20 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.11.14 on 2018-08-15 10:11
+from __future__ import unicode_literals
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('features', '0008_auto_20180608_1328'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='feature',
+            name='description',
+            field=models.TextField(blank=True, null=True),
+        ),
+    ]

src/features/models.py

@@ -29,7 +29,7 @@ class Feature(models.Model):
     created_date = models.DateTimeField('DateCreated', auto_now_add=True)
     project = models.ForeignKey(Project, related_name='features')
     initial_value = models.CharField(max_length=2000, null=True, default=None)
-    description = models.TextField(null=True)
+    description = models.TextField(null=True, blank=True)
     default_enabled = models.BooleanField(default=False)
     type = models.CharField(max_length=50, choices=FEATURE_TYPES, default=FLAG)
 

src/features/serializers.py

@@ -3,13 +3,13 @@
 from .models import Feature, FeatureState, FeatureStateValue
 
 
-class FeatureSerializer(serializers.ModelSerializer):
+class CreateFeatureSerializer(serializers.ModelSerializer):
     class Meta:
         model = Feature
         fields = "__all__"
 
     def validate(self, data):
-        data = super(FeatureSerializer, self).validate(data)
+        data = super(CreateFeatureSerializer, self).validate(data)
 
         if Feature.objects.filter(project=data['project'], name__iexact=data['name']).exists():
             raise serializers.ValidationError("Feature with that name already exists for this "
@@ -19,8 +19,14 @@ def validate(self, data):
         return data
 
 
+class FeatureSerializer(serializers.ModelSerializer):
+    class Meta:
+        model = Feature
+        fields = "__all__"
+
+
 class FeatureStateSerializerFull(serializers.ModelSerializer):
-    feature = FeatureSerializer()
+    feature = CreateFeatureSerializer()
     feature_state_value = serializers.SerializerMethodField()
 
     class Meta:

src/features/views.py

@@ -6,9 +6,25 @@
 from rest_framework.schemas import AutoSchema
 
 from environments.models import Environment, Identity
+from projects.models import Project
 from .models import FeatureState, Feature
-from .serializers import FeatureStateSerializerBasic, FeatureStateValueSerializer, \
-    FeatureStateSerializerFull, FeatureStateSerializerCreate
+from .serializers import FeatureStateSerializerBasic, FeatureStateSerializerFull, \
+    FeatureStateSerializerCreate, CreateFeatureSerializer, FeatureSerializer, \
+    FeatureStateValueSerializer
+
+
+class FeatureViewSet(viewsets.ModelViewSet):
+    queryset = Feature.objects.all()
+
+    def get_serializer_class(self):
+        if self.action == 'create':
+            return CreateFeatureSerializer
+        else:
+            return FeatureSerializer
+
+    def get_queryset(self):
+        project = Project.objects.get(pk=self.kwargs['project_pk'])
+        return project.features.all()
 
 
 class FeatureStateViewSet(viewsets.ModelViewSet):

src/projects/urls.py

@@ -1,13 +1,19 @@
 from django.conf.urls import url, include
 from rest_framework_nested import routers
+
+from features.views import FeatureViewSet
 from . import views
 
 
 router = routers.DefaultRouter()
 router.register(r'', views.ProjectViewSet, base_name="project")
 
+projects_router = routers.NestedSimpleRouter(router, r'', lookup="project")
+projects_router.register(r'features', FeatureViewSet, base_name="project-features")
+
 app_name = "projects"
 
 urlpatterns = [
     url(r'^', include(router.urls)),
+    url(r'^', include(projects_router.urls))
 ]

src/projects/views.py

@@ -5,8 +5,6 @@
 from rest_framework.decorators import action
 from rest_framework.response import Response
 
-from features.models import Feature, FeatureState, FLAG
-from features.serializers import FeatureSerializer
 from environments.serializers import EnvironmentSerializerLight
 from projects.models import Project
 from projects.serializers import ProjectSerializer
@@ -26,55 +24,4 @@ def get_queryset(self):
     def environments(self, request, pk):
         project = self.get_object()
         environments = project.environments.all()
-        return Response(EnvironmentSerializerLight(environments, many=True).data)
-
-    @action(detail=True, methods=["GET", "POST", "PUT", "DELETE"])
-    def features(self, request, pk):
-        project = self.get_object()
-
-        self.queryset = Feature.objects.filter(project=project)
-        self.serializer_class = FeatureSerializer
-
-        if request.method == "POST":
-            data = {
-                "project": project.id,
-                "name": request.data["name"],
-                "initial_value": request.data.get("initial_value"),
-                "description": request.data.get("description"),
-                "type": request.data.get("type", FLAG),
-                "default_enabled": request.data.get("default_enabled", False),
-            }
-
-            f_serializer = FeatureSerializer(data=data)
-
-            if f_serializer.is_valid():
-                f_serializer.save()
-                return Response(f_serializer.data, status=status.HTTP_201_CREATED)
-            else:
-                return Response(f_serializer.errors, status=status.HTTP_400_BAD_REQUEST)
-
-        elif request.method == "PUT":
-            data = {
-                "id": request.data["id"],
-                "project": project.id,
-                "name": request.data["name"],
-                "initial_value": request.data["initial_value"]
-            }
-
-            serializer = FeatureSerializer(data=data)
-
-            if serializer.is_valid():
-                feature_to_update = Feature.objects.get(pk=data["id"])
-                feature_updated = serializer.update(feature_to_update, serializer.validated_data)
-                return Response(FeatureSerializer(feature_updated).data,
-                                status=status.HTTP_201_CREATED)
-            else:
-                return Response(serializer.errors, status=status.HTTP_400_BAD_REQUEST)
-
-        elif request.method == "DELETE":
-            Feature.objects.get(pk=request.data["id"]).delete()
-            return Response(status=status.HTTP_200_OK)
-
-        else:
-            serializer = FeatureSerializer(instance=self.queryset, many=True)
-            return Response(serializer.data)
+        return Response(EnvironmentSerializerLight(environments, many=True).data)