Merge pull request #287 from American-Institutes-for-Research/HEA-878/add_characteristic_group_ordering_to_CharacteristicValue_apis

Hea 878/add characteristic group ordering to characteristic value apis

Author: rhunwicks

apps/baseline/serializers.py

@@ -396,6 +396,7 @@ class Meta:
             "wealth_characteristic_ordering",
             "variable_type",
             "characteristic_group",
+            "characteristic_group_ordering",
             "product",
             "product_common_name",
             "unit_of_measure",
@@ -460,6 +461,9 @@ def get_wealth_group_label(self, obj):
         source="wealth_group.community.livelihood_zone_baseline.source_organization.name", read_only=True
     )
     characteristic_group = serializers.SerializerMethodField()
+    characteristic_group_ordering = serializers.IntegerField(
+        source="wealth_characteristic.characteristic_group.ordering", read_only=True
+    )
 
     def get_characteristic_group(self, obj):
         """
@@ -507,6 +511,7 @@ class Meta:
             "wealth_characteristic_ordering",
             "variable_type",
             "characteristic_group",
+            "characteristic_group_ordering",
             "product",
             "product_common_name",
             "unit_of_measure",
@@ -568,6 +573,9 @@ def get_wealth_group_label(self, obj):
         source="wealth_group.livelihood_zone_baseline.source_organization.name", read_only=True
     )
     characteristic_group = serializers.SerializerMethodField()
+    characteristic_group_ordering = serializers.IntegerField(
+        source="wealth_characteristic.characteristic_group.ordering", read_only=True
+    )
 
     def get_characteristic_group(self, obj):
         """

apps/baseline/tests/test_viewsets.py

@@ -1596,6 +1596,7 @@ def test_get_record(self):
             "wealth_characteristic_ordering",
             "variable_type",
             "characteristic_group",
+            "characteristic_group_ordering",
             "product",
             "product_common_name",
             "unit_of_measure",
@@ -1889,6 +1890,7 @@ def test_response_fields(self):
                 "wealth_characteristic_ordering",
                 "variable_type",
                 "characteristic_group",
+                "characteristic_group_ordering",
                 "product",
                 "product_common_name",
                 "unit_of_measure",

apps/baseline/viewsets.py

@@ -672,6 +672,7 @@ class WealthGroupCharacteristicValueViewSet(BaseModelViewSet):
         "wealth_group__community__livelihood_zone_baseline__reference_year_end_date",
         "wealth_group__wealth_group_category__ordering",
         "wealth_group__community__name",
+        "wealth_characteristic__characteristic_group__ordering",
         "wealth_characteristic__ordering",
         "product",
         "wealth_characteristic__code",
@@ -776,6 +777,7 @@ class BaselineWealthGroupCharacteristicValueViewSet(BaseModelViewSet):
         "wealth_group__livelihood_zone_baseline__livelihood_zone__code",
         "wealth_group__livelihood_zone_baseline__reference_year_end_date",
         "wealth_group__wealth_group_category__ordering",
+        "wealth_characteristic__characteristic_group__ordering",
         "wealth_characteristic__ordering",
         "product",
         "wealth_characteristic__code",
@@ -885,6 +887,7 @@ class CommunityWealthGroupCharacteristicValueViewSet(BaseModelViewSet):
         "wealth_group__community__livelihood_zone_baseline__reference_year_end_date",
         "wealth_group__wealth_group_category__ordering",
         "wealth_group__community__name",
+        "wealth_characteristic__characteristic_group__ordering",
         "wealth_characteristic__ordering",
         "product",
         "wealth_characteristic__code",

apps/metadata/serializers.py

@@ -39,11 +39,15 @@ class WealthCharacteristicSerializer(ReferenceDataSerializer):
     """
 
     variable_type = serializers.CharField()
+    characteristic_group = serializers.CharField(source="characteristic_group.name", read_only=True)
+    characteristic_group_ordering = serializers.IntegerField(source="characteristic_group.ordering", read_only=True)
 
     class Meta(ReferenceDataSerializer.Meta):
         model = WealthCharacteristic
         fields = ReferenceDataSerializer.Meta.fields + [
             "variable_type",
+            "characteristic_group",
+            "characteristic_group_ordering",
         ]