changed watchlist element + fixed django workflow

Author: Kerushani

.github/workflows/django.yml

@@ -13,7 +13,7 @@ jobs:
     strategy:
       max-parallel: 4
       matrix:
-        python-version: [3.7, 3.8, 3.9]
+        python-version: [3.9, "3.10", "3.11"]
 
     steps:
     - uses: actions/checkout@v4
@@ -24,7 +24,9 @@ jobs:
     - name: Install Dependencies
       run: |
         python -m pip install --upgrade pip
+        cd backend
         pip install -r requirements.txt
     - name: Run Tests
       run: |
+        cd backend
         python manage.py test

backend/api/migrations/0005_watchlistitem.py

@@ -0,0 +1,35 @@
+# Generated by Django 4.2.20 on 2025-05-24 14:38
+
+from django.conf import settings
+from django.db import migrations, models
+import django.db.models.deletion
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        migrations.swappable_dependency(settings.AUTH_USER_MODEL),
+        ('api', '0004_update_existing_avatars'),
+    ]
+
+    operations = [
+        migrations.CreateModel(
+            name='WatchlistItem',
+            fields=[
+                ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('imdb_id', models.CharField(max_length=20)),
+                ('title', models.CharField(max_length=200)),
+                ('year', models.CharField(max_length=4)),
+                ('poster', models.URLField(max_length=500)),
+                ('added_at', models.DateTimeField(auto_now_add=True)),
+                ('watched', models.BooleanField(default=False)),
+                ('rating', models.IntegerField(blank=True, null=True)),
+                ('notes', models.TextField(blank=True)),
+                ('user', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='watchlist', to=settings.AUTH_USER_MODEL)),
+            ],
+            options={
+                'ordering': ['-added_at'],
+                'unique_together': {('user', 'imdb_id')},
+            },
+        ),
+    ]

backend/api/migrations/0006_watchlistitem_imdb_rating.py

@@ -0,0 +1,18 @@
+# Generated by Django 4.2.20 on 2025-05-24 15:28
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('api', '0005_watchlistitem'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='watchlistitem',
+            name='imdb_rating',
+            field=models.CharField(blank=True, max_length=4, null=True),
+        ),
+    ]

backend/api/migrations/0007_alter_userprofile_avatar.py

@@ -0,0 +1,18 @@
+# Generated by Django 4.2.20 on 2025-05-24 15:45
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('api', '0006_watchlistitem_imdb_rating'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='userprofile',
+            name='avatar',
+            field=models.URLField(default='https://api.dicebear.com/7.x/initials/svg'),
+        ),
+    ]

backend/api/models.py

@@ -5,18 +5,37 @@
 # Create your models here.
 class UserProfile(models.Model):
     user = models.OneToOneField(User, on_delete=models.CASCADE, related_name='profile')
-    avatar = models.URLField(default='https://api.dicebear.com/7.x/bottts/svg')  # Default avatar URL
+    avatar = models.URLField(default='https://api.dicebear.com/7.x/initials/svg')  # Default avatar URL
     bio = models.TextField(max_length=500, blank=True)
 
     def __str__(self):
         return f"{self.user.username}'s profile"
 
     def save(self, *args, **kwargs):
         if not self.avatar:
-            # Generate unique avatar URL using username
-            self.avatar = f'https://api.dicebear.com/7.x/bottts/svg?seed={self.user.username}'
+            # Generate unique avatar URL using username and initials style
+            self.avatar = f'https://api.dicebear.com/7.x/initials/svg?seed={self.user.username}&backgroundColor=9370DB'
         super().save(*args, **kwargs)
 
