Merge pull request #3521 from unicef/ch33736-update-ma-subject-areas

[FAM] MicroAssessments: update tested subject areas according to the new questionnaire

Author: ntrncic

src/etools/applications/audit/serializers/export.py

@@ -313,6 +313,7 @@ def get_subject_area(self, obj):
 class MicroAssessmentDetailCSVSerializer(EngagementBaseDetailCSVSerializer):
     overall_risk_assessment = serializers.SerializerMethodField()
     subject_areas = serializers.SerializerMethodField()
+    subject_areas_v2 = serializers.SerializerMethodField()
     questionnaire = serializers.SerializerMethodField()
     questionnaire_v2 = serializers.SerializerMethodField()
 
@@ -332,6 +333,15 @@ def get_subject_areas(self, obj):
             for b in itertools.chain(*map(lambda c: c['blueprints'], subject_areas['children']))
         )
 
+    def get_subject_areas_v2(self, obj):
+        serializer = RiskRootSerializer(code='ma_subject_areas_v2')
+        subject_areas = serializer.to_representation(serializer.get_attribute(instance=obj))
+
+        return OrderedDict(
+            (b['id'], b['risk']['value_display'] if b['risk'] else 'N/A')
+            for b in itertools.chain(*map(lambda c: c['blueprints'], subject_areas['children']))
+        )
+
     def get_questionnaire(self, obj):
         serializer = AggregatedRiskRootSerializer(code='ma_questionnaire')
         questionnaire = serializer.to_representation(serializer.get_attribute(instance=obj))