Skip to content

Commit 1b0afa3

Browse files
committed
chore: Updating system_defined_taxonomy_id
1 parent 19bf4b7 commit 1b0afa3

File tree

5 files changed

+30
-28
lines changed

5 files changed

+30
-28
lines changed
Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
- model: oel_tagging.taxonomy
2+
pk: 1
3+
fields:
4+
name: Languages
5+
description: ISO 639-1 Languages. Allows tags for any language configured for use on the instance
6+
enabled: true
7+
required: true
8+
allow_multiple: false
9+
allow_free_text: false

openedx_tagging/core/tagging/system_defined_taxonomies/fixtures/taxonomies.yaml

Lines changed: 0 additions & 18 deletions
This file was deleted.

openedx_tagging/core/tagging/system_defined_taxonomies/object_tags.py

Lines changed: 15 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
"""
2+
ObjectTags for System-defined Taxonomies
3+
"""
4+
from enum import Enum
15
from typing import List
26

37
from django.conf import settings
@@ -15,11 +19,18 @@
1519
from openedx_tagging.core.tagging.registry import register_object_tag_class
1620

1721

22+
class SystemDefinedIds(Enum):
23+
"""
24+
System-defined taxonomy IDs
25+
"""
26+
LanguageTaxonomy = 1
27+
28+
1829
class SystemDefinedObjectTagMixin:
1930
"""
2031
Mixing for ObjectTags used on all system defined taxonomies
2132
22-
`system_defined_taxonomy_name``is used to connect the
33+
`system_defined_taxonomy_id``is used to connect the
2334
ObjectTag with the system defined taxonomy.
2435
This is because there can be several ObjectTags
2536
for the same Taxonomy, ex:
@@ -34,7 +45,7 @@ class SystemDefinedObjectTagMixin:
3445
and system defined taxonomy as hardcoded.
3546
"""
3647

37-
system_defined_taxonomy_name = None
48+
system_defined_taxonomy_id = None
3849

3950
@classmethod
4051
def _validate_taxonomy(cls, taxonomy: Taxonomy = None):
@@ -45,7 +56,7 @@ def _validate_taxonomy(cls, taxonomy: Taxonomy = None):
4556
return (
4657
bool(taxonomy) and
4758
taxonomy.system_defined and
48-
taxonomy.name == cls.system_defined_taxonomy_name
59+
taxonomy.id == cls.system_defined_taxonomy_id
4960
)
5061

5162

@@ -156,7 +167,7 @@ class LanguageObjectTag(ClosedSystemObjectTag):
156167
languages available in Django LANGUAGES settings var
157168
"""
158169

159-
system_defined_taxonomy_name = "System Languages"
170+
system_defined_taxonomy_id = SystemDefinedIds.LanguageTaxonomy
160171

161172
class Meta:
162173
proxy = True

tests/openedx_tagging/core/tagging/test_system_defined.py

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ class EmptyObjectTag(ModelObjectTag):
4646
Model ObjectTag used for testing
4747
"""
4848

49-
system_defined_taxonomy_name = "User Authors"
49+
system_defined_taxonomy_id = 3
5050

5151
class Meta:
5252
proxy = True
@@ -61,7 +61,7 @@ class EmptyModelObjectTag(ModelObjectTag):
6161
Model ObjectTag used for testing
6262
"""
6363

64-
system_defined_taxonomy_name = "User Authors"
64+
system_defined_taxonomy_id = 3
6565

6666
class Meta:
6767
proxy = True
@@ -76,7 +76,7 @@ class TestOpenObjectTag(OpenSystemObjectTag):
7676
Open ObjectTag used for testing
7777
"""
7878

79-
system_defined_taxonomy_name = "User Authors"
79+
system_defined_taxonomy_id = 3
8080

8181
class Meta:
8282
proxy = True
@@ -89,7 +89,7 @@ class TestClosedObjectTag(ClosedSystemObjectTag):
8989
Closed ObjectTag used for testing
9090
"""
9191

92-
system_defined_taxonomy_name = "System Languages"
92+
system_defined_taxonomy_id = 2
9393

9494
class Meta:
9595
proxy = True
@@ -102,7 +102,7 @@ class TestUserObjectTag(UserObjectTag):
102102
User ObjectTag used for testing
103103
"""
104104

105-
system_defined_taxonomy_name = "User Authors"
105+
system_defined_taxonomy_id = 3
106106

107107
class Meta:
108108
proxy = True
@@ -214,7 +214,7 @@ class TestLanguageObjectClass(TestCase):
214214

215215
fixtures = [
216216
"tests/openedx_tagging/core/fixtures/system_defined.yaml",
217-
"openedx_tagging/core/tagging/system_defined_taxonomies/fixtures/language_taxonomy.yaml"
217+
"openedx_tagging/core/tagging/fixtures/language_taxonomy.yaml"
218218
]
219219

220220
def setUp(self):

0 commit comments

Comments
 (0)