2 Коміти fd0b615d1b ... 78c0d06a73

Автор SHA1 Опис Дата
  Tomás Ponce Gessi 78c0d06a73 Removed last_report_date field 3 роки тому
  Tomás Ponce Gessi fd0b615d1b Removed last_report_date field 3 роки тому
3 змінених файлів з 14 додано та 19 видалено
  1. 1 1
      app/api/serializers.py
  2. 2 2
      app/api/urls.py
  3. 11 16
      app/api/views.py

+ 1 - 1
app/api/serializers.py

@@ -5,5 +5,5 @@ from .models import ProgrammedReport
 class ProgrammedReportSerializer(serializers.ModelSerializer):
     class Meta:
         model = ProgrammedReport
-        fields = ["id", "name", "user_id", "frequency", "notified_emails", "start_report_date", "last_report_date", "due_date",
+        fields = ["id", "name", "user_id", "frequency", "notified_emails", "start_report_date", "due_date",
                   "format", "option", "stations", "modules"]

+ 2 - 2
app/api/urls.py

@@ -1,10 +1,10 @@
 from django.urls import path
 from rest_framework.routers import SimpleRouter
-from .views import ProgrammedReportViewSet, ProgrammedReportSentConfirmation, SendReportNow
+from .views import ProgrammedReportViewSet, SendReportNow
 
 router = SimpleRouter()
 router.register(r'preports', ProgrammedReportViewSet, "preport")
 urlpatterns = [
-    path(r'preports-confirmation', ProgrammedReportSentConfirmation.as_view()),
+    # path(r'preports-confirmation', ProgrammedReportSentConfirmation.as_view()),
     path('preports-send-now/<int:pk>/', SendReportNow.as_view())
 ] + router.urls

+ 11 - 16
app/api/views.py

@@ -1,16 +1,11 @@
-from urllib import response
 from django.db.models import ObjectDoesNotExist
-from django.http import HttpResponse
 from django.urls.exceptions import Http404
 from rest_framework import viewsets, views
 from rest_framework.exceptions import PermissionDenied
 from rest_framework.response import Response
-from rest_framework.parsers import JSONParser
 from .models import ProgrammedReport
 from .serializers import ProgrammedReportSerializer
 from .permissions import IsOmixomUser
-from django.conf import settings
-from django.utils import timezone
 from rest_framework import status
 
 
@@ -61,15 +56,15 @@ class ProgrammedReportViewSet(viewsets.ModelViewSet):
 
 # Endpoint para la confirmacion de envio de un reporte programado por parte de Clima:
 # Por el momento no es usado:
-class ProgrammedReportSentConfirmation(views.APIView):
-    parser_classes = [JSONParser]
+# class ProgrammedReportSentConfirmation(views.APIView):
+#     parser_classes = [JSONParser]
 
-    def post(self, request, format=None):
-        if(settings.PROGRAMMED_REPORTS_SERVICE_AUTH_TOKEN != request.META.get("HTTP_AUTHORIZATION")):
-            return Response("Invalid Access Credentials.", status.HTTP_403_FORBIDDEN)
-        report = ProgrammedReport.objects.filter(id=request.data.get("id")).first()
-        if report is None:
-            return Response("Invalid Report.", status.HTTP_400_BAD_REQUEST)
-        report.last_report_date = timezone.now()
-        report.save()
-        return Response("Ok", status.HTTP_200_OK)
+#     def post(self, request, format=None):
+#         if(settings.PROGRAMMED_REPORTS_SERVICE_AUTH_TOKEN != request.META.get("HTTP_AUTHORIZATION")):
+#             return Response("Invalid Access Credentials.", status.HTTP_403_FORBIDDEN)
+#         report = ProgrammedReport.objects.filter(id=request.data.get("id")).first()
+#         if report is None:
+#             return Response("Invalid Report.", status.HTTP_400_BAD_REQUEST)
+#         report.last_report_date = timezone.now()
+#         report.save()
+#         return Response("Ok", status.HTTP_200_OK)