Skip to content

Commit dc287fc

Browse files
committed
add organization and user to related instances of dataset document
1 parent d2d3311 commit dc287fc

File tree

1 file changed

+25
-3
lines changed

1 file changed

+25
-3
lines changed

search/documents/dataset_document.py

Lines changed: 25 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,16 @@
22

33
from django_elasticsearch_dsl import Document, Index, KeywordField, fields
44

5-
from api.models import Dataset, DatasetMetadata, Metadata, Resource, Sector
5+
from api.models import (
6+
Dataset,
7+
DatasetMetadata,
8+
Metadata,
9+
Organization,
10+
Resource,
11+
Sector,
12+
)
613
from api.utils.enums import DatasetStatus
14+
from authorization.models import User
715
from DataSpace import settings
816
from search.documents.analysers import html_strip, ngram_analyser
917

@@ -164,7 +172,10 @@ def get_queryset(self) -> Any:
164172
)
165173

166174
def get_instances_from_related(
167-
self, related_instance: Union[Resource, Metadata, DatasetMetadata, Sector]
175+
self,
176+
related_instance: Union[
177+
Resource, Metadata, DatasetMetadata, Sector, Organization, User
178+
],
168179
) -> Optional[Union[Dataset, List[Dataset]]]:
169180
"""Get Dataset instances from related models."""
170181
if isinstance(related_instance, Resource):
@@ -176,6 +187,10 @@ def get_instances_from_related(
176187
return related_instance.dataset
177188
elif isinstance(related_instance, Sector):
178189
return list(related_instance.datasets.all())
190+
elif isinstance(related_instance, Organization):
191+
return list(related_instance.datasets.all())
192+
elif isinstance(related_instance, User):
193+
return list(related_instance.datasets.all())
179194
return None
180195

181196
class Django:
@@ -189,4 +204,11 @@ class Django:
189204
"modified",
190205
]
191206

192-
related_models = [Resource, Metadata, DatasetMetadata, Sector]
207+
related_models = [
208+
Resource,
209+
Metadata,
210+
DatasetMetadata,
211+
Sector,
212+
Organization,
213+
User,
214+
]

0 commit comments

Comments
 (0)