Revert "feat: ENT-7553 Added Academies api for MFEs"

This reverts commit f730c51.

enterprise_catalog/apps/api/v1/serializers.py

@@ -4,7 +4,6 @@
 from django.db import IntegrityError, models
 from rest_framework import serializers, status
 
-from enterprise_catalog.apps.academy.models import Academy, Tag
 from enterprise_catalog.apps.api.v1.utils import (
     get_enterprise_utm_context,
     get_most_recent_modified_time,
@@ -393,25 +392,3 @@ def get_highlight_sets(self, obj):
             }
             for highlight_set in catalog_highlight_sets
         ]
-
-
-class TagsSerializer(serializers.ModelSerializer):
-    """
-    Serializer for the `Tag` model.
-    """
-    class Meta:
-        model = Tag
-        fields = '__all__'
-
-
-class AcademySerializer(serializers.ModelSerializer):
-    """
-    Serializer for the `Academy` model.
-    """
-    enterprise_catalogs = EnterpriseCatalogSerializer(many=True)
-    tags = TagsSerializer(many=True)
-
-    class Meta:
-        model = Academy
-        fields = '__all__'
-        lookup_field = 'uuid'

enterprise_catalog/apps/api/v1/tests/test_views.py

@@ -10,14 +10,12 @@
 import pytz
 from django.conf import settings
 from django.db import IntegrityError
-from django.utils.http import urlencode
 from django.utils.text import slugify
 from rest_framework import status
 from rest_framework.reverse import reverse
 from rest_framework.settings import api_settings
 from six.moves.urllib.parse import quote_plus
 
-from enterprise_catalog.apps.academy.tests.factories import AcademyFactory
 from enterprise_catalog.apps.api.v1.serializers import ContentMetadataSerializer
 from enterprise_catalog.apps.api.v1.tests.mixins import APITestMixin
 from enterprise_catalog.apps.api.v1.utils import is_any_course_run_active
@@ -2314,55 +2312,3 @@ def test_content_metadata_delete_not_implemented(self):
         """
         response = self.client.delete(urljoin(self.url, f"{self.content_key_1}/"))
         assert response.status_code == 405
-
-
-@ddt.ddt
-class AcademiesViewSetTests(APITestMixin):
-    """
-    Tests for the AcademyViewSet.
-    """
-    def setUp(self):
-        super().setUp()
-        self.set_up_catalog_learner()
-        self.academy1 = AcademyFactory()
-        self.academy2 = AcademyFactory()
-        self.enterprise_catalog_query = CatalogQueryFactory(uuid=uuid.uuid4())
-        self.enterprise_catalog1 = EnterpriseCatalogFactory(catalog_query=self.enterprise_catalog_query)
-        self.enterprise_catalog1.academies.add(self.academy1)
-        self.enterprise_catalog2 = EnterpriseCatalogFactory(catalog_query=self.enterprise_catalog_query)
-        self.enterprise_catalog2.academies.add(self.academy2)
-
-    @mock.patch('enterprise_catalog.apps.api_client.enterprise_cache.EnterpriseApiClient')
-    def test_list_for_academies(self, mock_client):  # pylint: disable=unused-argument
-        """
-        Verify the viewset returns enterprise specific academies
-        """
-        params = {
-            'enterprise_customer': str(self.enterprise_catalog2.enterprise_customer.uuid)
-        }
-        url = reverse('api:v1:academies-list') + '?{}'.format(urlencode(params))
-        response = self.client.get(url)
-        self.assertEqual(response.status_code, status.HTTP_200_OK)
-        self.assertEqual(response.data['count'], 1)
-        results = response.data['results']
-        self.assertEqual(uuid.UUID(results[0]['uuid']), self.academy2.uuid)
-
-    def test_retrieve_for_academies(self):
-        """
-        Verify the viewset retrieves an academy
-        """
-        url = reverse('api:v1:academies-detail', kwargs={
-            'uuid': self.academy2.uuid,
-        })
-        response = self.client.get(url)
-        self.assertEqual(response.status_code, status.HTTP_200_OK)
-        self.assertEqual(uuid.UUID(response.data['uuid']), self.academy2.uuid)
-
-    def test_list_with_missing_enterprise_customer(self):
-        """
-        Verify the viewset returns no records when enterprise customer is missing in params
-        """
-        url = reverse('api:v1:academies-list')
-        response = self.client.get(url)
-        self.assertEqual(response.status_code, status.HTTP_200_OK)
-        self.assertEqual(response.data['count'], 0)

enterprise_catalog/apps/api/v1/urls.py

@@ -4,9 +4,6 @@
 from django.urls import path, re_path
 from rest_framework.routers import DefaultRouter
 
-from enterprise_catalog.apps.api.v1.views.academies import (
-    AcademiesReadOnlyViewSet,
-)
 from enterprise_catalog.apps.api.v1.views.catalog_csv import CatalogCsvView
 from enterprise_catalog.apps.api.v1.views.catalog_csv_data import (
     CatalogCsvDataView,
@@ -56,7 +53,6 @@
 router.register(r'enterprise-curations-admin', EnterpriseCurationConfigViewSet, basename='enterprise-curations-admin')
 router.register(r'highlight-sets', HighlightSetReadOnlyViewSet, basename='highlight-sets')
 router.register(r'highlight-sets-admin', HighlightSetViewSet, basename='highlight-sets-admin')
-router.register(r'academies', AcademiesReadOnlyViewSet, basename='academies')
 
 urlpatterns = [
     path('enterprise-catalogs/catalog_csv_data', CatalogCsvDataView.as_view(),
@@ -71,12 +67,6 @@
     path('enterprise-catalogs/catalog_workbook', CatalogWorkbookView.as_view(),
          name='catalog-workbook'
          ),
-    path('academies', AcademiesReadOnlyViewSet.as_view({'get': 'list'}),
-         name='academies-list'
-         ),
-    path('academies/<uuid:uuid>/', AcademiesReadOnlyViewSet.as_view({'get': 'retrieve'}),
-         name='academies-detail'
-         ),
     re_path(
         r'^enterprise-catalogs/(?P<uuid>[\S]+)/get_content_metadata',
         EnterpriseCatalogGetContentMetadata.as_view({'get': 'get'}),