Revert "OpenConceptLab/ocl_issues#1035 Slow concepts and mappings select (partial index)"

This reverts commit 53b5db8.

Author: rkorytkowski

core/concepts/migrations/0022_auto_20211012_1142.py

@@ -2,7 +2,7 @@
 from django.core.exceptions import ValidationError
 from django.core.validators import RegexValidator
 from django.db import models, IntegrityError, transaction, connection
-from django.db.models import F, Q
+from django.db.models import F
 from pydash import get, compact
 
 from core.common.constants import ISO_639_1, INCLUDE_RETIRED_PARAM, LATEST, HEAD
@@ -143,9 +143,7 @@ class Meta:
         db_table = 'concepts'
         unique_together = ('mnemonic', 'version', 'parent')
         indexes = [
-                      models.Index(name="concepts_updated_at_public", fields=['-updated_at'],
-                                   condition=(Q('is_active') & Q('-retired') & Q('is_latest_version') &
-                                              ~Q(public_access='None'))),
+            models.Index(fields=['is_active', 'retired', 'is_latest_version', 'public_access', '-updated_at']),
         ] + VersionedModel.Meta.indexes
 
     external_id = models.TextField(null=True, blank=True)

core/concepts/models.py

@@ -3,7 +3,6 @@
 from django.core.exceptions import ValidationError
 from django.core.validators import RegexValidator
 from django.db import models, IntegrityError, transaction
-from django.db.models import Q
 from pydash import get, compact
 
 from core.common.constants import INCLUDE_RETIRED_PARAM, NAMESPACE_REGEX, HEAD, LATEST
@@ -22,9 +21,7 @@ class Meta:
         db_table = 'mappings'
         unique_together = ('mnemonic', 'version', 'parent')
         indexes = [
-                      models.Index(name="mappings_updated_at_public", fields=['-updated_at'],
-                                   condition=(Q('is_active') & Q('-retired') & Q('is_latest_version') &
-                                              ~Q(public_access='None'))),
+            models.Index(fields=['is_active', 'retired', 'is_latest_version', 'public_access', '-updated_at']),
         ] + VersionedModel.Meta.indexes
 
     parent = models.ForeignKey('sources.Source', related_name='mappings_set', on_delete=models.CASCADE)