Merge pull request #197 from 2077-Collective/revert-196-fix/category-url

Revert "Fix/category url"

server/apps/research/admin/category_admin.py

@@ -5,9 +5,8 @@
 class CategoryAdmin(admin.ModelAdmin):
     """Admin interface for the Category model."""
 
-    list_display = ('name', 'slug', 'created_at')
+    list_display = ('name', 'created_at')
     list_per_page = 25
     search_fields = ('name',)
     list_filter = ('created_at',)
     ordering = ('name',)
-    readonly_fields = ('slug',)

server/apps/research/models/category.py

@@ -1,39 +1,12 @@
 from django.db import models
 from apps.common.models import BaseModel
-from django.utils.text import slugify
-from django.db import transaction
 
 class Category(BaseModel):
     """Model for categories."""
     name = models.CharField(max_length=255)
-    slug = models.SlugField(max_length=255, unique=True, blank=True)
 
     class Meta:
         verbose_name_plural = 'Categories'
-
-    def save(self, *args, **kwargs):
-        if not self.slug:
-            self.slug = self.generate_slug()        
-        super().save(*args, **kwargs)
 
     def __str__(self):
         return self.name
-
-    def generate_slug(self):
-
-        if not self.name:
-            raise ValueError("Name is required to generate slug")
-
-        base_slug = slugify(self.name)
-        slug = base_slug
-        num = 1
-        with transaction.atomic():
-            while (
-                Category.objects.select_for_update()
-                .filter(slug=slug)
-                .exclude(id=self.id)  # Exclude current instance when updating
-                .exists()
-            ):
-                slug = f"{base_slug}-{num}"
-                num += 1
-        return slug

server/apps/research/serializers/category_serializer.py

@@ -3,7 +3,6 @@
 
 class CategorySerializer(serializers.ModelSerializer):
     """Serializer for the Category model."""
-    slug = serializers.SlugField(read_only=True, max_length=255, help_text='URL-friendly version of the category name.')
     class Meta:
         model = Category
-        fields = ['id', 'name', 'slug']
+        fields = ['id', 'name']

server/apps/research/views.py

@@ -102,13 +102,11 @@ def retrieve_by_identifier(self, request, identifier=None):
                           status=status.HTTP_404_NOT_FOUND)
 
     # Custom action to retrieve articles by category
-    @action(detail=False, methods=['get'], url_path=r'category/(?P<category_slug>[-\w]+)')
-    def retrieve_by_category(self, request, category_slug=None):
+    @action(detail=False, methods=['get'], url_path=r'category/(?P<category>[-\w]+)')
+    def retrieve_by_category(self, request, category=None):
         """Retrieve article list by category."""
         try:
-            instances = Article.objects.filter(categories__slug=category_slug)
-            if not instances.exists():
-                return Response({'error': 'No articles found for this category'}, status=status.HTTP_404_NOT_FOUND)
+            instances = Article.objects.filter(categories__name=category)
             serializer = self.get_serializer(instances, many=True)
             return Response({'success': True, 'data': serializer.data})
         except Exception as e: