Move name from structural to reference

arkindex/documents/api/search.py

@@ -31,7 +31,7 @@ class ElementSearch(SearchAPIView):
                    query=None,
                    element_type=None,
                    transcription_type=None,
-                   structural_metadata=None,
+                   reference=None,
                    date_lt=None,
                    date_gte=None,
                    min_score=0.0):
@@ -53,10 +53,10 @@ class ElementSearch(SearchAPIView):
 
             search = search.filter('range', date_range=date_range)
 
-        if structural_metadata:
+        if reference:
             search = search.filter(
                 'wildcard',
-                structural_metadata='*{}*'.format(structural_metadata.lower())
+                references='*{}*'.format(reference.lower())
             )
 
         if element_type:

arkindex/documents/serializers/search.py

@@ -20,7 +20,7 @@ class SearchQuerySerializer(serializers.Serializer):
     score = serializers.FloatField(source='min_score', min_value=0.0, max_value=1.0, default=0.0)
     date_gte = serializers.CharField(default=None)
     date_lte = serializers.CharField(source='date_lt', default=None)
-    structural_metadata = serializers.CharField(default=None)
+    reference = serializers.CharField(default=None)
     element_type = serializers.SlugField(default=None)
     transcription_type = EnumField(enum=TranscriptionType, default=None)
     corpus = serializers.UUIDField(source='corpus_id', default=None)

arkindex/project/elastic.py

@@ -95,7 +95,7 @@ class ESElement(Document):
     corpus = Keyword()
     # Used exclusively for sorting
     parents = Keyword()
-    structural_metadata = Keyword()
+    references = Keyword()
     transcriptions = Nested(ESTranscriptionInnerDoc)
     date_range = RawDateRange(format='yyyy||yyyy-MM||yyyy-MM-dd')
 
@@ -138,9 +138,9 @@ class ESElement(Document):
                 element.name
                 for element in Element.objects.get_ascending(instance.id)
             ],
-            structural_metadata=[
+            references=[
                 md.value.lower()
-                for md in instance.metadatas.filter(type=MetaType.Structural)
+                for md in instance.metadatas.filter(type=MetaType.Reference)
             ],
             transcriptions=list(map(
                 ESTranscriptionInnerDoc.from_model,

arkindex/project/tests/test_elastic.py

@@ -38,8 +38,8 @@ class TestESDocuments(FixtureAPITestCase):
         date_range = ESElement.from_model(element).to_dict().get('date_range')
         self.assertDictEqual(date_range, {'gte': '1666-02-03', 'lt': '1666-02-03||+1d'})
 
-    def test_index_structural_metadata(self):
+    def test_index_reference_metadata(self):
         element = self.corpus.elements.get(name='Volume 1')
-        element.metadatas.create(type=MetaType.Structural, name='ref.', value='123ABC')
+        element.metadatas.create(type=MetaType.Reference, name='ref.', value='123ABC')
         es_document = ESElement.from_model(element)
-        self.assertCountEqual(es_document.structural_metadata, ['123abc'])
+        self.assertCountEqual(es_document.reference, ['123abc'])