Cascade the model changes to the admin and related parts see HEA-874

Author: girumb

apps/baseline/serializers.py

@@ -438,7 +438,11 @@ def get_characteristic_group(self, obj):
         """
         if obj.product and obj.product.cpc.startswith("L02"):
             return "Livestock"
-        return obj.wealth_characteristic.characteristic_group
+        return (
+            obj.wealth_characteristic.characteristic_group.code
+            if obj.wealth_characteristic.characteristic_group
+            else None
+        )
 
     product_common_name = serializers.CharField(source="product.common_name", read_only=True, allow_null=True)
     unit_of_measure_description = serializers.CharField(
@@ -542,7 +546,11 @@ def get_characteristic_group(self, obj):
         """
         if obj.product and obj.product.cpc.startswith("L02"):
             return "Livestock"
-        return obj.wealth_characteristic.characteristic_group
+        return (
+            obj.wealth_characteristic.characteristic_group.code
+            if obj.wealth_characteristic.characteristic_group
+            else None
+        )
 
     product_common_name = serializers.CharField(source="product.common_name", read_only=True, allow_null=True)
     unit_of_measure_description = serializers.CharField(

apps/baseline/tests/test_viewsets.py

@@ -19,6 +19,7 @@
 from common.tests.factories import ClassifiedProductFactory, CountryFactory
 from metadata.models import LivelihoodActivityScenario
 from metadata.tests.factories import (
+    CharacteristicGroupFactory,
     LivelihoodCategoryFactory,
     WealthCharacteristicFactory,
     WealthGroupCategoryFactory,
@@ -1499,11 +1500,13 @@ def setUpTestData(cls):
             wealth_group_category=cls.very_poor_wg,
             community=cls.community,
         )
+        # Create characteristic group
+        cls.population_group = CharacteristicGroupFactory(code="Population", name_en="Population")
         # Create wealth characteristics
         cls.char_with_group = WealthCharacteristicFactory(
             code="household size",
             name_en="Household size",
-            characteristic_group="Population",
+            characteristic_group=cls.population_group,
         )
         cls.char_without_group = WealthCharacteristicFactory(
             code="other",

apps/metadata/admin.py

@@ -6,6 +6,7 @@
 
 from .models import (
     ActivityLabel,
+    CharacteristicGroup,
     HazardCategory,
     LivelihoodCategory,
     Market,
@@ -85,6 +86,12 @@ class WealthGroupCategoryAdmin(ReferenceDataAdmin):
     """
 
 
+class CharacteristicGroupAdmin(ReferenceDataAdmin):
+    """
+    A concrete admin for CharacteristicGroup
+    """
+
+
 class WealthCharacteristicAdmin(ReferenceDataAdmin):
     """
     A concrete admin for WealthCharacteristic
@@ -98,7 +105,7 @@ class WealthCharacteristicAdmin(ReferenceDataAdmin):
         *translation_fields("description"),
         "characteristic_group",
     )
-    list_filter = ("variable_type",)
+    list_filter = ("variable_type", "characteristic_group")
 
 
 class HazardCategoryAdmin(ReferenceDataAdmin):
@@ -226,6 +233,7 @@ class WealthCharacteristicLabelAdmin(admin.ModelAdmin):
 
 admin.site.register(LivelihoodCategory, LivelihoodCategoryAdmin)
 admin.site.register(WealthGroupCategory, WealthGroupCategoryAdmin)
+admin.site.register(CharacteristicGroup, CharacteristicGroupAdmin)
 admin.site.register(SeasonalActivityType, SeasonalActivityTypeAdmin)
 
 admin.site.register(Market, MarketAdmin)

apps/metadata/tests/factories.py

@@ -1,7 +1,13 @@
 import factory
 
 from common.tests.factories import CountryFactory
-from metadata.models import Market, Season, SeasonalActivityType, WealthCharacteristic
+from metadata.models import (
+    CharacteristicGroup,
+    Market,
+    Season,
+    SeasonalActivityType,
+    WealthCharacteristic,
+)
 
 
 class LivelihoodCategoryFactory(factory.django.DjangoModelFactory):
@@ -58,6 +64,24 @@ class Meta:
     description_fr = factory.LazyAttribute(lambda o: f"{o.name_fr} Wealth Group Category Description fr")
 
 
+class CharacteristicGroupFactory(factory.django.DjangoModelFactory):
+    class Meta:
+        model = CharacteristicGroup
+        django_get_or_create = ("code",)
+
+    code = factory.Iterator(["Population", "Income", "Land", "Livestock", "Other assets"])
+    name_en = factory.LazyAttribute(lambda o: f"{o.code}")
+    name_pt = factory.LazyAttribute(lambda o: f"{o.code} pt")
+    name_es = factory.LazyAttribute(lambda o: f"{o.code} es")
+    name_fr = factory.LazyAttribute(lambda o: f"{o.code} fr")
+    name_ar = factory.LazyAttribute(lambda o: f"{o.code} ar")
+    description_en = factory.LazyAttribute(lambda o: f"{o.code} Description en")
+    description_pt = factory.LazyAttribute(lambda o: f"{o.code} Description pt")
+    description_es = factory.LazyAttribute(lambda o: f"{o.code} Description es")
+    description_ar = factory.LazyAttribute(lambda o: f"{o.code} Description ar")
+    description_fr = factory.LazyAttribute(lambda o: f"{o.code} Description fr")
+
+
 class WealthCharacteristicFactory(factory.django.DjangoModelFactory):
     class Meta:
         model = "metadata.WealthCharacteristic"
@@ -73,6 +97,7 @@ class Meta:
     )
     has_product = factory.Iterator([False, True])
     has_unit_of_measure = factory.Iterator([False, True])
+    characteristic_group = factory.SubFactory(CharacteristicGroupFactory)
     name_en = factory.LazyAttribute(lambda o: f"{o.code} Wealth Characteristic en")
     name_pt = factory.LazyAttribute(lambda o: f"{o.code} Wealth Characteristic pt")
     name_es = factory.LazyAttribute(lambda o: f"{o.code} Wealth Characteristic es")

templates/admin/index.html

@@ -331,6 +331,12 @@
                                 <a href="{% url 'admin:metadata_wealthgroupcategory_changelist' %}">{% translate 'Wealth Categories' %}</a>
                             </div>
                     </div>
+                     <div class="card">
+                            <div class="card-body">
+                                <a href="{% url 'admin:metadata_characteristicgroup_changelist' %}">{% translate 'Characteristics Groups' %}</a>
+                            </div>
+                    </div>
+
                         <div class="card">
                             <div class="card-body">
                                 <a href="{% url 'admin:metadata_wealthcharacteristic_changelist' %}">{% translate 'Wealth Group Characteristics' %}</a>

templates/admin/nav_sidebar.html

@@ -286,6 +286,9 @@
                             <li><a class="link-dark rounded"
                                    href="{% url 'admin:metadata_wealthgroupcategory_changelist' %}">{% translate 'Wealth Categories' %}</a>
                             </li>
+                            <li><a class="link-dark rounded"
+                                   href="{% url 'admin:metadata_characteristicgroup_changelist' %}">{% translate 'Characteristics Groups' %}</a>
+                            </li>
                             <li><a class="link-dark rounded"
                                    href="{% url 'admin:metadata_wealthcharacteristic_changelist' %}">{% translate 'Wealth Group Characteristics' %}</a>
                             </li>