Merge pull request #58 from Xpirix/archived_orgs_permissions

Disable features for archived organisations

Author: Xpirix

.flake8

@@ -5,4 +5,4 @@ max-line-length = 79
 # E12x continuation line indentation
 # E251 no spaces around keyword / parameter equals
 # E303 too many blank lines (3)
-ignore = E125,E126,E251,E303,W504,W60,F405,E501,E128,E111,E114,E121
+ignore = E125,E126,E251,E303,W504,W60,F405,E501,E128,E111,E114,E121,W503

django_project/certification/api_views/course.py

@@ -6,6 +6,7 @@
 from rest_framework import status
 from rest_framework.views import APIView, Response
 
+from ..mixins import ActiveCertifyingOrganisationRequiredMixin
 from ..models.certifying_organisation import CertifyingOrganisation
 from ..models.course import Course
 from ..serializers.course_serializer import CourseSerializer
@@ -48,7 +49,7 @@ def get(self, request):
             )
 
 
-class GetUpcomingCourseOrganisation(APIView):
+class GetUpcomingCourseOrganisation(ActiveCertifyingOrganisationRequiredMixin, APIView):
     """API returns GeoJSON location of upcoming courses within a certifying
     organisation. The location is the location of the training center where
     this course will be held.
@@ -107,7 +108,7 @@ def get(self, request):
             )
 
 
-class GetPastCourseOrganisation(APIView):
+class GetPastCourseOrganisation(ActiveCertifyingOrganisationRequiredMixin, APIView):
     """API returns GeoJSON location of past courses within a certifying
     organisation. The location is the location of the training center where
     this course will be held.

django_project/certification/api_views/training_center.py

@@ -1,9 +1,12 @@
 # coding=utf-8
 import json
+
+from base.models.project import Project
+from certification.mixins import ActiveCertifyingOrganisationRequiredMixin
 from django.http import HttpResponse
-from rest_framework.views import APIView, Response
 from rest_framework import status
-from base.models.project import Project
+from rest_framework.views import APIView, Response
+
 from ..models.certifying_organisation import CertifyingOrganisation
 from ..models.training_center import TrainingCenter
 from ..utilities import CustomSerializer
@@ -14,53 +17,48 @@ class GetTrainingCenterProjectLocation(APIView):
 
     def get(self, request):
         try:
-            project = Project.objects.get(slug='qgis')
+            project = Project.objects.get(slug="qgis")
             training_centers = TrainingCenter.objects.filter(
                 certifying_organisation__project=project
-            ).order_by('certifying_organisation__name')
+            ).order_by("certifying_organisation__name")
             serializers = CustomSerializer()
-            data = (
-                serializers.serialize(
-                    training_centers,
-                    geometry_field='location',
-                    fields=('name', 'certifying_organisation__name')
-                )
+            data = serializers.serialize(
+                training_centers,
+                geometry_field="location",
+                fields=("name", "certifying_organisation__name"),
             )
             return Response(json.loads(data))
         except Project.DoesNotExist:
             return HttpResponse(
-                'Project does not exist.',
-                status=status.HTTP_400_BAD_REQUEST
+                "Project does not exist.", status=status.HTTP_400_BAD_REQUEST
             )
 
 
-class GetTrainingCenterOrganisationLocation(APIView):
+class GetTrainingCenterOrganisationLocation(
+    ActiveCertifyingOrganisationRequiredMixin, APIView
+):
     """API returns GeoJSON location of training center within
     a certifying organisation.
 
     """
 
     def get(self, request, organisation_slug):
         try:
-            project = Project.objects.get(slug='qgis')
+            project = Project.objects.get(slug="qgis")
             organisation = CertifyingOrganisation.objects.get(
-                slug=organisation_slug,
-                project=project
+                slug=organisation_slug, project=project
             )
             training_centers = TrainingCenter.objects.filter(
                 certifying_organisation=organisation
-            ).order_by('name')
+            ).order_by("name")
             serializers = CustomSerializer()
-            data = (
-                serializers.serialize(
-                    training_centers,
-                    geometry_field='location',
-                    fields=('name', 'certifying_organisation__name')
-                )
+            data = serializers.serialize(
+                training_centers,
+                geometry_field="location",
+                fields=("name", "certifying_organisation__name"),
             )
             return Response(json.loads(data))
         except Project.DoesNotExist:
             return HttpResponse(
-                'Project does not exist.',
-                status=status.HTTP_400_BAD_REQUEST
+                "Project does not exist.", status=status.HTTP_400_BAD_REQUEST
             )

django_project/certification/mixins.py

@@ -0,0 +1,16 @@
+from certification.models import CertifyingOrganisation
+from django.http import Http404
+
+
+class ActiveCertifyingOrganisationRequiredMixin:
+    """Mixin to ensure that the certifyin organisation is not archived."""
+
+    def dispatch(self, request, *args, **kwargs):
+        organisation_slug = kwargs.get("organisation_slug") or kwargs.get("slug")
+        try:
+            organisation = CertifyingOrganisation.objects.get(slug=organisation_slug)
+        except CertifyingOrganisation.DoesNotExist:
+            raise Http404("Organisation does not exist.")
+        if organisation.is_archived:
+            raise Http404("This organisation is archived.")
+        return super().dispatch(request, *args, **kwargs)