Skip to content

Commit

Permalink
Se corrigen los hallazgos reportados por Codacy en cuanto a Calidad d…
Browse files Browse the repository at this point in the history
…e Codigo python
  • Loading branch information
f-arruza committed Nov 1, 2016
1 parent 63caeb2 commit cb69ef9
Show file tree
Hide file tree
Showing 14 changed files with 33 additions and 63 deletions.
2 changes: 0 additions & 2 deletions manager/admin.py
Original file line number Diff line number Diff line change
@@ -1,3 +1 @@
from django.contrib import admin

# Register your models here.
2 changes: 0 additions & 2 deletions manager/models.py
Original file line number Diff line number Diff line change
@@ -1,3 +1 @@
from django.db import models

# Create your models here.
2 changes: 0 additions & 2 deletions manager/views.py
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
5 changes: 5 additions & 0 deletions tracks/serializers.py
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 0 additions & 2 deletions tracks/tests.py
Original file line number Diff line number Diff line change
@@ -1,3 +1 @@
from django.test import TestCase

# Create your tests here.
1 change: 0 additions & 1 deletion tracks/trace_manager.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@
from django.contrib.gis.geoip2 import GeoIP2
import time
import os
import json


class TraceManager:
Expand Down
1 change: 0 additions & 1 deletion tracks/views.py
Original file line number Diff line number Diff line change
@@ -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
Expand Down
58 changes: 22 additions & 36 deletions users/business_logic.py
Original file line number Diff line number Diff line change
Expand Up @@ -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):
Expand All @@ -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):
Expand All @@ -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):
Expand Down Expand Up @@ -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):
Expand All @@ -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):
Expand Down Expand Up @@ -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):
Expand All @@ -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
Expand Down
1 change: 1 addition & 0 deletions users/models.py
Original file line number Diff line number Diff line change
Expand Up @@ -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))
Expand Down
2 changes: 1 addition & 1 deletion users/urls.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
from django.conf.urls import url, include
from django.conf.urls import url
from . import views

urlpatterns = [
Expand Down
14 changes: 4 additions & 10 deletions users/views.py
Original file line number Diff line number Diff line change
@@ -1,30 +1,24 @@
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
from rest_framework.permissions import IsAuthenticated
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
Expand Down
2 changes: 0 additions & 2 deletions web/admin.py
Original file line number Diff line number Diff line change
@@ -1,3 +1 @@
from django.contrib import admin

# Register your models here.
2 changes: 0 additions & 2 deletions web/models.py
Original file line number Diff line number Diff line change
@@ -1,3 +1 @@
from django.db import models

# Create your models here.
2 changes: 0 additions & 2 deletions web/tests.py
Original file line number Diff line number Diff line change
@@ -1,3 +1 @@
from django.test import TestCase

# Create your tests here.

0 comments on commit cb69ef9

Please sign in to comment.