Add support for non-pk IDs to get_qualified_id

The `CustomQuerySetIndex` `get_qualified_id` method now takes the full
record object to help formulate the ID, rather than assuming it's the
record PK. This adds support for using alternative fields as IDs (in
Solr) on subclasses; they can override that method to provide a
different ID. Fixtures in the main conftest.py file have been updated as
well to utilize `get_qualified_id` rather than putting together the ID
manually. (I think this was always my intention, but I forgot to
implement it.)

Author: jthomale

django/sierra/base/search_indexes.py

@@ -98,8 +98,8 @@ def __init__(self, queryset=None, using=None):
     def get_django_ct(self):
         return utils.get_model_ct(self.get_model())
 
-    def get_qualified_id(self, _id):
-        return '{}.{}'.format(self.get_django_ct(), _id)
+    def get_qualified_id(self, record):
+        return '{}.{}'.format(self.get_django_ct(), record.pk)
 
     def get_backend(self, using=None):
         using = using or self.using
@@ -163,7 +163,7 @@ def delete(self, using=None, commit=True, queryset=None):
         backend = self.get_backend(using)
         queryset = self.index_queryset() if queryset is None else queryset
         if backend is not None:
-            ids_to_delete = [self.get_qualified_id(r.pk) for r in queryset]
+            ids_to_delete = [self.get_qualified_id(r) for r in queryset]
             backend.conn.delete(id=ids_to_delete, commit=commit)
 
     def clear(self, using=None, commit=True):

django/sierra/conftest.py

@@ -566,15 +566,13 @@ def get_records_from_index(solr_conns, solr_search):
     """
     def _get_records_from_index(index, record_set, results=None):
         id_fname = index.reserved_fields['haystack_id']
-        meta = index.get_model()._meta
         if results is None:
             conn = solr_conns[getattr(index, 'using', 'default')]
             results = solr_search(conn, '*')
 
         found_records = {}
         for record in record_set:
-            cmp_id = '{}.{}.{}'.format(meta.app_label, meta.model_name,
-                                       record.pk)
+            cmp_id = index.get_qualified_id(record)
             matches = [r for r in results if r[id_fname] == cmp_id]
             if len(matches) == 1:
                 found_records[record.pk] = matches[0]