Compare commits

...

2 Commits

Author SHA1 Message Date
Jason Zhu 2db58790b1 Added DELETE option (Not Finished) 2020-10-21 17:17:33 +11:00
Jason Zhu c0f3354f1f Finished implementation/test for PUT option 2020-10-21 16:43:51 +11:00
2 changed files with 82 additions and 25 deletions

View File

@ -26,28 +26,7 @@ class GetAllPuppiesTest(TestCase):
def test_get_all_puppies(self):
# get API response
response = client.get(reverse('get_post_puppies'))
# get data from db
puppies = Puppy.objects.all()
serializer = PuppySerializer(puppies, many=True)
self.assertEqual(response.data, serializer.data)
self.assertEqual(response.status_code, status.HTTP_200_OK)
class GetSinglePuppyTest(TestCase):
""" Test module for GET single puppy API """
def setUp(self):
self.casper = Puppy.objects.create(
name='Casper', age=3, breed='Bull Dog', color='Black')
self.muffin = Puppy.objects.create(
name='Muffin', age=1, breed='Gradane', color='Brown')
self.rambo = Puppy.objects.create(
name='Rambo', age=2, breed='Labrador', color='Black')
self.ricky = Puppy.objects.create(
name='Ricky', age=6, breed='Labrador', color='Brown')
def test_get_valid_single_puppy(self):
response = client.get(
response = client.get(reverse('get_post_puppies'))return Response({})
reverse('get_delete_update_puppy', kwargs={'pk': self.rambo.pk}))
puppy = Puppy.objects.get(pk=self.rambo.pk)
serializer = PuppySerializer(puppy)
@ -97,3 +76,62 @@ class CreateNewPuppyTest(TestCase):
content_type='application/json'
)
self.assertEqual(response.status_code, status.HTTP_400_BAD_REQUEST)
class UpdateSinglePuppyTest(TestCase):
""" Test module for updating an existing puppy record
Test PUT option
"""
def setUp(self):
self.casper = Puppy.objects.create(
name='Casper', age=3, breed='Bull Dog', color='Black')
self.muffin = Puppy.objects.create(
name='Muffy', age=1, breed='Gradane', color='Brown')
self.valid_payload = {
'name': 'Muffy',
'age': 2,
'breed': 'Labrador',
'color': 'Black'
}
self.invalid_payload = {
'name': '',
'age': 4,
'breed': 'Pamerion',
'color': 'White'
}
def test_valid_update_puppy(self):
response = client.put(
reverse('get_delete_update_puppy', kwargs={'pk': self.muffin.pk}),
data=json.dumps(self.valid_payload),
content_type='application/json'
)
self.assertEqual(response.status_code, status.HTTP_204_NO_CONTENT)
def test_invalid_update_puppy(self):
response = client.put(
reverse('get_delete_update_puppy', kwargs={'pk': self.muffin.pk}),
data=json.dumps(self.invalid_payload),
content_type='application/json')
self.assertEqual(response.status_code, status.HTTP_400_BAD_REQUEST)
class DeleteSinglePuppyTest(TestCase):
""" Test module for deleting an existing puppy record
To delete a single record, an ID is required
"""
def setUp(self):
self.casper = Puppy.objects.create(
name='Casper', age=3, breed='Bull Dog', color='Black')
self.muffin = Puppy.objects.create(
name='Muffy', age=1, breed='Gradane', color='Brown')
def test_valid_delete_puppy(self):
response = client.delete(
reverse('get_delete_update_puppy', kwargs={'pk': self.muffin.pk}))
self.assertEqual(response.status_code, status.HTTP_204_NO_CONTENT)
def test_invalid_delete_puppy(self):
response = client.delete(
reverse('get_delete_update_puppy', kwargs={'pk': 30}))
self.assertEqual(response.status_code, status.HTTP_404_NOT_FOUND)

View File

@ -7,7 +7,7 @@ from rest_framework import status
from .models import Puppy
from .serializers import PuppySerializer
@api_view(['GET', 'DELETE', 'UPDATE'])
@api_view(['GET', 'DELETE', 'PUT'])
def get_delete_update_puppy(request, pk):
try:
puppy = Puppy.objects.get(pk=pk)
@ -16,25 +16,44 @@ def get_delete_update_puppy(request, pk):
# get details of a single puppy
if request.method == 'GET':
# return Response({})
# we get the puppy using an ID. Run the tests to ensure they all pass.
serializer = PuppySerializer(puppy)
return Response(serializer.data)
# delete a single puppy
elif request.method == 'DELETE':
return Response({})
# return Response({})
puppy.delete()
return Response(status=status.HTTP_204_NO_CONTENT)
# update details of a single puppy
elif request.method == 'PUT':
return Response({})
# return Response({})
serializer = PuppySerializer(puppy, data=request.data)
if serializer.is_valid():
serializer.save()
return Response(serializer.data, status=status.HTTP_204_NO_CONTENT)
return Response(serializer.errors, status=status.HTTP_400_BAD_REQUEST)
@api_view(['GET', 'POST'])
def get_post_puppies(request):
# get all puppies
if request.method == 'GET':
# return Response({})
puppies = Puppy.objects.all()
serializer = PuppySerializer(puppies, many=True) # generate a nested list of 'edit' items
return Response(serializer.data)
# insert a new record for a puppy
elif request.method == 'POST':
# return Response({})
data = {
'name': request.data.get('name'),
'age': int(request.data.get('age')),