OpenConceptLab/ocl_issues#2252 | repo/collections/sources facets to include retired facet

Author: snyaggarwal

core/collections/documents.py

@@ -35,13 +35,13 @@ class Index:
     custom_validation_schema = fields.KeywordField(attr='custom_validation_schema', normalizer='lowercase')
     created_by = fields.KeywordField()
     repo_type = fields.KeywordField()
+    retired = fields.KeywordField(attr='retired')
 
     class Django:
         model = Collection
         fields = [
             'full_name',
             'revision_date',
-            'retired',
             'experimental',
             'locked_date',
             'external_id',

core/collections/models.py

@@ -59,6 +59,7 @@ class Collection(DirtyFieldsMixin, ConceptContainerModel):
         'canonical_url': {'sortable': False, 'filterable': True, 'exact': True},
         'experimental': {'sortable': False, 'filterable': False, 'facet': False},
         'external_id': {'sortable': False, 'filterable': True, 'facet': False, 'exact': True},
+        'retired': {'sortable': False, 'filterable': True, 'facet': True},
     }
 
     class Meta:

core/collections/search.py

@@ -22,4 +22,5 @@ class CollectionFacetedSearch(CustomESFacetedSearch):
         'version': TermsFacet(field='version', size=FACET_SIZE),
         'customValidationSchema': TermsFacet(field='custom_validation_schema'),
         'updatedBy': TermsFacet(field='updated_by', size=FACET_SIZE),
+        'retired': TermsFacet(field='retired'),
     }

core/repos/search.py

@@ -26,5 +26,6 @@ class RepoFacetedSearch(CustomESFacetedSearch):
         'locale': TermsFacet(field='locale', size=FACET_SIZE),
         'owner': TermsFacet(field='owner', size=FACET_SIZE),
         'ownerType': TermsFacet(field='owner_type'),
-        'repoType': TermsFacet(field='repo_type')
+        'repoType': TermsFacet(field='repo_type'),
+        'retired': TermsFacet(field='retired')
     }

core/repos/views.py

@@ -101,6 +101,11 @@
         'facet': False,
         'exact': True
     },
+    'retired': {
+        'sortable': False,
+        'filterable': True,
+        'facet': True
+    },
 }
 
 

core/sources/documents.py

@@ -40,13 +40,13 @@ class Index:
     filter_codes = fields.ListField(fields.KeywordField())
     match_algorithm = fields.ListField(fields.KeywordField())
     repo_type = fields.KeywordField()
+    retired = fields.KeywordField(attr='retired')
 
     class Django:
         model = Source
         fields = [
             'full_name',
             'revision_date',
-            'retired',
             'experimental',
             'case_sensitive',
             'compositional',

core/sources/models.py

@@ -49,6 +49,7 @@ class Source(DirtyFieldsMixin, ConceptContainerModel):
         'hierarchy_meaning': {'sortable': False, 'filterable': True, 'facet': True},
         'external_id': {'sortable': False, 'filterable': True, 'facet': False, 'exact': True},
         'match_algorithm': {'sortable': False, 'filterable': True, 'facet': True, 'exact': False},
+        'retired': {'sortable': False, 'filterable': True, 'facet': True},
     }
 
     class Meta:

core/sources/search.py

@@ -28,4 +28,5 @@ class SourceFacetedSearch(CustomESFacetedSearch):
         'hierarchyMeaning': TermsFacet(field='hierarchy_meaning', size=FACET_SIZE),
         'updatedBy': TermsFacet(field='updated_by', size=FACET_SIZE),
         'matchAlgorithm': TermsFacet(field='match_algorithm', size=FACET_SIZE),
+        'retired': TermsFacet(field='retired'),
     }