Fix error for districs_details, indicator_display, document_details for

EAP

Author: Rup-Narayan-Rajbanshi

eap/admin.py

@@ -7,6 +7,8 @@
     EAPPartner,
     EAPReference,
     EAPDocument,
+    EAPActivation,
+    EAPActivationReport,
 )
 
 
@@ -31,3 +33,13 @@ class EAPAdmin(admin.ModelAdmin):
     list_display = ('eap_number', 'country', 'status', 'operational_timeframe',)
     inlines = [ReferenceAdminInline, PartnerAdminInline]
     autocomplete_fields = ('country', 'districts', 'disaster_type', 'created_by', 'modified_by')
+
+
+@admin.register(EAPActivation)
+class EAPActivation(admin.ModelAdmin):
+    model = EAPActivation
+
+
+@admin.register(EAPActivationReport)
+class EAPActivationReport(admin.ModelAdmin):
+    model = EAPActivationReport

eap/factories.py

@@ -8,7 +8,6 @@
 from api.factories import (
     disaster_type,
     country,
-    district,
     field_report,
 )
 
@@ -36,7 +35,6 @@ class EAPFactory(factory.django.DjangoModelFactory):
     class Meta:
         model = EAP
 
-    # districts = factory.SubFactory(district.DistrictFactory)
     country = factory.SubFactory(country.CountryFactory)
     disaster_type = factory.SubFactory(disaster_type.DisasterTypeFactory)
     eap_number = fuzzy.FuzzyText(length=20)
@@ -118,3 +116,5 @@ def documents(self, create, extracted, **kwargs):
                 self.documents.add(document)
 
 
+
+

eap/migrations/0008_auto_20220804_0505.py

@@ -0,0 +1,19 @@
+# Generated by Django 2.2.28 on 2022-08-04 05:05
+
+from django.db import migrations, models
+import eap.models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('eap', '0007_auto_20220803_0936'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='earlyactionindicator',
+            name='indicator',
+            field=models.CharField(blank=True, choices=[('indicator_1', 'Indicator 1'), ('indicator_2', 'Indicator 2')], default=eap.models.EarlyActionIndicator.IndicatorChoices('indicator_1'), max_length=255, null=True),
+        ),
+    ]

eap/models.py

@@ -17,7 +17,7 @@ class IndicatorChoices(TextChoices):  # TODO these indicator are yet to be provi
         INDICATOR_2 = 'indicator_2', _('Indicator 2')
 
     indicator = models.CharField(
-        IndicatorChoices.choices, max_length=255,
+        max_length=255, choices=IndicatorChoices.choices,
         default=IndicatorChoices.INDICATOR_1, null=True, blank=True
     )
     indicator_value = models.IntegerField(null=True, blank=True)

eap/serializers.py

@@ -47,10 +47,16 @@ class Meta:
 
 class EarlyActionIndicatorSerializer(serializers.ModelSerializer):
     indicator_display = serializers.CharField(source='get_indicator_display', read_only=True)
+    # indicator_display = serializers.SerializerMethodField('get_indicator_display')
 
     class Meta:
         model = EarlyActionIndicator
-        fields = ('__all__')
+        fields = '__all__'
+        # exclude = ('indicator_value',)
+
+    # @staticmethod
+    # def get_indicator_display(obj):
+    #     return obj.indicator
 
 
 class ActionSerializer(serializers.ModelSerializer):
@@ -109,14 +115,14 @@ class EAPSerializer(
     serializers.ModelSerializer
 ):
     country_details = CountrySerializer(source='country', read_only=True)
-    district_details = MiniDistrictSerializer(source='district', read_only=True)
+    districts_details = MiniDistrictSerializer(source='districts', many=True, read_only=True)
     references = EAPReferenceSerializer(source='eap_reference', many=True, required=False)
     partners = EAPPartnerSerializer(source='eap_partner', many=True, required=False)
     early_actions = EarlyActionSerializer(many=True)
     created_by_details = UserNameSerializer(source='created_by', read_only=True)
     modified_by_details = UserNameSerializer(source='modified_by', read_only=True)
     hazard_type_details = DisasterTypeSerializer(source='disaster_type', read_only=True)
-    document_details = EAPDocumentSerializer(source='document', read_only=True, required=False)
+    documents_details = EAPDocumentSerializer(source='documents', many=True, read_only=True, required=False)
     status_display = serializers.CharField(source='get_status_display', read_only=True)
 
     class Meta:
@@ -187,7 +193,7 @@ class EAPActivationReportSerializer(
     operational_plans = OperationalPlanSerializer(many=True)
     created_by_details = UserNameSerializer(source='created_by', read_only=True)
     modified_by_details = UserNameSerializer(source='modified_by', read_only=True)
-    document_details = EAPDocumentSerializer(source='document', read_only=True, many=True, required=False)
+    document_details = EAPDocumentSerializer(source='documents', read_only=True, many=True, required=False)
     ifrc_financial_report_details = EAPDocumentSerializer(source='ifrc_financial_report', read_only=True)
 
     class Meta:

eap/test_views.py

@@ -292,7 +292,7 @@ def test_create_and_update_eap_activation_report(self):
         # create eap_report
         with self.capture_on_commit_callbacks(execute=True):
             final_report_resp = self.client.post(
-                '/api/v2/eap_activation_report/',
+                '/api/v2/eap-activation-report/',
                 self.eap_act_report_body,
                 format='json'
             ).json()
@@ -341,7 +341,7 @@ def test_create_and_update_eap_activation_report(self):
         ]
         with self.capture_on_commit_callbacks(execute=True):
             final_report_updated_resp = self.client.put(
-                f'/api/v2/eap_activation_report/{created.id}/',
+                f'/api/v2/eap-activation-report/{created.id}/',
                 data,
                 format='json'
             ).json()

main/urls.py

@@ -150,7 +150,7 @@
 router.register(r'share-flash-update', flash_views.ShareFlashUpdateViewSet, basename='share_flash_update')
 
 router.register(r'eap', eap_views.EAPViewSet, basename='eap')
-router.register(r'eap_activation_report', eap_views.EAPActivationReportViewSet, basename='eap-activation-report')
+router.register(r'eap-activation-report', eap_views.EAPActivationReportViewSet, basename='eap-activation-report')
 router.register(r'eap-file', eap_views.EAPDocumentViewSet, basename='eap_file')
 
 # Dref apis