Merge branch 'main' into HEA-141/add-translated-fields

# Conflicts:
#	apps/baseline/admin.py

apps/baseline/admin.py

@@ -504,6 +504,7 @@ class SeasonalActivityAdmin(admin.ModelAdmin):
         "seasonal_activity_type",
         "season",
         "product",
+        "additional_identifier",
     )
     list_display = (
         "livelihood_zone_baseline",
@@ -514,6 +515,7 @@ class SeasonalActivityAdmin(admin.ModelAdmin):
         "seasonal_activity_type",
         "season",
         "product",
+        "additional_identifier",
     )
     list_filter = (
         "livelihood_zone_baseline__livelihood_zone",
@@ -534,6 +536,7 @@ class SeasonalActivityOccurrenceAdmin(admin.ModelAdmin):
         "seasonal_activity__seasonal_activity_type",
         "seasonal_activity__season",
         "seasonal_activity__product",
+        "seasonal_activity__additional_identifier",
     )
     list_filter = (
         "community",

apps/baseline/migrations/0005_seasonalactivity_additional_identifier.py

@@ -0,0 +1,23 @@
+# Generated by Django 4.2.7 on 2024-01-02 23:07
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("baseline", "0004_add_translation_fields"),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name="seasonalactivity",
+            name="additional_identifier",
+            field=models.CharField(
+                blank=True,
+                help_text="Additional text identifying the seasonal activity",
+                max_length=60,
+                verbose_name="Additional Identifier",
+            ),
+        ),
+    ]

apps/baseline/models.py

@@ -1600,6 +1600,12 @@ class SeasonalActivity(common_models.Model):
         help_text=_("Product, e.g. full fat milk"),
         related_name="baseline_seasonal_activities",
     )
+    additional_identifier = models.CharField(
+        max_length=60,
+        blank=True,
+        verbose_name=_("Additional Identifier"),
+        help_text=_("Additional text identifying the seasonal activity"),
+    )
 
     class Meta:
         verbose_name = _("Seasonal Activity")

apps/baseline/serializers.py

@@ -683,6 +683,7 @@ class Meta:
             "product",
             "product_common_name",
             "product_description",
+            "additional_identifier",
         ]
 
     livelihood_zone_name = serializers.CharField(
@@ -703,6 +704,7 @@ class Meta:
     )
     activity_category = serializers.CharField(source="seasonal_activity_type.activity_category", read_only=True)
     activity_category_label = serializers.SerializerMethodField()
+    additional_identifier = serializers.CharField(read_only=True)
 
     def get_activity_category_label(self, obj):
         return obj.seasonal_activity_type.get_activity_category_display()
@@ -742,6 +744,7 @@ class Meta:
             "product",
             "product_common_name",
             "product_description",
+            "additional_identifier",
             # End SeasonalActivity
             "community",
             "community_name",
@@ -774,6 +777,7 @@ def get_livelihood_zone_baseline_label(self, obj):
     product = serializers.CharField(source="seasonal_activity.product.pk", read_only=True)
     product_common_name = serializers.CharField(source="seasonal_activity.product.common_name", read_only=True)
     product_description = serializers.CharField(source="seasonal_activity.product.description", read_only=True)
+    additional_identifier = serializers.CharField(source="seasonal_activity.additional_identifier", read_only=True)
     seasonal_activity_type = serializers.CharField(
         source="seasonal_activity.seasonal_activity_type.pk", read_only=True
     )

apps/baseline/tests/factories.py

@@ -558,6 +558,7 @@ class Meta:
     livelihood_zone_baseline = factory.SubFactory(LivelihoodZoneBaselineFactory)
     seasonal_activity_type = factory.SubFactory(SeasonalActivityTypeFactory)
     product = factory.SubFactory(ClassifiedProductFactory)
+    additional_identifier = factory.Sequence(lambda n: f"additional_identifier {n}")
 
     @factory.post_generation
     def seasons(self, create, extracted, **kwargs):

apps/baseline/tests/test_viewsets.py

@@ -3748,6 +3748,7 @@ def test_get_record(self):
             "product",
             "product_common_name",
             "product_description",
+            "additional_identifier",
         )
         self.assertCountEqual(
             response.json().keys(),
@@ -3845,6 +3846,7 @@ def test_get_record(self):
             "product",
             "product_common_name",
             "product_description",
+            "additional_identifier",
             "community",
             "community_name",
             "start",