diff --git a/fetcher/views.py b/fetcher/views.py index 1596a24..59d3070 100644 --- a/fetcher/views.py +++ b/fetcher/views.py @@ -1,13 +1,13 @@ """ Modulo que define las vistas de la aplicacion """ -from rest_framework.decorators import api_view -from rest_framework.response import Response +from django.http import JsonResponse +from django.views.decorators.http import require_GET from . import medium -@api_view(['GET']) +@require_GET def search_artist(request): """Busca un artista @@ -21,24 +21,24 @@ def search_artist(request): query = request.GET.get('query') if query: - return Response(medium.search_artist(query, limit, page)) + return JsonResponse(medium.search_artist(query, limit, page)) - return Response({'status': 400, 'error': 'Debe indicar una query'}) + return JsonResponse({'status': 400, 'error': 'Debe indicar una query'}) -@api_view(['GET']) +@require_GET def get_artist(_, mbid): """ Obtiene un artista dado su mbid""" - return Response(medium.get_artist(mbid)) + return JsonResponse(medium.get_artist(mbid)) -@api_view(['GET']) +@require_GET def get_disc(_, mbid): """Obtiene un disco dado su mbid""" - return Response(medium.get_disc(mbid)) + return JsonResponse(medium.get_disc(mbid)) -@api_view(['GET']) +@require_GET def search_disc(request): """Busca un disco @@ -53,34 +53,34 @@ def search_disc(request): query = request.GET.get('query') if query: - return Response(medium.search_disc(query, limit, page)) + return JsonResponse(medium.search_disc(query, limit, page)) - return Response({'status': 400, 'error': 'Debe indicar una query'}) + return JsonResponse({'status': 400, 'error': 'Debe indicar una query'}) -@api_view(['GET']) +@require_GET def get_discs_of_artist(request, mbid): """ Obtiene todos los discos de un artista dado el mbid del artista""" limit = int(request.GET.get('per_page', 10)) page = int(request.GET.get('page', 1)) - return Response(medium.get_discs_of_artist(mbid, limit, page)) + return JsonResponse(medium.get_discs_of_artist(mbid, limit, page)) -@api_view(['GET']) +@require_GET def get_artist_of_disc(request, mbid): """ Obtiene el artista de un disco""" - return Response(medium.get_artist_of_disc(mbid)) + return JsonResponse(medium.get_artist_of_disc(mbid)) -@api_view(['GET']) +@require_GET def get_release(_, mbid): """ Obtiene una release dada su mbid""" - return Response(medium.get_release(mbid)) + return JsonResponse(medium.get_release(mbid)) -@api_view(['GET']) +@require_GET def search_release(request): """ Busca una release @@ -94,12 +94,12 @@ def search_release(request): query = request.GET.get('query', '') if query: - return Response(medium.search_release(query, limit, page)) + return JsonResponse(medium.search_release(query, limit, page)) - return Response({'status': 400, 'error': 'Debe indicar una query'}) + return JsonResponse({'status': 400, 'error': 'Debe indicar una query'}) -@api_view(['GET']) +@require_GET def get_releases_of_disc(request, mbid): """ Obtiene las releases de un disco @@ -109,23 +109,23 @@ def get_releases_of_disc(request, mbid): limit = int(request.GET.get('per_page', 10)) page = int(request.GET.get('page', 1)) - return Response(medium.get_releases_of_disc(mbid, limit, page)) + return JsonResponse(medium.get_releases_of_disc(mbid, limit, page)) -@api_view(['GET']) +@require_GET def get_artist_of_release(request, mbid): """ Obtiene el artista de una release dada su mbid""" - return Response(medium.get_artist_of_release(mbid)) + return JsonResponse(medium.get_artist_of_release(mbid)) -@api_view(['GET']) +@require_GET def get_recording(_, mbid): """Obtiene un recording dada su mbid""" - return Response(medium.get_recording(mbid)) + return JsonResponse(medium.get_recording(mbid)) -@api_view(['GET']) +@require_GET def search_recording(request): """ Busca una recording @@ -139,18 +139,18 @@ def search_recording(request): query = request.GET.get('query', '') if query: - return Response(medium.search_recording(query, limit, page)) + return JsonResponse(medium.search_recording(query, limit, page)) - return Response({'status': 400, 'error': 'Debe indicar una query'}) + return JsonResponse({'status': 400, 'error': 'Debe indicar una query'}) -@api_view(['GET']) +@require_GET def get_recordings_of_release(request, mbid): """ Obtiene las recordings de una release dada su mbid""" - return Response(medium.get_recordings_of_release(mbid)) + return JsonResponse(medium.get_recordings_of_release(mbid)) -@api_view(['GET']) +@require_GET def get_releases_of_recording(request, mbid): """ Obtiene la release de una recording dada su mbid @@ -160,29 +160,29 @@ def get_releases_of_recording(request, mbid): limit = int(request.GET.get('per_page', 100)) page = int(request.GET.get('page', 1)) - return Response(medium.get_releases_of_recording(mbid, limit, page)) + return JsonResponse(medium.get_releases_of_recording(mbid, limit, page)) -@api_view(['GET']) +@require_GET def get_artist_of_recording(request, mbid): """ Obtiene el artista de una grabación dada su mbid""" - return Response(medium.get_artist_of_recording(mbid)) + return JsonResponse(medium.get_artist_of_recording(mbid)) -@api_view(['GET']) +@require_GET def get_cover_art_of_disc(_, mbid): """Obtiene la coverart de un disc dado su mbid""" coverart = medium.get_cover_art_disc(mbid) if coverart: - return Response(coverart) + return JsonResponse(coverart) - return Response(status=404) + return JsonResponse(status=404, data={'status': 404, 'error': 'No encontrado'}) -@api_view(['GET']) +@require_GET def get_cover_art_of_release(_, mbid): """Obtiene la coverart de una release dado su mbid""" coverart = medium.get_cover_art_release(mbid) if coverart: - return Response(coverart) - return Response(status=404) + return JsonResponse(coverart) + return JsonResponse(status=404, data={'status': 404, 'error': 'No encontrado'}) diff --git a/musiclist/settings/__init__.py b/musiclist/settings/__init__.py index 0f62ed8..f8e3d7d 100644 --- a/musiclist/settings/__init__.py +++ b/musiclist/settings/__init__.py @@ -27,7 +27,6 @@ INSTALLED_APPS = [ 'oauth2_provider', 'corsheaders', - 'rest_framework', 'django_rq', 'fetcher.apps.FetcherConfig', @@ -127,16 +126,6 @@ AUTH_PASSWORD_VALIDATORS = [ }, ] -"""Rest framework configuration""" -REST_FRAMEWORK = { - 'DEFAULT_AUTHENTICATION_CLASSES': ( - 'oauth2_provider.contrib.rest_framework.OAuth2Authentication', - ), - 'DEFAULT_PERMISSION_CLASSES': ( - 'rest_framework.permissions.AllowAny', - ) -} - """Location settings""" LANGUAGE_CODE = 'es-es' TIME_ZONE = 'America/Santiago'