Skip to content

Commit

Permalink
chore: get_tags_query_set added to LanguageObjectTag
Browse files Browse the repository at this point in the history
  • Loading branch information
ChrisChV committed Jul 10, 2023
1 parent fcd5ac8 commit 8460459
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 15 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -125,19 +125,12 @@ class Meta:
proxy = True

@classmethod
def get_tags(cls, taxonomy: Taxonomy) -> List[Tag]:
"""
Returns a list of tags of the available languages.
"""
# TODO we need to overweite this
# tags = super().get_tags()
tags = taxonomy.tag_set.objects().all()
result = []
available_langs = cls.get_available_languages()
for tag in tags:
if tag.external_id in available_langs:
result.append(tag)
return result
def get_tags_query_set(cls, taxonomy: Taxonomy) -> models.QuerySet:
"""
Returns a query set of available languages tags.
"""
available_langs = cls._get_available_languages()
return taxonomy.tag_set.filter(external_id__in=available_langs)

@classmethod
def _get_available_languages(cls) -> List[str]:
Expand All @@ -150,7 +143,6 @@ def _get_available_languages(cls) -> List[str]:
langs.add(django_lang[0].split('-')[0])
return langs


def _check_tag(self):
"""
Validates if the language tag is on the available languages
Expand Down
6 changes: 5 additions & 1 deletion tests/openedx_tagging/core/tagging/test_system_defined.py
Original file line number Diff line number Diff line change
Expand Up @@ -184,7 +184,6 @@ def test_get_available_languages(self):
langs = LanguageObjectTag._get_available_languages()
self.assertEqual(sorted(langs), self.expected_langs_ids)


def test_is_valid(self):
valid_object_tag = LanguageObjectTag(
taxonomy=self.taxonomy,
Expand Down Expand Up @@ -226,3 +225,8 @@ def test_is_valid(self):
check_object=True,
check_tag=True,
)

def test_get_tags_query_set(self):
tags = LanguageObjectTag.get_tags_query_set(self.taxonomy)
for tag in tags:
self.assertIn(tag.value, self.expected_langs_values)

0 comments on commit 8460459

Please sign in to comment.