renamed List to Note everywhere thru-out project in preparation for complete overhaul of applet capabilities
This commit is contained in:
@@ -1,6 +1,6 @@
|
||||
from rest_framework import serializers
|
||||
|
||||
from apps.dashboard.models import Item, List
|
||||
from apps.dashboard.models import Item, Note
|
||||
from apps.lyric.models import User
|
||||
|
||||
|
||||
@@ -8,8 +8,8 @@ class ItemSerializer(serializers.ModelSerializer):
|
||||
text = serializers.CharField()
|
||||
|
||||
def validate_text(self, value):
|
||||
list_ = self.context["list"]
|
||||
if list_.item_set.filter(text=value).exists():
|
||||
note = self.context["note"]
|
||||
if note.item_set.filter(text=value).exists():
|
||||
raise serializers.ValidationError("duplicate")
|
||||
return value
|
||||
|
||||
@@ -17,13 +17,13 @@ class ItemSerializer(serializers.ModelSerializer):
|
||||
model = Item
|
||||
fields = ["id", "text"]
|
||||
|
||||
class ListSerializer(serializers.ModelSerializer):
|
||||
class NoteSerializer(serializers.ModelSerializer):
|
||||
name = serializers.ReadOnlyField()
|
||||
url = serializers.CharField(source="get_absolute_url", read_only=True)
|
||||
items = ItemSerializer(many=True, read_only=True, source="item_set")
|
||||
|
||||
class Meta:
|
||||
model = List
|
||||
model = Note
|
||||
fields = ["id", "name", "url", "items"]
|
||||
|
||||
class UserSerializer(serializers.ModelSerializer):
|
||||
|
||||
@@ -1,7 +1,7 @@
|
||||
from django.test import TestCase
|
||||
from rest_framework.test import APIClient
|
||||
|
||||
from apps.dashboard.models import Item, List
|
||||
from apps.dashboard.models import Item, Note
|
||||
from apps.lyric.models import User
|
||||
|
||||
class BaseAPITest(TestCase):
|
||||
@@ -11,24 +11,24 @@ class BaseAPITest(TestCase):
|
||||
self.user = User.objects.create_user("test@example.com")
|
||||
self.client.force_authenticate(user=self.user)
|
||||
|
||||
class ListDetailAPITest(BaseAPITest):
|
||||
def test_returns_list_with_items(self):
|
||||
list_ = List.objects.create(owner=self.user)
|
||||
Item.objects.create(text="item 1", list=list_)
|
||||
Item.objects.create(text="item 2", list=list_)
|
||||
class NoteDetailAPITest(BaseAPITest):
|
||||
def test_returns_note_with_items(self):
|
||||
note = Note.objects.create(owner=self.user)
|
||||
Item.objects.create(text="item 1", note=note)
|
||||
Item.objects.create(text="item 2", note=note)
|
||||
|
||||
response = self.client.get(f"/api/lists/{list_.id}/")
|
||||
response = self.client.get(f"/api/notes/{note.id}/")
|
||||
|
||||
self.assertEqual(response.status_code, 200)
|
||||
self.assertEqual(response.data["id"], str(list_.id))
|
||||
self.assertEqual(response.data["id"], str(note.id))
|
||||
self.assertEqual(len(response.data["items"]), 2)
|
||||
|
||||
class ListItemsAPITest(BaseAPITest):
|
||||
def test_can_add_item_to_list(self):
|
||||
list_ = List.objects.create(owner=self.user)
|
||||
class NoteItemsAPITest(BaseAPITest):
|
||||
def test_can_add_item_to_note(self):
|
||||
note = Note.objects.create(owner=self.user)
|
||||
|
||||
response = self.client.post(
|
||||
f"/api/lists/{list_.id}/items/",
|
||||
f"/api/notes/{note.id}/items/",
|
||||
{"text": "a new item"},
|
||||
)
|
||||
|
||||
@@ -36,50 +36,50 @@ class ListItemsAPITest(BaseAPITest):
|
||||
self.assertEqual(Item.objects.count(), 1)
|
||||
self.assertEqual(Item.objects.first().text, "a new item")
|
||||
|
||||
def test_cannot_add_empty_item_to_list(self):
|
||||
list_ = List.objects.create(owner=self.user)
|
||||
def test_cannot_add_empty_item_to_note(self):
|
||||
note = Note.objects.create(owner=self.user)
|
||||
|
||||
response = self.client.post(
|
||||
f"/api/lists/{list_.id}/items/",
|
||||
f"/api/notes/{note.id}/items/",
|
||||
{"text": ""},
|
||||
)
|
||||
|
||||
self.assertEqual(response.status_code, 400)
|
||||
self.assertEqual(Item.objects.count(), 0)
|
||||
|
||||
def test_cannot_add_duplicate_item_to_list(self):
|
||||
list_ = List.objects.create(owner=self.user)
|
||||
Item.objects.create(text="list item", list=list_)
|
||||
def test_cannot_add_duplicate_item_to_note(self):
|
||||
note = Note.objects.create(owner=self.user)
|
||||
Item.objects.create(text="note item", note=note)
|
||||
duplicate_response = self.client.post(
|
||||
f"/api/lists/{list_.id}/items/",
|
||||
{"text": "list item"},
|
||||
f"/api/notes/{note.id}/items/",
|
||||
{"text": "note item"},
|
||||
)
|
||||
|
||||
self.assertEqual(duplicate_response.status_code, 400)
|
||||
self.assertEqual(Item.objects.count(), 1)
|
||||
|
||||
class ListsAPITest(BaseAPITest):
|
||||
def test_get_returns_only_users_lists(self):
|
||||
list1 = List.objects.create(owner=self.user)
|
||||
Item.objects.create(text="item 1", list=list1)
|
||||
class NotesAPITest(BaseAPITest):
|
||||
def test_get_returns_only_users_notes(self):
|
||||
note1 = Note.objects.create(owner=self.user)
|
||||
Item.objects.create(text="item 1", note=note1)
|
||||
other_user = User.objects.create_user("other@example.com")
|
||||
List.objects.create(owner=other_user)
|
||||
Note.objects.create(owner=other_user)
|
||||
|
||||
response = self.client.get("/api/lists/")
|
||||
response = self.client.get("/api/notes/")
|
||||
|
||||
self.assertEqual(response.status_code, 200)
|
||||
self.assertEqual(len(response.data), 1)
|
||||
self.assertEqual(response.data[0]["id"], str(list1.id))
|
||||
self.assertEqual(response.data[0]["id"], str(note1.id))
|
||||
|
||||
def test_post_creates_list_with_item(self):
|
||||
def test_post_creates_note_with_item(self):
|
||||
response = self.client.post(
|
||||
"/api/lists/",
|
||||
"/api/notes/",
|
||||
{"text": "first item"},
|
||||
)
|
||||
|
||||
self.assertEqual(response.status_code, 201)
|
||||
self.assertEqual(List.objects.count(), 1)
|
||||
self.assertEqual(List.objects.first().owner, self.user)
|
||||
self.assertEqual(Note.objects.count(), 1)
|
||||
self.assertEqual(Note.objects.first().owner, self.user)
|
||||
self.assertEqual(Item.objects.first().text, "first item")
|
||||
|
||||
class UserSearchAPITest(BaseAPITest):
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
from django.test import SimpleTestCase
|
||||
from apps.api.serializers import ItemSerializer, ListSerializer
|
||||
from apps.api.serializers import ItemSerializer, NoteSerializer
|
||||
|
||||
|
||||
class ItemSerializerTest(SimpleTestCase):
|
||||
@@ -10,11 +10,10 @@ class ItemSerializerTest(SimpleTestCase):
|
||||
{"id", "text"},
|
||||
)
|
||||
|
||||
class ListSerializerTest(SimpleTestCase):
|
||||
class NoteSerializerTest(SimpleTestCase):
|
||||
def test_fields(self):
|
||||
serializer = ListSerializer()
|
||||
serializer = NoteSerializer()
|
||||
self.assertEqual(
|
||||
set(serializer.fields.keys()),
|
||||
{"id", "name", "url", "items"},
|
||||
)
|
||||
|
||||
@@ -4,9 +4,8 @@ from . import views
|
||||
|
||||
|
||||
urlpatterns = [
|
||||
path('lists/', views.ListsAPI.as_view(), name='api_lists'),
|
||||
path('lists/<uuid:list_id>/', views.ListDetailAPI.as_view(), name='api_list_detail'),
|
||||
path('lists/<uuid:list_id>/items/', views.ListItemsAPI.as_view(), name='api_list_items'),
|
||||
path('notes/', views.NotesAPI.as_view(), name='api_notes'),
|
||||
path('notes/<uuid:note_id>/', views.NoteDetailAPI.as_view(), name='api_note_detail'),
|
||||
path('notes/<uuid:note_id>/items/', views.NoteItemsAPI.as_view(), name='api_note_items'),
|
||||
path('users/', views.UserSearchAPI.as_view(), name='api_users'),
|
||||
]
|
||||
|
||||
|
||||
@@ -2,38 +2,38 @@ from django.shortcuts import get_object_or_404
|
||||
from rest_framework.views import APIView
|
||||
from rest_framework.response import Response
|
||||
|
||||
from apps.api.serializers import ItemSerializer, ListSerializer, UserSerializer
|
||||
from apps.dashboard.models import Item, List
|
||||
from apps.api.serializers import ItemSerializer, NoteSerializer, UserSerializer
|
||||
from apps.dashboard.models import Item, Note
|
||||
from apps.lyric.models import User
|
||||
|
||||
|
||||
class ListDetailAPI(APIView):
|
||||
def get(self, request, list_id):
|
||||
list_ = get_object_or_404(List, id=list_id)
|
||||
serializer = ListSerializer(list_)
|
||||
class NoteDetailAPI(APIView):
|
||||
def get(self, request, note_id):
|
||||
note = get_object_or_404(Note, id=note_id)
|
||||
serializer = NoteSerializer(note)
|
||||
return Response(serializer.data)
|
||||
|
||||
class ListItemsAPI(APIView):
|
||||
def post(self, request, list_id):
|
||||
list_ = get_object_or_404(List, id=list_id)
|
||||
serializer = ItemSerializer(data=request.data, context={"list": list_})
|
||||
|
||||
class NoteItemsAPI(APIView):
|
||||
def post(self, request, note_id):
|
||||
note = get_object_or_404(Note, id=note_id)
|
||||
serializer = ItemSerializer(data=request.data, context={"note": note})
|
||||
if serializer.is_valid():
|
||||
serializer.save(list=list_)
|
||||
serializer.save(note=note)
|
||||
return Response(serializer.data, status=201)
|
||||
return Response(serializer.errors, status=400)
|
||||
|
||||
class ListsAPI(APIView):
|
||||
|
||||
class NotesAPI(APIView):
|
||||
def get(self, request):
|
||||
lists = List.objects.filter(owner=request.user)
|
||||
serializer = ListSerializer(lists, many=True)
|
||||
notes = Note.objects.filter(owner=request.user)
|
||||
serializer = NoteSerializer(notes, many=True)
|
||||
return Response(serializer.data)
|
||||
|
||||
def post(self, request):
|
||||
list_ = List.objects.create(owner=request.user)
|
||||
item = Item.objects.create(text=request.data.get("text", ""), list=list_)
|
||||
serializer = ListSerializer(list_)
|
||||
note = Note.objects.create(owner=request.user)
|
||||
item = Item.objects.create(text=request.data.get("text", ""), note=note)
|
||||
serializer = NoteSerializer(note)
|
||||
return Response(serializer.data, status=201)
|
||||
|
||||
|
||||
class UserSearchAPI(APIView):
|
||||
def get(self, request):
|
||||
q = request.query_params.get("q", "")
|
||||
|
||||
Reference in New Issue
Block a user