Merge pull request #1623 from IFRCGo/hotfix-dref-final-report

thenav56 · web-flow · commit 40af6aea020a · 2023-01-04T10:36:09.000+05:45
Add missing file in dref final report serializer
diff --git a/deployments/snapshots/snap_tests.py b/deployments/snapshots/snap_tests.py
@@ -308,8 +308,8 @@
         {
             'budget_amount_total': 5920000,
             'id': 21,
-            'iso3': 'WNq',
-            'name': 'country-FWJNPIGxPkqKRLeNzbOHsgUSwRJXvxmDTodTYrnDAnhHuxKzFb',
+            'iso3': 'hBW',
+            'name': 'country-hkFWJNPIGxPkqKRLeNzbOHsgUSwRJXvxmDTodTYrnDAnhHuxKz',
             'ongoing_projects': 1,
             'operation_types': [
                 0
@@ -324,7 +324,7 @@
                     'primary_sector_display': 'CEA'
                 }
             ],
-            'society_name': 'society-name-qJTgrVtaadVUrcYCxAcjpXhdUBtXcCXMFkLAHVklUJGQvVYtjD',
+            'society_name': 'society-name-NqqJTgrVtaadVUrcYCxAcjpXhdUBtXcCXMFkLAHVklUJGQvVYt',
             'target_total': 0
         },
         {
diff --git a/dref/migrations/0049_auto_20221227_0501.py b/dref/migrations/0049_auto_20221227_0501.py
@@ -0,0 +1,48 @@
+# Generated by Django 3.2.16 on 2022-12-27 05:01
+
+from django.db import migrations, models
+import django.db.models.deletion
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('dref', '0048_auto_20221213_0402'),
+    ]
+
+    operations = [
+        migrations.RemoveField(
+            model_name='dreffinalreport',
+            name='budget_file',
+        ),
+        migrations.AddField(
+            model_name='dreffinalreport',
+            name='financial_report',
+            field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='financial_report_dref_final_report', to='dref.dreffile', verbose_name='financial report'),
+        ),
+        migrations.AddField(
+            model_name='dreffinalreport',
+            name='financial_report_description',
+            field=models.TextField(blank=True, null=True, verbose_name='Financial Report Description'),
+        ),
+        migrations.AddField(
+            model_name='dreffinalreport',
+            name='has_national_society_conducted',
+            field=models.BooleanField(blank=True, null=True, verbose_name='Has national society conducted any intervention'),
+        ),
+        migrations.AddField(
+            model_name='dreffinalreport',
+            name='national_society_conducted_description',
+            field=models.TextField(blank=True, null=True, verbose_name='National Society conducted description'),
+        ),
+        migrations.AddField(
+            model_name='dreffinalreport',
+            name='num_assisted',
+            field=models.IntegerField(blank=True, null=True, verbose_name='number of assisted'),
+        ),
+        migrations.AddField(
+            model_name='plannedintervention',
+            name='person_assisted',
+            field=models.IntegerField(blank=True, null=True, verbose_name='person assisted'),
+        ),
+    ]
diff --git a/dref/models.py b/dref/models.py
@@ -154,6 +154,7 @@ class Title(models.TextChoices):
     title = models.CharField(max_length=255, verbose_name=_('title'), choices=Title.choices)
     description = models.TextField(verbose_name=_('description'), blank=True, null=True)
     person_targeted = models.IntegerField(verbose_name=_('person targeted'), null=True, blank=True)
+    person_assisted = models.IntegerField(verbose_name=_('person assisted'), null=True, blank=True)
     budget = models.IntegerField(verbose_name=_('budget'), blank=True, null=True)
     male = models.IntegerField(verbose_name=_('male'), blank=True, null=True)
     female = models.IntegerField(verbose_name=_('female'), blank=True, null=True)
@@ -1553,11 +1554,27 @@ class DrefFinalReport(models.Model):
         verbose_name=_('Did National Society'),
         null=True, blank=True
     )
