ajusta urls e routers da app api

sapl/api/materia/urls.py

@@ -1,8 +1,13 @@
+from rest_framework.routers import DefaultRouter
+from sapl.api.materia.serializers import MateriaLegislativaViewSet
 
 # Não adicione app_name
 # app_name = AppConfig.name
 
 
+router = DefaultRouter()
+router.register(r'materia', MateriaLegislativaViewSet)
+
 urlpatterns = [
 
 ]

sapl/api/sessao/serializers.py

@@ -4,7 +4,7 @@ from sapl.base.models import CasaLegislativa
 from sapl.sessao.models import SessaoPlenaria, OrdemDia
 
 
-class SessaoPlenariaSerializer(serializers.ModelSerializer):
+class SessaoPlenariaOldSerializer(serializers.ModelSerializer):
 
     codReuniao = serializers.SerializerMethodField('get_pk_sessao')
     codReuniaoPrincipal = serializers.SerializerMethodField('get_pk_sessao')
@@ -57,7 +57,7 @@ class SessaoPlenariaSerializer(serializers.ModelSerializer):
         )
 
     def __init__(self, *args, **kwargs):
-        super(SessaoPlenariaSerializer, self).__init__(args, kwargs)
+        super(SessaoPlenariaOldSerializer, self).__init__(args, kwargs)
 
     def get_pk_sessao(self, obj):
         return obj.pk
@@ -120,3 +120,19 @@ class SessaoPlenariaSerializer(serializers.ModelSerializer):
     def casa(self):
         casa = CasaLegislativa.objects.first()
         return casa
+
+
+class SessaoPlenariaSerializer(serializers.ModelSerializer):
+
+    class Meta:
+        model = SessaoPlenaria
+        fields = ('tipo',
+                  'sessao_legislativa',
+                  'legislatura',
+                  'data_inicio',
+                  'hora_inicio',
+                  'hora_fim',
+                  'url_video',
+                  'iniciada',
+                  'finalizada'
+                  )

sapl/api/sessao/urls.py

@@ -1,8 +1,15 @@
 from django.conf.urls import include, url
+from rest_framework.routers import DefaultRouter
+from sapl.api.sessao.views import SessaoPlenariaViewSet,\
+    SessaoPlenariaOldViewSet
 
 # Não adicione app_name
 # app_name = AppConfig.name
 
+router = DefaultRouter()
+router.register(r'sessao-plenaria-old', SessaoPlenariaOldViewSet,
+                base_name='sessao-plenaria-old')
+router.register(r'sessao-plenaria', SessaoPlenariaViewSet)
 
 urlpatterns = [
 ]

sapl/api/sessao/views.py

@@ -1,18 +1,23 @@
 from rest_framework.filters import DjangoFilterBackend
-from rest_framework.mixins import ListModelMixin, RetrieveModelMixin
 from rest_framework.permissions import AllowAny
-from rest_framework.viewsets import GenericViewSet
+from rest_framework.viewsets import ReadOnlyModelViewSet
 
-from sapl.api.sessao.serializers import SessaoPlenariaSerializer
+from sapl.api.sessao.serializers import SessaoPlenariaOldSerializer,\
+    SessaoPlenariaSerializer
 from sapl.sessao.models import SessaoPlenaria
 
 
-class SessaoPlenariaViewSet(ListModelMixin,
+class SessaoPlenariaOldViewSet(ReadOnlyModelViewSet):
-                            RetrieveModelMixin,
-                            GenericViewSet):
 
     permission_classes = (AllowAny,)
-    serializer_class = SessaoPlenariaSerializer
+    serializer_class = SessaoPlenariaOldSerializer
     queryset = SessaoPlenaria.objects.all()
     filter_backends = (DjangoFilterBackend,)
     filter_fields = ('data_inicio', 'data_fim', 'interativa')
+
+
+class SessaoPlenariaViewSet(ReadOnlyModelViewSet):
+
+    permission_classes = (AllowAny,)
+    serializer_class = SessaoPlenariaSerializer
+    queryset = SessaoPlenaria.objects.all()

sapl/api/urls.py

@@ -3,10 +3,8 @@ from django.conf.urls import include, url
 from rest_framework.routers import DefaultRouter
 
 import sapl.api.base.urls
-from sapl.api.materia.serializers import MateriaLegislativaViewSet
 import sapl.api.materia.urls
 import sapl.api.sessao.urls
-from sapl.api.sessao.views import SessaoPlenariaViewSet
 from sapl.api.views import ModelChoiceView
 
 from .apps import AppConfig
@@ -16,8 +14,9 @@ app_name = AppConfig.name
 
 
 router = DefaultRouter()
-router.register(r'materia', MateriaLegislativaViewSet)
+router.registry += sapl.api.materia.urls.router.registry + \
-router.register(r'sessao-plenaria', SessaoPlenariaViewSet)
+    sapl.api.sessao.urls.router.registry
+
 urlpatterns_router = router.urls
 
 urlpatterns_api = [

sapl/sessao/serializers.py

@@ -1,19 +1,3 @@
 from rest_framework import serializers
 
 from .models import SessaoPlenaria
-
-
-class SessaoPlenariaSerializer(serializers.Serializer):
-
-    class Meta:
-        model = SessaoPlenaria
-        fields = ('tipo',
-                  'sessao_legislativa',
-                  'legislatura',
-                  'data_inicio',
-                  'hora_inicio',
-                  'hora_fim',
-                  'url_video',
-                  'iniciada',
-                  'finalizada'
-                  )

sapl/templates/base/relatorios_list.html

@@ -42,5 +42,5 @@
         </tr>
     </tbody>
   </table>
-</fieldset
+</fieldset>
 {% endblock base_content %}