Standardize wealth_group_category and wealth_group_category_name - see HEA-659

Author: rhunwicks

apps/baseline/models.py

@@ -554,6 +554,12 @@ def natural_key(self):
     class Meta:
         verbose_name = _("Wealth Group")
         verbose_name_plural = _("Wealth Groups")
+        ordering = [
+            "livelihood_zone_baseline__livelihood_zone__code",
+            "livelihood_zone_baseline__reference_year_end_date",
+            "wealth_group_category__ordering",
+            "community__name",
+        ]
         constraints = [
             models.UniqueConstraint(
                 fields=("livelihood_zone_baseline", "wealth_group_category", "community"),

apps/baseline/serializers.py

@@ -270,6 +270,7 @@ class Meta:
             "community",
             "community_name",
             "wealth_group_category",
+            "wealth_group_category_name",
             "percentage_of_households",
             "average_household_size",
         ]
@@ -296,6 +297,7 @@ def get_livelihood_zone_baseline_label(self, obj):
     source_organization_name = serializers.CharField(
         source="livelihood_zone_baseline.source_organization.name", read_only=True
     )
+    wealth_group_category_name = serializers.CharField(source="wealth_group_category.name", read_only=True)
 
 
 class BaselineWealthGroupSerializer(WealthGroupSerializer):
@@ -1554,7 +1556,8 @@ class Meta:
             "id",
             "name",
             "description",
-            "wealth_group_category_code",
+            "wealth_group_category",
+            "wealth_group_category_name",
             "main_livelihood_category",
             "bss",
             "currency",
@@ -1601,7 +1604,8 @@ def field_to_database_path(field_name):
             "valid_to_date": "valid_to_date",
             "livelihood_strategy_pk": "livelihood_strategies__pk",
             "livelihood_activity_pk": "livelihood_strategies__livelihoodactivity__pk",
-            "wealth_group_category_code": "livelihood_strategies__livelihoodactivity__wealth_group__wealth_group_category__code",  # NOQA: E501
+            "wealth_group_category": "livelihood_strategies__livelihoodactivity__wealth_group__wealth_group_category__code",  # NOQA: E501
+            "wealth_group_category_name": f"livelihood_strategies__livelihoodactivity__wealth_group__wealth_group_category__name_{language_code}",  # NOQA: E501
             "kcals_consumed": "livelihood_strategies__livelihoodactivity__kcals_consumed",
             "income": "livelihood_strategies__livelihoodactivity__income",
             "expenditure": "livelihood_strategies__livelihoodactivity__expenditure",

apps/baseline/viewsets.py

@@ -370,6 +370,12 @@ class WealthGroupViewSet(BaseModelViewSet):
     )
     serializer_class = WealthGroupSerializer
     filterset_class = WealthGroupFilterSet
+    ordering = [
+        "livelihood_zone_baseline__livelihood_zone__code",
+        "livelihood_zone_baseline__reference_year_end_date",
+        "wealth_group_category__ordering",
+        "community__name",
+    ]
 
 
 class BaselineWealthGroupFilterSet(filters.FilterSet):

apps/metadata/admin.py

@@ -23,6 +23,7 @@ class ReferenceDataAdmin(admin.ModelAdmin):
         *translation_fields("name"),
         "aliases",
         *translation_fields("description"),
+        "ordering",
     )
     list_display = (
         "code",

apps/metadata/models.py

@@ -89,6 +89,7 @@ def __str__(self):
 
     class Meta:
         abstract = True
+        ordering = ["ordering", "code"]
 
     class ExtraMeta:
         identifier = ["name_en"]