Merge pull request #688 from direct-framework/rename-tool-model

Change Tool model to ToolLanguageMethodology

Author: AdrianDAlessandro

main/admin.py

@@ -14,7 +14,7 @@
     ProviderResource,
     SkillLevelResource,
     SkillResource,
-    ToolResource,
+    ToolLanguageMethodologyResource,
 )
 from .models import (
     Competency,
@@ -23,7 +23,7 @@
     Provider,
     Skill,
     SkillLevel,
-    Tool,
+    ToolLanguageMethodology,
     User,
     UserSkill,
 )
@@ -101,10 +101,10 @@ class ProviderAdmin(ImportExportModelAdmin[Provider]):
     resource_classes = (ProviderResource,)
 
 
-class ToolInline(admin.TabularInline[Tool, LearningResource]):
+class ToolInline(admin.TabularInline[ToolLanguageMethodology, LearningResource]):
     """Inline admin class for the Tool model."""
 
-    model = Tool.learning_resources.through  # type: ignore[assignment]
+    model = ToolLanguageMethodology.learning_resources.through  # type: ignore[assignment]
     extra = 0
     verbose_name = "Tool, Methodology, Behaviour or Language"
     verbose_name_plural = "Tools, Methodologies, Behaviours and Languages"
@@ -125,14 +125,14 @@ def get_language_display(self, obj: LearningResource) -> Any:
         return obj.get_language_display()
 
 
-@admin.register(Tool)
-class ToolAdmin(ImportExportModelAdmin[Tool]):
+@admin.register(ToolLanguageMethodology)
+class ToolAdmin(ImportExportModelAdmin[ToolLanguageMethodology]):
     """Admin class for The Tool model."""
 
     list_display = ("name", "kind", "url")
     search_fields = ("name",)
     list_filter = ("kind",)
-    resource_classes = (ToolResource,)
+    resource_classes = (ToolLanguageMethodologyResource,)
 
 
 @admin.register(Skill)

main/io_resources.py

@@ -20,7 +20,7 @@
     Skill,
     SkillLevel,
     SluggedModel,
-    Tool,
+    ToolLanguageMethodology,
 )
 
 
@@ -162,7 +162,7 @@ class Meta:
         exclude = ("id",)
 
 
-class ToolResource(resources.ModelResource):
+class ToolLanguageMethodologyResource(resources.ModelResource):
     """A ModelResource to facilitate importing and exporting Tools."""
 
     learning_resources = fields.Field(
@@ -171,9 +171,9 @@ class ToolResource(resources.ModelResource):
     )
 
     class Meta:
-        """Meta options for ToolResource."""
+        """Meta options for ToolLanguageMethodologyResource."""
 
-        model = Tool
+        model = ToolLanguageMethodology
         skip_unchanged = True
         import_id_fields = ("slug",)
         exclude = ("id",)
@@ -188,7 +188,9 @@ class SkillResource(resources.ModelResource):
     tools = fields.Field(
         "tools",
         column_name="tools_languages_methodologies",
-        widget=SluggedM2MWidget(Tool, "tools_languages_methodologies"),
+        widget=SluggedM2MWidget(
+            ToolLanguageMethodology, "tools_languages_methodologies"
+        ),
     )
     learning_resources = fields.Field(
         "learning_resources",

main/migrations/0027_rename_tool_toollanguagemethodology.py

@@ -0,0 +1,17 @@
+# Generated by Django 6.0.2 on 2026-04-14 18:04
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('main', '0026_user_agreed_to_tos_user_date_agreed'),
+    ]
+
+    operations = [
+        migrations.RenameModel(
+            old_name='Tool',
+            new_name='ToolLanguageMethodology',
+        ),
+    ]

main/migrations/0028_alter_toollanguagemethodology_options_and_more.py

@@ -0,0 +1,27 @@
+# Generated by Django 6.0.3 on 2026-04-15 14:18
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('main', '0027_rename_tool_toollanguagemethodology'),
+    ]
+
+    operations = [
+        migrations.AlterModelOptions(
+            name='toollanguagemethodology',
+            options={'verbose_name': 'Tool, language or methodology', 'verbose_name_plural': 'Tools, languages and methodologies'},
+        ),
+        migrations.AlterField(
+            model_name='skill',
+            name='tools',
+            field=models.ManyToManyField(blank=True, to='main.toollanguagemethodology', verbose_name='tools, languages and methodologies'),
+        ),
+        migrations.AlterField(
+            model_name='toollanguagemethodology',
+            name='kind',
+            field=models.CharField(choices=[('tool', 'Computational tool'), ('language', 'Programming or data language'), ('methodology', 'Methodology')], default='tool', max_length=12),
+        ),
+    ]

main/models/framework_models.py

@@ -113,20 +113,20 @@ class LearningResource(SluggedModel):
     description = models.TextField(blank=True, null=True)  # type: ignore[assignment]
 
 
-class Tool(SluggedModel):
+class ToolLanguageMethodology(SluggedModel):
     """Model for tools, languages and methodologies."""
 
     class Meta:
         """Meta options for Tool model."""
 
-        verbose_name = _("Tool, Language or Methodology")
-        verbose_name_plural = _("Tools, Languages and Methodologies")
+        verbose_name = _("Tool, language or methodology")
+        verbose_name_plural = _("Tools, languages and methodologies")
 
     class Kind(models.TextChoices):
         """Enumeration of Kind choices."""
 
