Add Graphql mutation for Analysis CRUD

Rename analyis field into analysis_id

Add test cases for Analysis Mutation

Change filter genericscalartype into filtertype

Change filter genericscalartype into filtertype

Remove required False in analyisis pillar analyis

Add analysis pillar delete mutation

Refactor

add return when pillar is not None

Author: sauravsapkota

apps/analysis/models.py

@@ -349,6 +349,9 @@ def annotate_for_analysis_pillar_summary(cls, qs):
                 analyzed_entries=models.F('dragged_entries') + models.F('discarded_entries'),
             )
 
+    def can_delete(self, user):
+        return self.can_modify(user)
+
 
 class DiscardedEntry(models.Model):
     """

apps/analysis/mutation.py

@@ -17,6 +17,7 @@
     AnalysisReport,
     AnalysisReportUpload,
     AnalysisReportSnapshot,
+    Analysis,
 )
 from .schema import (
     get_analysis_pillar_qs,
@@ -31,6 +32,7 @@
     AnalysisReportType,
     AnalysisReportUploadType,
     AnalysisReportSnapshotType,
+    AnalysisType,
 )
 from .serializers import (
     AnalysisPillarGqlSerializer,
@@ -42,6 +44,7 @@
     AnalysisReportSerializer,
     AnalysisReportSnapshotSerializer,
     AnalysisReportUploadSerializer,
+    AnalysisGqlSerializer,
 )
 
 
@@ -84,7 +87,7 @@
 )
 
 
-# Analysi Report
+# Analysis Report
 AnalysisReportInputType = generate_input_type_for_serializer(
     'AnalysisReportInputType',
     serializer_class=AnalysisReportSerializer,
@@ -105,6 +108,11 @@
     serializer_class=AnalysisReportUploadSerializer,
 )
 
+AnalysisInputType = generate_input_type_for_serializer(
+    'AnalysisInputType',
+    serializer_class=AnalysisGqlSerializer,
+)
+
 
 class RequiredPermissionMixin():
     permissions = [
@@ -269,9 +277,47 @@ class Arguments:
     result = graphene.Field(AnalysisReportUploadType)
 
 
+class AnalysisMutationMixin(RequiredPermissionMixin):
+    @classmethod
+    def filter_queryset(cls, qs, info):
+        return qs.filter(project=info.context.active_project)
+
+
+class CreateAnalysis(AnalysisMutationMixin, PsGrapheneMutation):
+    class Arguments:
+        data = AnalysisInputType(required=True)
+    model = Analysis
+    serializer_class = AnalysisGqlSerializer
+    result = graphene.Field(AnalysisType)
+
+
+class UpdateAnalysis(AnalysisMutationMixin, PsGrapheneMutation):
+    class Arguments:
+        data = AnalysisInputType(required=True)
+        id = graphene.ID(required=True)
+    model = Analysis
+    serializer_class = AnalysisGqlSerializer
+    result = graphene.Field(AnalysisType)
+
+
+class DeleteAnalysis(AnalysisMutationMixin, PsDeleteMutation):
+    class Arguments:
+        id = graphene.ID(required=True)
+    model = Analysis
+    result = graphene.Field(AnalysisType)
+
+
+class DeleteAnalysisPillar(AnalysisPillarMutationMixin, PsDeleteMutation):
+    class Arguments:
+        id = graphene.ID(required=True)
+    model = AnalysisPillar
+    result = graphene.Field(AnalysisPillarType)
+
+
 class Mutation():
     # Analysis Pillar
     analysis_pillar_update = UpdateAnalysisPillar.Field()
+    analysis_pillar_delete = DeleteAnalysisPillar.Field()
     # Discarded Entry
     discarded_entry_create = CreateAnalysisPillarDiscardedEntry.Field()
     discarded_entry_update = UpdateAnalysisPillarDiscardedEntry.Field()
@@ -289,3 +335,7 @@ class Mutation():
     # -- Uploads
     analysis_report_upload_create = CreateAnalysisReportUpload.Field()
     analysis_report_upload_delete = DeleteAnalysisReportUpload.Field()
+    # Analysis
+    analysis_create = CreateAnalysis.Field()
+    analysis_update = UpdateAnalysis.Field()
+    analysis_delete = DeleteAnalysis.Field()

apps/analysis/schema.py

@@ -196,13 +196,18 @@ class Meta:
             'title',
             'main_statement',
             'information_gap',
-            'filters',
         )
 
     assignee = graphene.Field(UserType, required=True)
-    analysis = graphene.ID(source='analysis_id', required=True)
+    analysis_id = graphene.ID(source='analysis_id', required=True)
     cloned_from = graphene.ID(source='cloned_from_id')
     analyzed_entries_count = graphene.Int(required=True)
+    filters = graphene.List(graphene.NonNull(
+        type('FilterDataType', (graphene.ObjectType,), {
+            'id': graphene.String(),
+            'key': graphene.String(),
+            'uniqueId': graphene.String()
+        })))
 
     # XXX: N+1 and No pagination
     statements = graphene.List(graphene.NonNull(AnalyticalStatementType))

apps/analysis/serializers.py

@@ -331,11 +331,14 @@ def validate(self, data):
 
 
 class AnalysisPillarGqlSerializer(TempClientIdMixin, UserResourceSerializer):
+    id = IntegerIDField(required=False)
     statements = AnalyticalStatementGqlSerializer(many=True, source='analyticalstatement_set', required=False)
+    analysis = serializers.PrimaryKeyRelatedField(queryset=Analysis.objects.all(), required=False)
 
     class Meta:
         model = AnalysisPillar
         fields = (
+            'id',
             'title',
             'main_statement',
             'information_gap',
@@ -409,21 +412,18 @@ def validate(self, data):
         return data
 
 
-class AnalysisGqlSerializer(UserResourceSerializer):
-    id = IntegerIDField(required=False)
+class AnalysisGqlSerializer(UserResourceSerializer, ProjectPropertySerializerMixin):
     analysis_pillar = AnalysisPillarGqlSerializer(many=True, source='analysispillar_set', required=False)
     start_date = serializers.DateField(required=False, allow_null=True)
 
     class Meta:
         model = Analysis
         fields = (
-            'id',
             'title',
             'team_lead',
-            'project',
             'start_date',
             'end_date',
-            'cloned_from',
+            'analysis_pillar',
         )
 
     def validate_project(self, project):
@@ -432,6 +432,7 @@ def validate_project(self, project):
         return project
 
     def validate(self, data):
+        data['project'] = self.project
         start_date = data.get('start_date')
         end_date = data.get('end_date')
         if start_date and start_date > end_date:
@@ -440,6 +441,43 @@ def validate(self, data):
             )
         return data
 
+    def create_or_update_pillar(self, pillar_data, instance):
+        data = {
+            "title": pillar_data.get('title'),
+            "assignee": pillar_data.get('assignee').id,
+            "analysis": instance.id,
+            "filters": pillar_data.get('filters'),
+        }
+        pillar_id = pillar_data.get('id', None)
+        if pillar_id:
+            data["id"] = pillar_id
+            analysis_pillar = get_object_or_404(AnalysisPillar, pk=pillar_id)
+            analysis_pillar_serializer = AnalysisPillarGqlSerializer(
+                analysis_pillar,
+                data=data,
+                context=self.context
+            )
+            return analysis_pillar_serializer
+        analysis_pillar_serializer = AnalysisPillarGqlSerializer(data=data, context=self.context)
+        return analysis_pillar_serializer
+
+    def update(self, instance, validated_data):
+        with transaction.atomic():
+            if 'analysispillar_set' in validated_data:
+                pillars = validated_data.pop('analysispillar_set')
+                errors = {}
+                for pillar in pillars:
+                    analysis_pillar_serializer = self.create_or_update_pillar(pillar, instance)
+                    if analysis_pillar_serializer.is_valid():
+                        analysis_pillar_serializer.save()
+                    else:
+                        errors[pillar.get('id', 'new')] = analysis_pillar_serializer.errors
+
+                if errors:
+                    raise serializers.ValidationError(errors)
+
+        return super().update(instance, validated_data)
+
 
 AnalysisCloneGqlSerializer = AnalysisCloneInputSerializer