From 627b71b96c3b62b8d03fbb99d12b1659234dedaf Mon Sep 17 00:00:00 2001 From: Matt Hughes Date: Thu, 4 Nov 2021 14:31:35 -0400 Subject: [PATCH] build: program fixtures now exclude language tags (also hopefully exclude their translations) rationale is that the languages are created primarily through migrations (which is a weird practice for picklist tables, y'all!), so it's not really necessary to recreate them. I'm a bit worried about that approach, though, since not all languages defined in production discovery are created on a fresh provision, but it seems very likely that this will cover our use case so /shrug --- .../apps/edx_catalog_extensions/api/v1/tests/test_views.py | 2 -- course_discovery/apps/edx_catalog_extensions/api/v1/views.py | 3 ++- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/course_discovery/apps/edx_catalog_extensions/api/v1/tests/test_views.py b/course_discovery/apps/edx_catalog_extensions/api/v1/tests/test_views.py index 534cfb9a28..ccaa110be1 100644 --- a/course_discovery/apps/edx_catalog_extensions/api/v1/tests/test_views.py +++ b/course_discovery/apps/edx_catalog_extensions/api/v1/tests/test_views.py @@ -26,7 +26,6 @@ from course_discovery.apps.edx_catalog_extensions.api.v1.views import ( DistinctCountsAggregateSearchViewSet, ProgramFixtureView ) -from course_discovery.apps.ietf_language_tags.models import LanguageTag class DistinctCountsAggregateSearchViewSetTests(SerializationMixin, LoginMixin, @@ -356,7 +355,6 @@ def test_200(self): LevelType: (5, 15), LevelTypeTranslation: (1, 100), Video: (20, 60), - LanguageTag: (10, 30), } actual_appearances_by_model_label = defaultdict(set) diff --git a/course_discovery/apps/edx_catalog_extensions/api/v1/views.py b/course_discovery/apps/edx_catalog_extensions/api/v1/views.py index 3ba0b2167c..30e7de32c3 100644 --- a/course_discovery/apps/edx_catalog_extensions/api/v1/views.py +++ b/course_discovery/apps/edx_catalog_extensions/api/v1/views.py @@ -18,6 +18,7 @@ ) from course_discovery.apps.edx_catalog_extensions.api.serializers import DistinctCountsAggregateFacetSearchSerializer from course_discovery.apps.edx_elasticsearch_dsl_extensions.distinct_counts.query import DistinctCountsSearchQuerySet +from course_discovery.apps.ietf_language_tags.models import LanguageTag logger = logging.getLogger(__name__) @@ -143,7 +144,7 @@ def load_program_fixture(programs): CourseRun: set(course_run_pks), CurriculumCourseRunExclusion: set(exclusion_pks), } - excluded_models = {Site, Partner, User} + excluded_models = {Site, Partner, User, LanguageTag} return load_related(pks_to_load, excluded_models)