-    budget_file = models.ForeignKey(
+    financial_report = models.ForeignKey(
         'DrefFile', on_delete=models.SET_NULL,
         null=True, blank=True,
-        verbose_name=_('budget file'),
-        related_name='budget_file_dref_final_report'
+        verbose_name=_('financial report'),
+        related_name='financial_report_dref_final_report'
+    )
+    num_assisted = models.IntegerField(
+        verbose_name=_('number of assisted'),
+        blank=True, null=True
+    )
+    has_national_society_conducted = models.BooleanField(
+        verbose_name=_('Has national society conducted any intervention'),
+        null=True, blank=True
+    )
+    national_society_conducted_description = models.TextField(
+        verbose_name=_('National Society conducted description'),
+        null=True, blank=True
+    )
+    financial_report_description = models.TextField(
+        verbose_name=_('Financial Report Description'),
+        null=True, blank=True
     )
 
     class Meta:
diff --git a/dref/serializers.py b/dref/serializers.py
@@ -412,14 +412,14 @@ class DrefOperationalUpdateSerializer(
     budget_file_details = DrefFileSerializer(source='budget_file', read_only=True)
     country_details = MiniCountrySerializer(source='country', read_only=True)
     district_details = MiniDistrictSerializer(source='district', read_only=True, many=True)
-    assessment_report_file = DrefFileSerializer(source='assessment_report', required=False, allow_null=True)
+    assessment_report_details = DrefFileSerializer(source='assessment_report', read_only=True)
     risk_security = RiskSecuritySerializer(many=True, required=False)
     modified_at = serializers.DateTimeField(required=False)
 
     class Meta:
         model = DrefOperationalUpdate
         read_only_fields = ('operational_update_number', )
-        exclude = ('images', 'photos', 'event_map', 'assessment_report', 'cover_image')
+        exclude = ('images', 'photos', 'event_map', 'cover_image')
 
     def validate(self, data):
         dref = data.get('dref')
@@ -516,6 +516,7 @@ def create(self, validated_data):
             validated_data['anticipatory_actions'] = dref.anticipatory_actions
             validated_data['event_scope'] = dref.event_scope
             validated_data['budget_file'] = dref.budget_file
+            validated_data['assessment_report'] = dref.assessment_report
             validated_data['country'] = dref.country
             validated_data['risk_security_concern'] = dref.risk_security_concern
             validated_data['is_assessment_report'] = dref.is_assessment_report
@@ -535,7 +536,6 @@ def create(self, validated_data):
             operational_update = super().create(validated_data)
             # XXX: Copy files from DREF (Only nested serialized fields)
             nested_serialized_file_fields = [
-                'assessment_report',
                 'cover_image',
                 'event_map',
             ]
@@ -613,7 +613,6 @@ def create(self, validated_data):
             validated_data['event_description'] = dref_operational_update.event_description
             validated_data['anticipatory_actions'] = dref_operational_update.anticipatory_actions
             validated_data['event_scope'] = dref_operational_update.event_scope
-            validated_data['cover_image'] = dref_operational_update.cover_image
             validated_data['budget_file'] = dref_operational_update.budget_file
             validated_data['assessment_report'] = dref_operational_update.assessment_report
             validated_data['country'] = dref_operational_update.country
@@ -633,6 +632,16 @@ def create(self, validated_data):
             validated_data['communication'] = dref_operational_update.communication
             validated_data['people_in_need'] = dref_operational_update.people_in_need
             operational_update = super().create(validated_data)
+            # XXX: Copy files from DREF (Only nested serialized fields)
+            nested_serialized_file_fields = [
+                'cover_image',
+                'event_map',
+            ]
+            for file_field in nested_serialized_file_fields:
+                dref_file = getattr(dref, file_field, None)
+                if dref_file:
+                    setattr(operational_update, file_field, dref_file.clone(self.context['request'].user))
+            operational_update.save(update_fields=nested_serialized_file_fields)
             # XXX COPY M2M fields
             operational_update.planned_interventions.add(*dref_operational_update.planned_interventions.all())
             operational_update.images.add(*dref_operational_update.images.all())
@@ -709,18 +718,17 @@ class DrefFinalReportSerializer(
     photos_file = DrefFileSerializer(source='photos', many=True, required=False, allow_null=True)
     country_details = MiniCountrySerializer(source='country', read_only=True)
     district_details = MiniDistrictSerializer(source='district', read_only=True, many=True)
-    assessment_report_file = DrefFileSerializer(source='assessment_report', required=False, allow_null=True)
+    assessment_report_details = DrefFileSerializer(source='assessment_report', read_only=True)
     risk_security = RiskSecuritySerializer(many=True, required=False)
     modified_at = serializers.DateTimeField(required=False)
-    budget_file_details = DrefFileSerializer(source='budget_file', read_only=True)
+    financial_report_details = DrefFileSerializer(source='financial_report', read_only=True)
 
     class Meta:
         model = DrefFinalReport
         exclude = (
             'images',
             'photos',
             'event_map',
-            'assessment_report',
             'cover_image',
         )
 
@@ -762,6 +770,7 @@ def create(self, validated_data):
         dref = validated_data['dref']
         dref_operational_update = DrefOperationalUpdate.objects.filter(
             dref=dref,
+            is_published=True
         ).order_by('-operational_update_number').first()
         if dref_operational_update:
             validated_data['title'] = dref_operational_update.title
@@ -823,7 +832,6 @@ def create(self, validated_data):
             validated_data['event_description'] = dref_operational_update.event_description
             validated_data['anticipatory_actions'] = dref_operational_update.anticipatory_actions
             validated_data['event_scope'] = dref_operational_update.event_scope
-            validated_data['assessment_report'] = dref_operational_update.assessment_report
             validated_data['country'] = dref_operational_update.country
             validated_data['risk_security_concern'] = dref_operational_update.risk_security_concern
             validated_data['is_assessment_report'] = dref_operational_update.is_assessment_report
@@ -832,11 +840,10 @@ def create(self, validated_data):
             validated_data['event_date'] = dref_operational_update.event_date
             validated_data['people_in_need'] = dref_operational_update.people_in_need
             validated_data['ns_respond_date'] = dref_operational_update.ns_respond_date
-            validated_data['budget_file'] = dref_operational_update.budget_file
+            validated_data['assessment_report'] = dref_operational_update.assessment_report
             dref_final_report = super().create(validated_data)
             # XXX: Copy files from DREF (Only nested serialized fields)
             nested_serialized_file_fields = [
-                'assessment_report',
                 'cover_image',
                 'event_map',
             ]
@@ -922,9 +929,19 @@ def create(self, validated_data):
             validated_data['people_in_need'] = dref.people_in_need
             validated_data['event_text'] = dref.event_text
             validated_data['ns_respond_date'] = dref.ns_respond_date
-            validated_data['budget_file'] = dref.budget_file
-            validated_data['did_national_society'] = dref.did_national_society
+            validated_data['cover_image'] = dref.cover_image
+            validated_data['event_map'] = dref.event_map
             dref_final_report = super().create(validated_data)
+            # XXX: Copy files from DREF (Only nested serialized fields)
+            nested_serialized_file_fields = [
+                'cover_image',
+                'event_map',
+            ]
+            for file_field in nested_serialized_file_fields:
+                dref_file = getattr(dref, file_field, None)
+                if dref_file:
+                    setattr(dref_final_report, file_field, dref_file.clone(self.context['request'].user))
+            dref_final_report.save(update_fields=nested_serialized_file_fields)
             dref_final_report.planned_interventions.add(*dref.planned_interventions.all())
             dref_final_report.needs_identified.add(*dref.needs_identified.all())
             dref_final_report.district.add(*dref.district.all())

Original file line number	Diff line number	Diff line change
`@@ -308,8 +308,8 @@`
`308`	`308`	`{`
`309`	`309`	`'budget_amount_total': 5920000,`
`310`	`310`	`'id': 21,`
`311`		`- 'iso3': 'WNq',`
`312`		`- 'name': 'country-FWJNPIGxPkqKRLeNzbOHsgUSwRJXvxmDTodTYrnDAnhHuxKzFb',`
	`311`	`+ 'iso3': 'hBW',`
	`312`	`+ 'name': 'country-hkFWJNPIGxPkqKRLeNzbOHsgUSwRJXvxmDTodTYrnDAnhHuxKz',`
`313`	`313`	`'ongoing_projects': 1,`
`314`	`314`	`'operation_types': [`
`315`	`315`	`0`
`@@ -324,7 +324,7 @@`
`324`	`324`	`'primary_sector_display': 'CEA'`
`325`	`325`	`}`
`326`	`326`	`],`
`327`		`- 'society_name': 'society-name-qJTgrVtaadVUrcYCxAcjpXhdUBtXcCXMFkLAHVklUJGQvVYtjD',`
	`327`	`+ 'society_name': 'society-name-NqqJTgrVtaadVUrcYCxAcjpXhdUBtXcCXMFkLAHVklUJGQvVYt',`
`328`	`328`	`'target_total': 0`
`329`	`329`	`},`
`330`	`330`	`{`