+class WatchlistItem(models.Model):
+    user = models.ForeignKey(User, on_delete=models.CASCADE, related_name='watchlist')
+    imdb_id = models.CharField(max_length=20)
+    title = models.CharField(max_length=200)
+    year = models.CharField(max_length=4)
+    poster = models.URLField(max_length=500)
+    added_at = models.DateTimeField(auto_now_add=True)
+    watched = models.BooleanField(default=False)
+    rating = models.IntegerField(null=True, blank=True)
+    notes = models.TextField(blank=True)
+    imdb_rating = models.CharField(max_length=4, blank=True, null=True)
+
+    class Meta:
+        ordering = ['-added_at']
+        unique_together = ['user', 'imdb_id']
+
+    def __str__(self):
+        return f"{self.title} ({self.year}) - {self.user.username}'s list"
+
 class Note(models.Model):
     title = models.CharField(max_length=100)
     content = models.TextField()

backend/api/serializers.py

@@ -1,6 +1,6 @@
 from django.contrib.auth.models import User
 from rest_framework import serializers
-from .models import Note, UserProfile
+from .models import Note, UserProfile, WatchlistItem
 
 class UserProfileSerializer(serializers.ModelSerializer):
     class Meta:
@@ -50,7 +50,7 @@ def get_author_avatar(self, obj):
         try:
             return obj.author.profile.avatar
         except UserProfile.DoesNotExist:
-            return f'https://api.dicebear.com/7.x/bottts/svg?seed={obj.author.username}'
+            return f'https://api.dicebear.com/7.x/initials/svg?seed={obj.author.username}&backgroundColor=9370DB'
 
 class NoteReplySerializer(serializers.ModelSerializer):
     author_username = serializers.CharField(source='author.username', read_only=True)
@@ -66,4 +66,10 @@ def get_author_avatar(self, obj):
         try:
             return obj.author.profile.avatar
         except UserProfile.DoesNotExist:
-            return f'https://api.dicebear.com/7.x/bottts/svg?seed={obj.author.username}'
+            return f'https://api.dicebear.com/7.x/initials/svg?seed={obj.author.username}&backgroundColor=9370DB'
+
+class WatchlistItemSerializer(serializers.ModelSerializer):
+    class Meta:
+        model = WatchlistItem
+        fields = ['id', 'imdb_id', 'title', 'year', 'poster', 'added_at', 'watched', 'rating', 'notes', 'imdb_rating']
+        read_only_fields = ['added_at']

backend/api/tests.py

@@ -1,3 +1,118 @@
 from django.test import TestCase
+from django.contrib.auth.models import User
+from django.urls import reverse
+from rest_framework import status
+from rest_framework.test import APIClient
+from .models import UserProfile, WatchlistItem, Note
+from .serializers import UserSerializer, WatchlistItemSerializer, NoteSerializer
 
