adjustments for order_outcome and search

it's far simpler to retain the singular field name in ES, because it
cleanly supports both single and multiple fields. it's a lot more
complex to move the field.

peachjam_search/documents.py

@@ -81,11 +81,11 @@ class SearchableDocument(Document):
     registry_fr = fields.KeywordField()
     registry_pt = fields.KeywordField()
 
-    order_outcomes = fields.KeywordField(attr="order_outcome.name")
-    order_outcomes_en = fields.KeywordField()
-    order_outcomes_sw = fields.KeywordField()
-    order_outcomes_fr = fields.KeywordField()
-    order_outcomes_pt = fields.KeywordField()
+    order_outcome = fields.KeywordField()
+    order_outcome_en = fields.KeywordField()
+    order_outcome_sw = fields.KeywordField()
+    order_outcome_fr = fields.KeywordField()
+    order_outcome_pt = fields.KeywordField()
 
     # GenericDocument, LegalInstrument
     authors = fields.KeywordField()
@@ -238,22 +238,22 @@ def prepare_nature(self, instance):
         if hasattr(instance, "nature") and instance.nature:
             return instance.nature.name
 
-    def prepare_order_outcomes(self, instance):
+    def prepare_order_outcome(self, instance):
         if hasattr(instance, "order_outcomes") and instance.order_outcomes:
             return [
                 order_outcome.name for order_outcome in instance.order_outcomes.all()
             ]
 
-    def prepare_order_outcomes_en(self, instance):
+    def prepare_order_outcome_en(self, instance):
         return get_translated_m2m_name(instance, "order_outcomes", "en")
 
-    def prepare_order_outcomes_fr(self, instance):
+    def prepare_order_outcome_fr(self, instance):
         return get_translated_m2m_name(instance, "order_outcomes", "fr")
 
-    def prepare_order_outcomes_pt(self, instance):
+    def prepare_order_outcome_pt(self, instance):
         return get_translated_m2m_name(instance, "order_outcomes", "pt")
 
-    def prepare_order_outcomes_sw(self, instance):
+    def prepare_order_outcome_sw(self, instance):
         return get_translated_m2m_name(instance, "order_outcomes", "sw")
 
     def prepare_pages(self, instance):

peachjam_search/serializers.py

@@ -10,7 +10,7 @@ class SearchableDocumentSerializer(DocumentSerializer):
     pages = SerializerMethodField()
     court = SerializerMethodField()
     nature = SerializerMethodField()
-    order_outcomes = SerializerMethodField()
+    order_outcome = SerializerMethodField()
     registry = SerializerMethodField()
     labels = CharField(allow_null=True)
     _score = FloatField(source="meta.score")
@@ -72,8 +72,8 @@ def get_court(self, obj):
     def get_nature(self, obj):
         return obj["nature" + self.language_suffix]
 
-    def get_order_outcomes(self, obj):
-        return obj["order_outcomes" + self.language_suffix]
+    def get_order_outcome(self, obj):
+        return list(obj["order_outcome" + self.language_suffix])
 
     def get_registry(self, obj):
         return obj["registry" + self.language_suffix]