Merge pull request #2432 from IFRCGo/feature/new-country-plan

Use country_plan document_url if given, else file

Author: szabozoltan69

Population.GO.Admin1.Matched.xlsx

@@ -103,10 +103,18 @@ def load_for_country(self, country_data: dict, file_field: str, field_inserted_d
             file_field,
         )
         country_plan.is_publish = True
+        if "public" in file_field:
+            country_plan.public_plan_url = plan_url.replace(" ", "%20")
+            # Maybe urllib.parse.urlencode would be more general
+            url_field = "public_plan_url"
+        else:
+            country_plan.internal_plan_url = plan_url.replace(" ", "%20")
+            url_field = "internal_plan_url"
         country_plan.save(
             update_fields=(
                 field_inserted_date_field,
                 file_field,  # By load_file_to_country_plan
+                url_field,
                 "is_publish",
             )
         )

country_plan/management/commands/ingest_country_plan_file.py

@@ -0,0 +1,23 @@
+# Generated by Django 4.2.19 on 2025-03-03 16:01
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("country_plan", "0008_alter_countryplan_internal_plan_file"),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name="countryplan",
+            name="internal_plan_url",
+            field=models.URLField(blank=True, null=True, verbose_name="internal_plan_url"),
+        ),
+        migrations.AddField(
+            model_name="countryplan",
+            name="public_plan_url",
+            field=models.URLField(blank=True, null=True, verbose_name="public_plan_url"),
+        ),
+    ]

country_plan/migrations/0009_countryplan_internal_plan_url_and_more.py

@@ -71,13 +71,15 @@ class CountryPlan(CountryPlanAbstract):
         blank=True,
         null=True,
     )
+    internal_plan_url = models.URLField(verbose_name=_("internal_plan_url"), blank=True, null=True)
     public_plan_file = models.FileField(
         verbose_name=_("Country Plan"),
         validators=[FileExtensionValidator(["pdf"])],
         upload_to=pdf_upload_to,
         blank=True,
         null=True,
     )
+    public_plan_url = models.URLField(verbose_name=_("public_plan_url"), blank=True, null=True)
     requested_amount = models.FloatField(verbose_name=_("Requested Amount"), blank=True, null=True)
     people_targeted = models.IntegerField(verbose_name=_("People Targeted"), blank=True, null=True)
     is_publish = models.BooleanField(default=False, verbose_name=_("Published"))

country_plan/models.py

@@ -43,6 +43,7 @@ class CountryPlanSerializer(serializers.ModelSerializer):
     strategic_priorities = StrategicPrioritySerializer(source="country_plan_sp", many=True, read_only=True)
     membership_coordinations = MembershipCoordinationSerializer(source="full_country_plan_mc", many=True, read_only=True)
     internal_plan_file = serializers.SerializerMethodField()
+    public_plan_file = serializers.SerializerMethodField()
 
     class Meta:
         model = CountryPlan
@@ -61,7 +62,18 @@ class Meta:
     def get_internal_plan_file(self, obj):
         file = obj.internal_plan_file
         request = self.context["request"]
-        if request.user.is_authenticated and file.name:
+        if request.user.is_authenticated:
+            if obj.internal_plan_url:
+                return obj.internal_plan_url
+            elif file.name:
+                return request.build_absolute_uri(serializers.FileField().to_representation(file))
+
+    def get_public_plan_file(self, obj):
+        file = obj.public_plan_file
+        request = self.context["request"]
+        if obj.public_plan_url:
+            return obj.public_plan_url
+        elif file.name:
             return request.build_absolute_uri(serializers.FileField().to_representation(file))
 
     def validate_internal_plan_file(self, internal_plan_file):