Add validation for question in admin side.

apps/assessment_registry/admin.py

@@ -5,7 +5,6 @@
     MethodologyAttribute,
     Question,
     Answer,
-    SummaryIssue,
     ScoreRating,
     ScoreAnalyticalDensity,
 )
@@ -24,12 +23,6 @@ def save_model(self, request, obj, form, change):
         super().save_model(request, obj, form, change)
 
 
-@admin.register(Answer)
-class AnswerAdmin(admin.ModelAdmin):
-    list_display = ('id', 'question')
-    readonly_fields = ('created_by', 'modified_by', 'client_id',)
-
-
 class MethodologyAttributeInline(admin.TabularInline):
     model = MethodologyAttribute
     extra = 0
@@ -56,14 +49,11 @@ class AnalyticalDensityInline(admin.TabularInline):
 
 @admin.register(AssessmentRegistry)
 class AssessmentRegistryAdmin(admin.ModelAdmin):
-    list_display = ('id', 'lead', 'project')
+    list_display = ('id', 'project', 'lead')
 
     inlines = [
         MethodologyAttributeInline,
         ScoreInline,
         AnalyticalDensityInline,
         AnswerInline,
     ]
-
-
-admin.site.register(SummaryIssue)

apps/assessment_registry/models.py

@@ -1,5 +1,6 @@
 from django.db import models
 from django.contrib.postgres.fields import ArrayField
+from django.core.exceptions import ValidationError
 
 from user_resource.models import UserResource
 from geo.models import Region
@@ -212,7 +213,7 @@ class Meta:
         ordering = ["id"]
 
     def __str__(self):
-        return self.project.title
+        return self.lead.title
 
 
 class MethodologyAttribute(UserResource):
@@ -472,10 +473,118 @@ class QuestionSubSector(models.IntegerChoices):
             'Buy-in and use by naional and local government agencies'
         BUY_IN_AND_USE_BY_DEVELOPMENT_AND_STABILIZATION_ACTORS = 27, 'Buy-in and use by development and stabilization actors'
 
+    QUESTION_SECTOR_SUB_SECTOR_MAP = {
+        QuestionSector.RELEVANCE: [
+            QuestionSubSector.RELEVANCE,
+        ],
+        QuestionSector.COMPREHENSIVENESS: [
+            QuestionSubSector.GEOGRAPHIC_COMPREHENSIVENESS,
+            QuestionSubSector.SECTORAL_COMPREHENSIVENESS,
+            QuestionSubSector.AFFECTED_AND_VULNERABLE_GROUPS_COMPREHENSIVENESS,
+        ],
+        QuestionSector.ETHICS: [
+            QuestionSubSector.SAFETY_AND_PROTECTION,
+            QuestionSubSector.HUMANITARIAN_PRINCIPLES,
+            QuestionSubSector.CONTRIBUTION,
+        ],
+        QuestionSector.METHODOLOGICAL_RIGOR: [
+            QuestionSubSector.TRANSPARENCY,
+            QuestionSubSector.MITIGATING_BIAS,
+            QuestionSubSector.PARTICIPATION,
+            QuestionSubSector.CONTEXT_SPECIFICITY,
+        ],
+        QuestionSector.ANALYTICAL_VALUE: [
+            QuestionSubSector.ANALYTICAL_STANDARDS,
+            QuestionSubSector.DESCRIPTIONS,
+            QuestionSubSector.EXPLANATION,
+            QuestionSubSector.INTERPRETATION,
+            QuestionSubSector.ANTICIPATION,
+            QuestionSubSector.TIMELINESS,
+        ],
+        QuestionSector.EFFECTIVE_COMMUNICATION: [
+            QuestionSubSector.USER_FRIENDLY_PRESENTATION,
+            QuestionSubSector.ACTIVE_DISSEMINATION,
+        ],
+        QuestionSector.USE: [
+            QuestionSubSector.USE_FOR_COLLECTIVE_PLANNING,
+            QuestionSubSector.BUY_IN_AND_USE_BY_HUMANITARIAN_CLUSTERS_SECTORS,
+            QuestionSubSector.BUY_IN_AND_USE_BY_UN_AGENCIES,
+            QuestionSubSector.BUY_IN_AND_USE_BY_INTERNATIONAL_NGO,
+            QuestionSubSector.BUY_IN_AND_USE_BY_LOCAL_NGO,
+            QuestionSubSector.BUY_IN_AND_USE_BY_MEMBER_OF_RED_CROSS_RED_CRESENT_MOVEMENT,
+            QuestionSubSector.BUY_IN_AND_USE_BY_DONORS,
+            QuestionSubSector.BUY_IN_AND_USE_BY_NATIONAL_AND_LOCAL_GOVERNMENT_AGENCIES,
+            QuestionSubSector.BUY_IN_AND_USE_BY_DEVELOPMENT_AND_STABILIZATION_ACTORS,
+        ],
+        QuestionSector.PEOPLE_CENTERED_AND_INCLUSIVE: [
+            QuestionSubSector.AFFECTED_AND_VULNERABLE_GROUPS_COMPREHENSIVENESS,
+            QuestionSubSector.SAFETY_AND_PROTECTION,
+            QuestionSubSector.PARTICIPATION,
+            QuestionSubSector.CONTEXT_SPECIFICITY,
+        ],
+        QuestionSector.ACCOUNTABILITY_TO_AFFECTED_POPULATIONS: [
+            QuestionSubSector.PARTICIPATION,
+            QuestionSubSector.CONTEXT_SPECIFICITY,
+            QuestionSubSector.DESCRIPTIONS,
+            QuestionSubSector.ACTIVE_DISSEMINATION,
+        ],
+        QuestionSector.DO_NOT_HARM: [
+            QuestionSubSector.SAFETY_AND_PROTECTION,
+        ],
+        QuestionSector.DESIGNED_WITH_PURPOSE: [
+            QuestionSubSector.RELEVANCE,
+        ],
+        QuestionSector.COMPETENCY_AND_CAPACITY: [
+            QuestionSubSector.SAFETY_AND_PROTECTION,
+            QuestionSubSector.CONTEXT_SPECIFICITY,
+        ],
+        QuestionSector.IMPARTIALITY: [
+            QuestionSubSector.HUMANITARIAN_PRINCIPLES,
+        ],
+        QuestionSector.COORDINATION_AND_DATA_MINIMIZATION: [
+            QuestionSubSector.RELEVANCE,
+            QuestionSubSector.CONTRIBUTION,
+        ],
+        QuestionSector.JOINT_ANALYSIS: [
+            QuestionSubSector.MITIGATING_BIAS,
+            QuestionSubSector.ANALYTICAL_STANDARDS,
+        ],
+        QuestionSector.ACKNOWLEDGE_DISSENTING_VOICES_IN_JOINT_NEEDS_ANALYSIS: [
+            QuestionSubSector.ANALYTICAL_STANDARDS,
+        ],
+        QuestionSector.IFORMED_CONSENT_CONFIDENTIALITY_AND_DATA_SECURITY: [
+            QuestionSubSector.SAFETY_AND_PROTECTION,
+        ],
+        QuestionSector.SHARING_RESULTS: [
+            QuestionSubSector.ACTIVE_DISSEMINATION,
+        ],
+        QuestionSector.TRANSPARENCY_BETWEEN_ACTORS: [
+            QuestionSubSector.TRANSPARENCY,
+            QuestionSubSector.ANALYTICAL_STANDARDS,
+        ],
+        QuestionSector.MINIMUM_TECHNICAL_STANDARDS: [
+            QuestionSubSector.MITIGATING_BIAS,
+            QuestionSubSector.ANALYTICAL_STANDARDS,
+        ],
+    }
+
     sector = models.IntegerField(choices=QuestionSector.choices)
     sub_sector = models.IntegerField(choices=QuestionSubSector.choices)
     question = models.CharField(max_length=500)
 
