Modified create, update, get of field report api to accept eap activation:

Author: Rup-Narayan-Rajbanshi

api/drf_views.py

@@ -18,6 +18,8 @@
 from deployments.models import Personnel
 from databank.serializers import CountryOverviewSerializer
 
+from eap.models import EAPActivation, EAP, EAPDocument
+
 from .event_sources import SOURCES
 from .exceptions import BadRequest
 from .view_filters import ListFilter
@@ -906,6 +908,14 @@ def create_event(self, report):
         report.save()
         return event
 
+    def create_eap_activation(self, eap_activation_data, fieldreport):
+        eap_id = eap_activation_data.pop('eap')
+        document_id = eap_activation_data.pop('document')
+        eap = EAP.objects.get(id=eap_id)
+        document = EAPDocument.objects.get(id=document_id)
+        eap_activation = EAPActivation.objects.create(eap=eap, field_report=fieldreport, document=document, **eap_activation_data)
+        return eap_activation
+
     def create(self, request, *args, **kwargs):
         serializer = self.serialize(request.data)
         if not serializer.is_valid():
@@ -920,7 +930,9 @@ def create(self, request, *args, **kwargs):
 
         try:
             # TODO: Use serializer to create fieldreport
+            eap_activation_data = data.pop('eap_activation')
             fieldreport = FieldReport.objects.create(**data)
+            self.create_eap_activation(eap_activation_data, fieldreport)
             CreateFieldReportSerializer.trigger_field_translation(fieldreport)
         except Exception as e:
             try:
@@ -962,12 +974,22 @@ def create(self, request, *args, **kwargs):
         return Response({'id': fieldreport.id}, status=HTTP_201_CREATED)
 
 
+from eap.serializers import EAPActivationSerializer
 class UpdateFieldReport(UpdateAPIView, GenericFieldReportView):
     authentication_classes = (TokenAuthentication,)
     permission_classes = (IsAuthenticated,)
     queryset = FieldReport.objects.all()
     serializer_class = CreateFieldReportSerializer
 
+    def update_eap_activation(self, eap_activation_data, fieldreport):
+        eap_activation_data.pop('eap')
+        document_id = eap_activation_data.pop('document')
+        eap_activation_obj = EAPActivation.objects.get(field_report=fieldreport)
+        eap_activation = EAPActivationSerializer().update(eap_activation_obj, eap_activation_data)
+        eap_activation_obj.document = EAPDocument.objects.get(id=document_id)
+        eap_activation_obj.save(update_fields=['document'])
+        return eap_activation
+
     def partial_update(self, request, *args, **kwargs):
         self.update(request, *args, **kwargs)
 
@@ -981,7 +1003,8 @@ def update(self, request, *args, **kwargs):
         data, locations, meta, partners = self.map_many_to_many_relations(data)
 
         try:
-            serializer.save()
+            field_report = serializer.save()
+            self.update_eap_activation(request.data['eap_activation'], field_report)
         except Exception:
             logger.error('Faild to update field report', exc_info=True)
             raise BadRequest('Could not update field report')

api/models.py

@@ -1924,8 +1924,8 @@ class EmergencyOperationsFR(EmergencyOperationsBase):
     raw_shelter_people_targeted = None
     raw_water_sanitation_and_hygiene_people_targeted = None
 
-    # Fields for the cleaned data
     date_of_disaster = models.DateField(verbose_name=_('date of disaster'), null=True, blank=True)
+    # Fields for the cleaned data
     num_of_other_partner_involved = models.TextField(verbose_name=_('number of other partner involved'), null=True, blank=True)
     num_of_partner_ns_involved = models.TextField(verbose_name=_('number of NS partner involved'), null=True, blank=True)
     operation_end_date = models.DateField(verbose_name=_('operation end date'), null=True, blank=True)

api/serializers.py

@@ -54,6 +54,7 @@
 )
 from notifications.models import Subscription
 from deployments.models import EmergencyProject
+from eap.models import EAPActivation
 
 
 class GeoSerializerMixin:
@@ -1059,7 +1060,7 @@ class Meta:
         model = FieldReport
         fields = '__all__'
 
-
+from eap.serializers import EAPActivationSerializer
 class DetailFieldReportSerializer(FieldReportEnumDisplayMixin, ModelSerializer):
     user = UserSerializer()
     dtype = DisasterTypeSerializer()
@@ -1071,13 +1072,21 @@ class DetailFieldReportSerializer(FieldReportEnumDisplayMixin, ModelSerializer):
     districts = MiniDistrictSerializer(many=True)
     external_partners = ExternalPartnerSerializer(many=True)
     supported_activities = SupportedActivitySerializer(many=True)
+    eap_activation = serializers.SerializerMethodField('get_eap_activation')
+
+    @staticmethod
+    def get_eap_activation(obj):
+        eap_activation = EAPActivation.objects.get(field_report=obj)
+        eap_activation_data = EAPActivationSerializer(eap_activation).data
+        return eap_activation_data
 
     class Meta:
         model = FieldReport
         fields = '__all__'
 
 
 class CreateFieldReportSerializer(FieldReportEnumDisplayMixin, ModelSerializer):
