se cambio tabla paradero_linea por linea_paradero

develop/backend
Francisco Sandoval 2023-11-01 13:36:51 -03:00
parent ddeb38cbad
commit 4c2d63fc2e
5 changed files with 26 additions and 28 deletions

View File

@ -184,6 +184,14 @@ class Linea(models.Model):
managed = False
db_table = 'linea'
class LineaParadero(models.Model):
id_linea_paradero = models.AutoField(primary_key=True)
id_linea = models.ForeignKey(Linea, models.DO_NOTHING, db_column='id_linea')
id_paradero = models.ForeignKey('Paradero', models.DO_NOTHING, db_column='id_paradero')
class Meta:
managed = False
db_table = 'linea_paradero'
class Operador(models.Model):
id_operador = models.CharField(primary_key=True, max_length=150)
@ -233,15 +241,6 @@ class ParaderoImagen(models.Model):
managed = False
db_table = 'paradero_imagen'
class ParaderoLinea(models.Model):
id_paradero_linea = models.AutoField(primary_key=True)
id_paradero = models.ForeignKey(Paradero, models.DO_NOTHING, db_column='id_paradero', blank=False, null=False)
id_linea = models.ForeignKey(Linea, models.DO_NOTHING, db_column='id_linea', blank=False, null=False)
class Meta:
managed = True
db_table = 'paradero_linea'
class Persona(models.Model):
rut = models.DecimalField(primary_key=True, max_digits=12, decimal_places=0)

View File

@ -71,12 +71,6 @@ class ParaderoImagenSerializer(serializers.ModelSerializer):
representation['url'] = request.build_absolute_uri(f'/api/paraderos-image/{instance.id_paradero_imagen}/')
return representation
class ParaderoLineaSerializer(serializers.ModelSerializer):
class Meta:
model = models.ParaderoLinea
fields = '__all__'
class OperadorSerializer(serializers.ModelSerializer):
class Meta:
model = models.Operador
@ -87,6 +81,11 @@ class LineaSerializer(serializers.ModelSerializer):
model = models.Linea
fields = '__all__'
class LineaParaderoSerializer(serializers.ModelSerializer):
class Meta:
model = models.LineaParadero
fields = '__all__'
class UsuarioSerializer(serializers.ModelSerializer):
# muestro informacion de persona en un objeto aparte
persona = serializers.SerializerMethodField()

View File

@ -3,7 +3,7 @@ from rest_framework import routers
# from api import views
from api.views import usuario, auth, aplicacion, tipo, persona, comuna, region, paradero, rol, rolaplicacion
from api.views import mapa, linea, letrero_lur, operador
from api.views import paradero_imagen, paradero_linea
from api.views import paradero_imagen, linea_paradero
from api.views import dispositivo
router = routers.DefaultRouter()
@ -20,8 +20,8 @@ router.register('comunas', comuna.ComunaViewSet)
router.register('regiones', region.RegionViewSet)
router.register('paraderos', paradero.ParaderoViewSet)
router.register('paraderos-image', paradero_imagen.ParaderoImagenListView, basename='paradero_imagen')
router.register('paraderos-linea', paradero_linea.ParaderoLineaViewSet)
router.register('lineas', linea.LineaViewSet)
router.register('lineas-paradero', linea_paradero.LineaParaderoViewSet)
router.register('letreros-lur', letrero_lur.LetreroLUR_ViewSet)
router.register('operadores', operador.OperadorViewSet)
router.register('roles', rol.RolViewSet)

View File

@ -0,0 +1,11 @@
from rest_framework import viewsets
from django_filters.rest_framework import DjangoFilterBackend
from api.serializers import LineaParaderoSerializer
from api.models import LineaParadero
import logging
class LineaParaderoViewSet(viewsets.ModelViewSet):
queryset = LineaParadero.objects.all()
serializer_class = LineaParaderoSerializer
filter_backends = [DjangoFilterBackend]
filterset_fields = ['id_linea', 'id_paradero']

View File

@ -1,11 +0,0 @@
from rest_framework import viewsets
from django_filters.rest_framework import DjangoFilterBackend
from api.serializers import ParaderoLineaSerializer
from api.models import ParaderoLinea
import logging
class ParaderoLineaViewSet(viewsets.ModelViewSet):
queryset = ParaderoLinea.objects.all()
serializer_class = ParaderoLineaSerializer
filter_backends = [DjangoFilterBackend]
filterset_fields = ['id_linea', 'id_paradero']