-        TOOL = "tool", "Tool"
-        LANGUAGE = "language", "Language"
+        TOOL = "tool", "Computational tool"
+        LANGUAGE = "language", "Programming or data language"
         METHODOLOGY = "methodology", "Methodology"
 
     kind = models.CharField(max_length=12, choices=Kind, default=Kind.TOOL)
@@ -144,9 +144,9 @@ class Meta:
 
     competency = models.ForeignKey(Competency, on_delete=models.CASCADE)
     tools = models.ManyToManyField(
-        Tool,
+        ToolLanguageMethodology,
         blank=True,
-        verbose_name="tools, methodologies, behaviours and languages",
+        verbose_name="tools, languages and methodologies",
     )
     learning_resources = models.ManyToManyField(LearningResource, blank=True)
     related_skills = models.ManyToManyField("self", blank=True)

main/views/page_views.py

@@ -13,7 +13,7 @@
 from django.templatetags.static import static
 from django.views.generic.base import TemplateView
 
-from ..models import CompetencyDomain, Skill, SkillLevel, Tool
+from ..models import CompetencyDomain, Skill, SkillLevel, ToolLanguageMethodology
 
 logger = logging.getLogger(__name__)
 
@@ -200,9 +200,13 @@ def get_context_data(self, **kwargs: Mapping[str, Any]) -> dict[str, Any]:
         context["skill"] = skill
         context["related_skills"] = skill.related_skills.all().order_by("name")
         context["learning_resources"] = skill.learning_resources.all().order_by("name")
-        context["tools"] = tools_qs.filter(kind=Tool.Kind.TOOL)
-        context["languages"] = tools_qs.filter(kind=Tool.Kind.LANGUAGE)
-        context["methodologies"] = tools_qs.filter(kind=Tool.Kind.METHODOLOGY)
+        context["tools"] = tools_qs.filter(kind=ToolLanguageMethodology.Kind.TOOL)
+        context["languages"] = tools_qs.filter(
+            kind=ToolLanguageMethodology.Kind.LANGUAGE
+        )
+        context["methodologies"] = tools_qs.filter(
+            kind=ToolLanguageMethodology.Kind.METHODOLOGY
+        )
 
         return context
 

tests/main/conftest.py

@@ -9,7 +9,7 @@
     Provider,
     Skill,
     SkillLevel,
-    Tool,
+    ToolLanguageMethodology,
     UserSkill,
 )
 
@@ -57,12 +57,12 @@ def learning_resource(provider: Provider) -> LearningResource:
 
 
 @pytest.fixture
-def tool(learning_resource: LearningResource) -> Tool:
+def tool(learning_resource: LearningResource) -> ToolLanguageMethodology:
     """Fixture for creating a Tool instance."""
-    tool = Tool.objects.create(
+    tool = ToolLanguageMethodology.objects.create(
         name="Tool",
         description="A tool, methodology, behaviour or language",
-        kind=Tool.Kind.TOOL,
+        kind=ToolLanguageMethodology.Kind.TOOL,
         url="https://example.com/tool",
     )
     tool.learning_resources.add(learning_resource)
@@ -71,7 +71,9 @@ def tool(learning_resource: LearningResource) -> Tool:
 
 @pytest.fixture
 def skill(
-    competency: Competency, tool: Tool, learning_resource: LearningResource
+    competency: Competency,
+    tool: ToolLanguageMethodology,
+    learning_resource: LearningResource,
 ) -> Skill:
     """Fixture for creating a Skill instance."""
     skill = Skill.objects.create(

tests/main/test_admin_views.py

@@ -15,7 +15,7 @@
     Provider,
     Skill,
     SkillLevel,
-    Tool,
+    ToolLanguageMethodology,
 )
 
 
@@ -121,7 +121,7 @@ class TestLearningResourceAdmin(AdminMixin):
 class TestToolAdmin(AdminMixin):
     """Test suite for the Tool admin views."""
 
-    _model = Tool
+    _model = ToolLanguageMethodology
     _data: ClassVar[dict[str, Any]] = {
         "name": "Test Tool",
         "description": "Test Description",

tests/main/test_framework_models.py

@@ -13,7 +13,7 @@
     Skill,
     SkillLevel,
     SluggedModel,
-    Tool,
+    ToolLanguageMethodology,
 )
 
 
@@ -91,7 +91,7 @@ def test_competency_model(
 def test_skill_model(
     skill: Skill,
     competency: Competency,
-    tool: Tool,
+    tool: ToolLanguageMethodology,
     learning_resource: LearningResource,
 ) -> None:
     """Test the Skill model."""
@@ -157,13 +157,15 @@ def test_learning_resource_model(
 
 
 @pytest.mark.django_db
-def test_tool_model(tool: Tool, learning_resource: LearningResource) -> None:
+def test_tool_model(
+    tool: ToolLanguageMethodology, learning_resource: LearningResource
+) -> None:
     """Test the Tool model."""
     assert isinstance(tool, SluggedModel)
     assert tool.name == str(tool) == "Tool"
     assert tool.description == "A tool, methodology, behaviour or language"
     assert tool.slug == "tool"
-    assert tool.kind == Tool.Kind.TOOL
+    assert tool.kind == ToolLanguageMethodology.Kind.TOOL
     assert tool.url == "https://example.com/tool"
     assert learning_resource in tool.learning_resources.all()