-# Create your tests here.
+class APITestCase(TestCase):
+    def setUp(self):
+        self.client = APIClient()
+        self.user = User.objects.create_user(
+            username='testuser',
+            email='test@example.com',
+            password='testpass123'
+        )
+        self.client.force_authenticate(user=self.user)
+        
+        self.watchlist_item = WatchlistItem.objects.create(
+            user=self.user,
+            imdb_id='tt0111161',
+            title='The Shawshank Redemption',
+            year='1994',
+            poster='https://example.com/poster.jpg',
+            imdb_rating='9.3'
+        )
+        
+        self.note = Note.objects.create(
+            title='Test Note',
+            content='Test Content',
+            author=self.user
+        )
+
+    def test_user_profile(self):
+        """Test user profile endpoint"""
+        response = self.client.get(reverse('user-profile'))
+        self.assertEqual(response.status_code, status.HTTP_200_OK)
+        self.assertEqual(response.data['username'], 'testuser')
+        self.assertEqual(response.data['email'], 'test@example.com')
+
+    def test_watchlist_crud(self):
+        """Test watchlist CRUD operations"""
+        response = self.client.get(reverse('watchlist'))
+        self.assertEqual(response.status_code, status.HTTP_200_OK)
+        self.assertEqual(len(response.data), 1)
+        
+        new_item = {
+            'imdb_id': 'tt0068646',
+            'title': 'The Godfather',
+            'year': '1972',
+            'poster': 'https://example.com/godfather.jpg',
+            'imdb_rating': '9.2'
+        }
+        response = self.client.post(reverse('watchlist'), new_item, format='json')
+        self.assertEqual(response.status_code, status.HTTP_201_CREATED)
+        
+        update_data = {'watched': True, 'rating': 5}
+        response = self.client.put(
+            reverse('watchlist-detail', args=[self.watchlist_item.id]),
+            update_data,
+            format='json'
+        )
+        self.assertEqual(response.status_code, status.HTTP_200_OK)
+        self.assertEqual(response.data['watched'], True)
+        self.assertEqual(response.data['rating'], 5)
+        
+        response = self.client.delete(reverse('watchlist-detail', args=[self.watchlist_item.id]))
+        self.assertEqual(response.status_code, status.HTTP_204_NO_CONTENT)
+
+    def test_notes_crud(self):
+        """Test notes CRUD operations"""
+        response = self.client.get(reverse('note-list'))
+        self.assertEqual(response.status_code, status.HTTP_200_OK)
+        self.assertEqual(len(response.data), 1)
+        
+        new_note = {
+            'title': 'New Note',
+            'content': 'New Content',
+            'author': self.user.id
+        }
+        response = self.client.post(reverse('note-list'), new_note, format='json')
+        self.assertEqual(response.status_code, status.HTTP_201_CREATED)
+        
+        update_data = {
+            'title': 'Updated Note',
+            'content': 'Updated Content',
+            'author': self.user.id
+        }
+        response = self.client.put(
+            reverse('note-detail', args=[self.note.id]),
+            update_data,
+            format='json'
+        )
+        self.assertEqual(response.status_code, status.HTTP_200_OK)
+        self.assertEqual(response.data['content'], 'Updated Content')
+        self.assertEqual(response.data['title'], 'Updated Note')
+        
+        response = self.client.delete(reverse('note-detail', args=[self.note.id]))
+        self.assertEqual(response.status_code, status.HTTP_204_NO_CONTENT)
+
+    def test_search_movies(self):
+        """Test movie search endpoint"""
+        response = self.client.get(reverse('search-movies'), {'q': 'Inception'})
+        self.assertEqual(response.status_code, status.HTTP_200_OK)
+        self.assertIn('Search', response.data)
+
+    def test_unauthorized_access(self):
+        """Test unauthorized access to protected endpoints"""
+        unauthorized_client = APIClient()
+        
+        response = unauthorized_client.get(reverse('watchlist'))
+        self.assertEqual(response.status_code, status.HTTP_401_UNAUTHORIZED)
+        
+        response = unauthorized_client.get(reverse('note-list'))
+        self.assertEqual(response.status_code, status.HTTP_401_UNAUTHORIZED)
+        
+        response = unauthorized_client.get(reverse('user-profile'))
+        self.assertEqual(response.status_code, status.HTTP_401_UNAUTHORIZED)

backend/api/urls.py

@@ -7,7 +7,9 @@
     path("notes/delete/<int:pk>/", views.NoteDelete.as_view(), name="note-delete"),
     path("users/create/", views.CreateUserView.as_view(), name="create-user"),
     path("profile/", views.UserProfileView.as_view(), name="user-profile"),
-    path("search-movie/", views.SearchOMDbView.as_view(), name="search-movies"),
+    path("search/", views.SearchOMDbView.as_view(), name="search-movies"),
     path("spotify/token/", views.SpotifyTokenView.as_view(), name="spotify-token"),
     path("spotify/search/", views.SpotifySearchView.as_view(), name="spotify-search"),
+    path("watchlist/", views.WatchlistView.as_view(), name="watchlist"),
+    path("watchlist/<int:pk>/", views.WatchlistItemDetailView.as_view(), name="watchlist-detail"),
 ]