diff --git a/manager/admin.py b/manager/admin.py index 8c38f3f..846f6b4 100644 --- a/manager/admin.py +++ b/manager/admin.py @@ -1,3 +1 @@ -from django.contrib import admin - # Register your models here. diff --git a/manager/models.py b/manager/models.py index 71a8362..6b20219 100644 --- a/manager/models.py +++ b/manager/models.py @@ -1,3 +1 @@ -from django.db import models - # Create your models here. diff --git a/manager/views.py b/manager/views.py index 54b1a04..5c4ec8f 100644 --- a/manager/views.py +++ b/manager/views.py @@ -6,8 +6,6 @@ from users.models import BusinessAgent, Artist from django.contrib.auth.models import User from django.views.generic import ListView, TemplateView, UpdateView, CreateView -from bson import json_util -from bson.json_util import dumps from django.core.urlresolvers import reverse from users.business_logic import ( register_business_agent, update_business_agent diff --git a/tracks/serializers.py b/tracks/serializers.py index dd39cc5..c020909 100644 --- a/tracks/serializers.py +++ b/tracks/serializers.py @@ -38,30 +38,35 @@ class Meta: 'artist_id' ) + @classmethod def get_image(self, obj): try: return obj.image.url except: return None + @classmethod def get_url(self, obj): try: return obj.file.url except: return None + @classmethod def get_gender(self, obj): try: return obj.gender.name except: return None + @classmethod def get_artist(self, obj): try: return obj.artist.user.username except: return None + @classmethod def get_artist_id(self, obj): try: return obj.artist.id diff --git a/tracks/tests.py b/tracks/tests.py index 7ce503c..a39b155 100644 --- a/tracks/tests.py +++ b/tracks/tests.py @@ -1,3 +1 @@ -from django.test import TestCase - # Create your tests here. diff --git a/tracks/trace_manager.py b/tracks/trace_manager.py index 82c87b6..9c4367b 100644 --- a/tracks/trace_manager.py +++ b/tracks/trace_manager.py @@ -2,7 +2,6 @@ from django.contrib.gis.geoip2 import GeoIP2 import time import os -import json class TraceManager: diff --git a/tracks/views.py b/tracks/views.py index 971cc6f..4c2d4ca 100644 --- a/tracks/views.py +++ b/tracks/views.py @@ -1,5 +1,4 @@ from rest_framework.generics import ListAPIView, CreateAPIView -from rest_framework.viewsets import ModelViewSet from .models import Track, Top from .serializers import TrackSerializer, TopSerializer, TrackUploadSerializer from rest_framework import filters diff --git a/users/business_logic.py b/users/business_logic.py index d492bc3..3eb73fa 100644 --- a/users/business_logic.py +++ b/users/business_logic.py @@ -7,11 +7,9 @@ from django.core.mail import send_mail -''' - get_info_users - Este médodo permite retornar todos los usuarios - Param: GET. -''' +# get_info_users +# Este médodo permite retornar todos los usuarios +# Param: GET. def get_info_users(request): @@ -26,11 +24,9 @@ def get_info_users(request): return users -''' - user_to_json - Este médodo permite transformar un usuario en json - Param: usuario. -''' +# user_to_json +# Este médodo permite transformar un usuario en json +# Param: usuario. def user_to_json(user): @@ -43,11 +39,9 @@ def user_to_json(user): return json_data -''' - register_user_in_model - Este médodo permite registrar un usuario - Param: datos del usuario. -''' +# register_user_in_model +# Este médodo permite registrar un usuario +# Param: datos del usuario. def register_user_in_model(json_data): @@ -94,11 +88,9 @@ def register_user_in_model(json_data): return {'status': status} -''' - str_to_bool - Este médodo permite transformar un str a bool - Param: str -''' +# str_to_bool +# Este médodo permite transformar un str a bool +# Param: str def str_to_bool(s): @@ -110,11 +102,9 @@ def str_to_bool(s): raise ValueError -''' - relation_user_to_artist - Este médodo permite asociar al modelo de usuario, el perfil de un artista. - Param: usuario, datos del perfil -''' +# relation_user_to_artist +# Este médodo permite asociar al modelo de usuario, el perfil delartista. +# Param: usuario, datos del perfil def relation_user_to_artist(user_model, json_data): @@ -149,11 +139,9 @@ def relation_user_to_artist(user_model, json_data): return True -''' - login_service - Este médodo permite registrar un usuario - Param: datos del usuario. -''' +# login_service +# Este médodo permite registrar un usuario +# Param: datos del usuario. def login_service(request): @@ -172,16 +160,14 @@ def login_service(request): return {'status': status} -''' - login_user_to_json - Este médodo permite transformar un usuario autenticado en json - Param: usuario. -''' +# login_user_to_json +# Este médodo permite transformar un usuario autenticado en json +# Param: usuario. def login_user_to_json(user): try: - artist = Artist.objects.get(user__id=user.id) + Artist.objects.get(user__id=user.id) is_artist = True except: is_artist = False diff --git a/users/models.py b/users/models.py index aa65f0c..0c9f2d7 100644 --- a/users/models.py +++ b/users/models.py @@ -70,6 +70,7 @@ class TokenUser(models.Model): token = models.CharField(max_length=10, blank=True, null=True) + @classmethod def get_token(self): chars = string.ascii_letters + string.digits token = ''.join(choice(chars) for i in range(10)) diff --git a/users/urls.py b/users/urls.py index 114924d..e69e8cd 100644 --- a/users/urls.py +++ b/users/urls.py @@ -1,4 +1,4 @@ -from django.conf.urls import url, include +from django.conf.urls import url from . import views urlpatterns = [ diff --git a/users/views.py b/users/views.py index f447884..ca51a88 100644 --- a/users/views.py +++ b/users/views.py @@ -1,15 +1,13 @@ import json from django.http import JsonResponse from django.views.decorators.csrf import csrf_exempt -from django.shortcuts import render, redirect +from django.shortcuts import redirect from django.core.urlresolvers import reverse from users.business_logic import ( register_user_in_model, get_info_users, login_service, request_password_restore_action, change_password_action, update_profile_action, change_password_op_action ) -from django.contrib.auth.models import User -from django.contrib.auth import authenticate, login from rest_framework.generics import CreateAPIView from .models import Donation, Artist from .serializers import DonationSerializer, ArtistSerializer @@ -17,14 +15,10 @@ from rest_framework import filters from rest_framework.generics import ListAPIView, RetrieveAPIView -from django.utils.decorators import method_decorator -from django.contrib.auth.decorators import login_required -''' - user - Servicio REST para el manejo de usuarios. - Param: GET, POST, PUT, DELETE -''' +# user +# Servicio REST para el manejo de usuarios. +# Param: GET, POST, PUT, DELETE @csrf_exempt diff --git a/web/admin.py b/web/admin.py index 8c38f3f..846f6b4 100644 --- a/web/admin.py +++ b/web/admin.py @@ -1,3 +1 @@ -from django.contrib import admin - # Register your models here. diff --git a/web/models.py b/web/models.py index 71a8362..6b20219 100644 --- a/web/models.py +++ b/web/models.py @@ -1,3 +1 @@ -from django.db import models - # Create your models here. diff --git a/web/tests.py b/web/tests.py index 7ce503c..a39b155 100644 --- a/web/tests.py +++ b/web/tests.py @@ -1,3 +1 @@ -from django.test import TestCase - # Create your tests here.