+    def clean(self):
+        sector = self.sector
+        sub_sector = self.sub_sector
+
+        if hasattr(self, 'sector'):
+            if hasattr(self, 'sub_sector'):
+                if sub_sector not in Question.QUESTION_SECTOR_SUB_SECTOR_MAP[sector]:
+                    raise ValidationError('Invalid sebsector selected for given sector provided')
+
+    def save(self, *args, **kwargs):
+        self.full_clean()
+        super().save(*args, **kwargs)
+
     class Meta:
         ordering = ["id"]
 

apps/assessment_registry/serializers.py

@@ -1,5 +1,6 @@
 from rest_framework import serializers
 
+from utils.common import get_hierarchy_level
 from user_resource.serializers import UserResourceSerializer
 from deep.serializers import ProjectPropertySerializerMixin, TempClientIdMixin, IntegerIDField
 
@@ -45,9 +46,10 @@ class Meta:
         )
 
     def validate(self, data):
-        from utils.common import get_hierarchy_level
         if data.get('sub_pillar') is not None and data.get('sub_dimmension') is not None:
             raise serializers.ValidationError("Cannot select both sub_pillar and sub_dimmension field.")
+        if not data.get('sub_pillar') and not data.get('sub_dimmension'):
+            raise serializers.ValidationError("Either sub_pillar or sub_dimmension must be selected")
         if data.get('parent') is not None:
             if data.get('sub_pillar') is not None:
                 if data.get('sub_pillar') != data.get('parent').sub_pillar:

apps/assessment_registry/tests/test_schemas.py

@@ -36,10 +36,12 @@ def setUp(self):
         self.question1 = QuestionFactory.create(
             sector=Question.QuestionSector.RELEVANCE,
             sub_sector=Question.QuestionSubSector.RELEVANCE,
+            question='test question'
         )
         self.question2 = QuestionFactory.create(
             sector=Question.QuestionSector.COMPREHENSIVENESS,
             sub_sector=Question.QuestionSubSector.GEOGRAPHIC_COMPREHENSIVENESS,
+            question='test question',
         )
         self.country1, self.country2 = RegionFactory.create_batch(2)
         self.organization1, self.organization2 = OrganizationFactory.create_batch(2)

apps/gallery/tests/test_mutations.py

@@ -34,7 +34,7 @@ def setUp(self):
 
     def test_upload_preview_image(self):
         file_text = b'preview image text'
-        with NamedTemporaryFile(suffix='.png') as t_file:
+        with NamedTemporaryFile(suffix='.jpeg') as t_file:
             t_file.write(file_text)
             t_file.seek(0)
             response = self._client.post(
@@ -57,5 +57,5 @@ def test_upload_preview_image(self):
         self.assertTrue(content['data']['fileUpload']['result']['file']["name"])
         file_name = content['data']['fileUpload']['result']['file']["name"]
         file_url = content['data']['fileUpload']['result']['file']["url"]
-        self.assertTrue(file_name.endswith('.png'))
+        self.assertTrue(file_name.endswith('.jpeg'))
         self.assertTrue(file_url.endswith(file_name))