+
     class Meta:
         model = FieldReport
         fields = '__all__'

api/test_views.py

@@ -12,6 +12,7 @@
     EventLinkFactory,
     AppealFactory
 )
+from eap.factories import EAPFactory, EAPDocumentFactory
 
 
 class AuthTokenTest(APITestCase):
@@ -82,6 +83,10 @@ class FieldReportTest(APITestCase):
     def test_create_and_update(self):
         user = User.objects.create(username='jo')
         region = models.Region.objects.create(name=1)
+        eap1 = EAPFactory.create(created_by=user)
+        eap2 = EAPFactory.create(created_by=user)
+        document1 = EAPDocumentFactory.create(created_by=self.user)
+        document2 = EAPDocumentFactory.create(created_by=self.user)
         country1 = models.Country.objects.create(name='abc', region=region)
         country2 = models.Country.objects.create(name='xyz')
         body = {
@@ -105,6 +110,13 @@ def test_create_and_update(self):
                 {'ctype': 'Originator', 'name': 'jo', 'title': 'head', 'email': '123'}
             ],
             'user': user.id,
+            'eap_activation': {
+                'title': 'eap activation title',
+                'eap': eap1.id,
+                'description': 'test eap description',
+                'trigger_met_date': '2022-11-11 00:00',
+                'document': document1.id,
+            }
         }
         self.client.force_authenticate(user=user)
         with self.capture_on_commit_callbacks(execute=True):
@@ -149,6 +161,17 @@ def test_create_and_update(self):
         ]
         body['actions_taken'] = []
         body['visibility'] = models.VisibilityChoices.PUBLIC
+        body['eap_activation'] = {
+            'title': 'eap activation title updated',
+            'eap': eap2.id,
+            'description': 'test eap description updated',
+            'trigger_met_date': '2022-11-11 01:00',
+            'document': document2.id,
+            'originator_name': 'test name',
+            'nsc_name_operational': 'test name operational',
+            'ifrc_focal_email': '[email protected]'
+        }
+
         response = self.client.put(f'/api/v2/update_field_report/{created.id}/', body, format='json').json()
         updated = models.FieldReport.objects.get(pk=response['id'])
 

eap/admin.py

@@ -1,10 +1,33 @@
 from django.contrib import admin
 
 # Register your models here.
-from .models import EAP
+
+from .models import (
+    EAP,
+    EAPPartner,
+    EAPReference,
+    EAPDocument,
+)
+
+
+class ReferenceAdminInline(admin.TabularInline):
+    model = EAPReference
+    extra = 0
+
+
+class PartnerAdminInline(admin.TabularInline):
+    model = EAPPartner
+    extra = 0
+
+
+@admin.register(EAPDocument)
+class EAPDocumentAdmin(admin.ModelAdmin):
+    model = EAPDocument
+    extra = 0
 
 
 @admin.register(EAP)
 class EAPAdmin(admin.ModelAdmin):
-    list_display = ('eap_number', 'country', 'status', 'operational_timeframe', 'total_budget')
-
+    list_display = ('eap_number', 'country', 'status', 'operational_timeframe',)
+    inlines = [ReferenceAdminInline, PartnerAdminInline]
+    autocomplete_fields = ('country', 'district', 'disaster_type', 'created_by', 'modified_by')

eap/migrations/0004_auto_20220715_0628.py renamed to eap/migrations/0004_auto_20220715_1301.py

@@ -1,4 +1,4 @@
-# Generated by Django 2.2.28 on 2022-07-15 06:28
+# Generated by Django 2.2.28 on 2022-07-15 13:01
 
 from django.db import migrations, models
 import django.db.models.deletion

eap/migrations/0005_eapactivation.py

