diff --git a/project/api/views/dispositivo.py b/project/api/views/dispositivo.py index dd28fda..7b6ce2d 100755 --- a/project/api/views/dispositivo.py +++ b/project/api/views/dispositivo.py @@ -18,7 +18,7 @@ class DispositivoViewSet(viewsets.ModelViewSet): queryset = models.Dispositivo.objects.all() serializer_class = serializers.DispositivoSerializer filter_backends = [DjangoFilterBackend] - filterset_fields = ['id_paradero', 'id_tipo_dispositivo'] + filterset_fields = ['id_dispositivo', 'id_paradero', 'id_tipo_dispositivo'] @action(detail=False, methods=['post']) @@ -51,7 +51,7 @@ class DispositivoViewSet(viewsets.ModelViewSet): }) - @action(detail=False, methods=['post']) + @action(detail=False, methods=['post','get']) def getInfoDevice(self, request, pk=None): input = json.loads(request.body) getInfoDevice = input['GetInfoDevice'] @@ -211,8 +211,8 @@ class DispositivoViewSet(viewsets.ModelViewSet): # for pk_linea in lineas_agrupadas: # detalle_lineas.append(lineas_agrupadas[pk_linea]) - # save_log_dispositivo(id_dispositivo=getInfoDevice['idDispositivo'], accion_url='getInfoDevice') + save_log_dispositivo(id_dispositivo=getInfoDevice['idDispositivo'], accion_url='getInfoDevice') cursor.close() return JsonResponse({ "GetInfoDeviceResponse": { diff --git a/project/project/settings.py b/project/project/settings.py index 45a8f74..5b11456 100644 --- a/project/project/settings.py +++ b/project/project/settings.py @@ -46,6 +46,7 @@ INSTALLED_APPS = [ 'corsheaders', 'django_filters', 'api', + 'public', 'logger', ] diff --git a/project/project/urls.py b/project/project/urls.py index 0f22b2d..4cc714b 100644 --- a/project/project/urls.py +++ b/project/project/urls.py @@ -29,6 +29,7 @@ urlpatterns = [ # BACKEND path('admin/', admin.site.urls), path('api/', include('api.urls')), + path('api-public/', include('public.urls')), path('docs/', include_docs_urls(title = 'API Documentation')), ]#+ static(settings.MEDIA_URL, document_root=settings.MEDIA_ROOT) diff --git a/project/public/__init__.py b/project/public/__init__.py new file mode 100644 index 0000000..e69de29 diff --git a/project/public/admin.py b/project/public/admin.py new file mode 100644 index 0000000..8c38f3f --- /dev/null +++ b/project/public/admin.py @@ -0,0 +1,3 @@ +from django.contrib import admin + +# Register your models here. diff --git a/project/public/apps.py b/project/public/apps.py new file mode 100644 index 0000000..74e8998 --- /dev/null +++ b/project/public/apps.py @@ -0,0 +1,6 @@ +from django.apps import AppConfig + + +class PublicConfig(AppConfig): + default_auto_field = 'django.db.models.BigAutoField' + name = 'public' diff --git a/project/public/models.py b/project/public/models.py new file mode 100644 index 0000000..71a8362 --- /dev/null +++ b/project/public/models.py @@ -0,0 +1,3 @@ +from django.db import models + +# Create your models here. diff --git a/project/public/tests.py b/project/public/tests.py new file mode 100644 index 0000000..7ce503c --- /dev/null +++ b/project/public/tests.py @@ -0,0 +1,3 @@ +from django.test import TestCase + +# Create your tests here. diff --git a/project/public/urls.py b/project/public/urls.py new file mode 100644 index 0000000..53403a0 --- /dev/null +++ b/project/public/urls.py @@ -0,0 +1,10 @@ +from django.urls import path, include +from rest_framework import routers +from api.views.dispositivo import DispositivoViewSet + +router = routers.DefaultRouter() +router.register('paradero_info', DispositivoViewSet) + +urlpatterns = [ + path('', include(router.urls)), +] \ No newline at end of file diff --git a/project/public/views.py b/project/public/views.py new file mode 100644 index 0000000..9502697 --- /dev/null +++ b/project/public/views.py @@ -0,0 +1,6 @@ +from django.shortcuts import render +from api.views.dispositivo import DispositivoViewSet + +# Create your views here. +class DispositivoPublicViewSet(DispositivoViewSet): + pass \ No newline at end of file diff --git a/readme.md b/readme.md index bdc3dcf..8055e74 100644 --- a/readme.md +++ b/readme.md @@ -105,10 +105,10 @@ CMD [ "/app/project/manage.py", "runserver", "0.0.0.0:4000" ] # instrucciones para compilar archivo Dockerfile ~~~bash -docker build -t -f Dockerfile --build-arg gitusername= --build-arg gitpassword= . +docker build -t -f Dockerfile --no-cache --build-arg gitusername= --build-arg gitpassword= . # ejemplo -# docker build -t transporte:v1.2 -f Dockerfile --build-arg gitusername=johndoe --build-arg gitpassword=mypassword . +# docker build -t transporte:v1.2 -f Dockerfile --no-cache --build-arg gitusername=johndoe --build-arg gitpassword=mypassword . ~~~