private org/source/collection searchable for creator

OpenConceptLab · Feb 3, 2021 · 9294017 · 9294017
1 parent ad73ee5
commit 9294017
Show file tree

Hide file tree

Showing 3 changed files with 26 additions and 2 deletions.
diff --git a/core/collections/documents.py b/core/collections/documents.py
@@ -27,6 +27,7 @@ class Index:
     identifier = fields.ObjectField()
     publisher = fields.KeywordField(attr='publisher', normalizer='lowercase')
     immutable = fields.KeywordField(attr='immutable')
+    created_by = fields.KeywordField()
 
     class Django:
         model = Collection
@@ -58,3 +59,7 @@ def prepare_identifier(instance):
             value = jsonify_safe(instance.identifier)
 
         return value or {}
+
+    @staticmethod
+    def prepare_created_by(instance):
+        return instance.created_by.username
diff --git a/core/common/views.py b/core/common/views.py
@@ -309,6 +309,11 @@ def is_source_child_document_model(self):
         from core.mappings.documents import MappingDocument
         return self.document_model in [ConceptDocument, MappingDocument]
 
+    def is_concept_container_document_model(self):
+        from core.collections.documents import CollectionDocument
+        from core.sources.documents import SourceDocument
+        return self.document_model in [SourceDocument, CollectionDocument]
+
     @cached_property
     def __search_results(self):  # pylint: disable=too-many-branches
         results = None
@@ -353,8 +358,17 @@ def __search_results(self):  # pylint: disable=too-many-branches
 
             if self._should_exclude_retired_from_search_results():
                 results = results.query('match', retired=False)
-            if not self._should_include_private():
-                results = results.query('match', public_can_view=True)
+
+            include_private = self._should_include_private()
+
+            if not include_private:
+                from core.orgs.documents import OrganizationDocument
+                if self.document_model in [OrganizationDocument] and self.request.user.is_authenticated:
+                    results.query(Q('match', public_can_view=False) & Q('match', user=self.request.user.username))
+                elif self.is_concept_container_document_model() and self.request.user.is_authenticated:
+                    results.query(Q('match', public_can_view=False) & Q('match', created_by=self.request.user.username))
+                else:
+                    results = results.query('match', public_can_view=True)
 
             if self.is_owner_document_model():
                 kwargs_filters = self.kwargs

diff --git a/core/sources/documents.py b/core/sources/documents.py
@@ -28,6 +28,7 @@ class Index:
     jurisdiction = fields.ObjectField()
     publisher = fields.KeywordField(attr='publisher', normalizer='lowercase')
     content_type = fields.KeywordField(attr='content_type', normalizer='lowercase')
+    created_by = fields.KeywordField()
 
     class Django:
         model = Source
@@ -67,3 +68,7 @@ def prepare_jurisdiction(instance):
             value = jsonify_safe(instance.jurisdiction)
 
         return value or {}
+
+    @staticmethod
+    def prepare_created_by(instance):
+        return instance.created_by.username