@@ -0,0 +1,39 @@
+# Generated by Django 2.2.28 on 2022-07-19 11:06
+
+from django.db import migrations, models
+import django.db.models.deletion
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('api', '0156_appealfilter_comment'),
+        ('eap', '0004_auto_20220715_1301'),
+    ]
+
+    operations = [
+        migrations.CreateModel(
+            name='EAPActivation',
+            fields=[
+                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('title', models.CharField(blank=True, max_length=250, null=True)),
+                ('trigger_met_date', models.DateTimeField(verbose_name='Date the trigger was met')),
+                ('description', models.TextField(verbose_name='Description of EAP Activation')),
+                ('originator_name', models.CharField(blank=True, max_length=250, null=True, verbose_name='Originator name')),
+                ('originator_title', models.CharField(blank=True, max_length=250, null=True, verbose_name='Originator title')),
+                ('originator_email', models.CharField(blank=True, max_length=250, null=True, verbose_name='Originator email')),
+                ('nsc_name_operational', models.CharField(blank=True, max_length=250, null=True, verbose_name='National Society Contact (Operational)')),
+                ('nsc_title_operational', models.CharField(blank=True, max_length=250, null=True, verbose_name='National Society Contact (Operational)')),
+                ('nsc_email_operational', models.CharField(blank=True, max_length=250, null=True, verbose_name='National Society Contact (Operational)')),
+                ('nsc_name_secretary', models.CharField(blank=True, max_length=250, null=True, verbose_name='National Society Contact (Secretary)')),
+                ('nsc_title_secretary', models.CharField(blank=True, max_length=250, null=True, verbose_name='National Society Contact (Secretary)')),
+                ('nsc_email_secretary', models.CharField(blank=True, max_length=250, null=True, verbose_name='National Society Contact (Secretary)')),
+                ('ifrc_focal_name', models.CharField(blank=True, max_length=250, null=True, verbose_name='IFRC Focal Point Name')),
+                ('ifrc_focal_title', models.CharField(blank=True, max_length=250, null=True, verbose_name='IFRC Focal Point Title')),
+                ('ifrc_focal_email', models.CharField(blank=True, max_length=250, null=True, verbose_name='IFRC Focal Point Email')),
+                ('document', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='eap_activation_document', to='eap.EAPDocument', verbose_name='EAP Activation Documents')),
+                ('eap', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='eap_activation', to='eap.EAP', verbose_name='eap')),
+                ('field_report', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='field_report_eap_activation', to='api.FieldReport', verbose_name='field report')),
+            ],
+        ),
+    ]

eap/models.py

@@ -7,6 +7,7 @@
     Country,
     District,
     DisasterType,
+    FieldReport,
 )
 
 
@@ -209,3 +210,42 @@ class Meta:
 
     def __str__(self):
         return f'{self.id}'
+
+
+class EAPActivation(models.Model):
+    title = models.CharField(max_length=250, null=True, blank=True)
+    field_report = models.ForeignKey(
+        FieldReport,
+        on_delete=models.SET_NULL,
+        related_name='field_report_eap_activation',
+        verbose_name=_('field report'),
+        null=True, blank=True
+    )
+    eap = models.ForeignKey(
+        EAP,
+        on_delete=models.SET_NULL,
+        related_name='eap_activation',
+        verbose_name=_('eap'),
+        null=True, blank=True
+    )
+    trigger_met_date = models.DateTimeField(verbose_name=_('Date the trigger was met'))
+    description = models.TextField(verbose_name=_('Description of EAP Activation'))
+    document = models.ForeignKey(
+        EAPDocument,
+        on_delete=models.SET_NULL,
+        verbose_name=_('EAP Activation Documents'),
+        related_name='eap_activation_document',
+        null=True, blank=True
+    )
+    originator_name = models.CharField(max_length=250, verbose_name=_('Originator name'), null=True, blank=True)
+    originator_title = models.CharField(max_length=250, verbose_name=_('Originator title'), null=True, blank=True)
+    originator_email = models.CharField(max_length=250, verbose_name=_('Originator email'), null=True, blank=True)
+    nsc_name_operational = models.CharField(max_length=250, verbose_name=_('National Society Contact (Operational)'), null=True, blank=True)
+    nsc_title_operational = models.CharField(max_length=250, verbose_name=_('National Society Contact (Operational)'), null=True, blank=True)
+    nsc_email_operational = models.CharField(max_length=250, verbose_name=_('National Society Contact (Operational)'), null=True, blank=True)
+    nsc_name_secretary = models.CharField(max_length=250, verbose_name=_('National Society Contact (Secretary)'), null=True, blank=True)
+    nsc_title_secretary = models.CharField(max_length=250, verbose_name=_('National Society Contact (Secretary)'), null=True, blank=True)
+    nsc_email_secretary = models.CharField(max_length=250, verbose_name=_('National Society Contact (Secretary)'), null=True, blank=True)
+    ifrc_focal_name = models.CharField(max_length=250, verbose_name=_('IFRC Focal Point Name'), null=True, blank=True)
+    ifrc_focal_title = models.CharField(max_length=250, verbose_name=_('IFRC Focal Point Title'), null=True, blank=True)
+    ifrc_focal_email = models.CharField(max_length=250, verbose_name=_('IFRC Focal Point Email'), null=True, blank=True)

eap/serializers.py

@@ -20,6 +20,7 @@
     EarlyActionIndicator,
     EAPDocument,
     PrioritizedRisk,
+    EAPActivation,
 )
 
 from main.writable_nested_serializers import (
@@ -136,3 +137,14 @@ def update(self, instance, validated_data):
         eap = super().update(instance, validated_data)
         return eap
 
+
+class EAPActivationSerializer(serializers.ModelSerializer):
+    document_detail = EAPDocumentSerializer(source='document', read_only=True)
+
+    class Meta:
+        model = EAPActivation
+        exclude = ('eap', 'field_report')
+
+    def update(self, instance, validated_data):
+        eap_activation = super().update(instance, validated_data)
+        return eap_activation