Use project detail endpoint with admin serializer

Add the `environment_variables` field to this serializer that will be
returned only when the user is admin.

Author: humitos

readthedocs/projects/models.py

@@ -900,6 +900,7 @@ class Meta:
 
     def __init__(self, *args, **kwargs):
         self.features = kwargs.pop('features', [])
+        self.environment_variables = kwargs.pop('environment_variables', {})
         ad_free = (not kwargs.pop('show_advertising', True))
         # These fields only exist on the API return, not on the model, so we'll
         # remove them to avoid throwing exceptions due to unexpected fields
@@ -1115,14 +1116,14 @@ def get_feature_display(self):
 class EnvironmentVariable(TimeStampedModel, models.Model):
     name = models.CharField(
         max_length=128,
-        help_text='Name of the environment variable',
+        help_text=_('Name of the environment variable'),
     )
     value = models.CharField(
         max_length=256,
-        help_text='Value of the environment variable',
+        help_text=_('Value of the environment variable'),
     )
     project = models.ForeignKey(
         Project,
         on_delete=models.CASCADE,
-        help_text='Project where this variable will be used',
+        help_text=_('Project where this variable will be used'),
     )

readthedocs/projects/tasks.py

@@ -630,9 +630,7 @@ def get_env_vars(self):
             })
 
         # Update environment from Project's specific environment variables
-        env.update(
-            api_v2.project(self.project.pk).environment_variables().get(),
-        )
+        env.update(self.project.environment_variables)
 
         return env
 

readthedocs/restapi/serializers.py

@@ -44,10 +44,17 @@ class ProjectAdminSerializer(ProjectSerializer):
     )
 
     show_advertising = serializers.SerializerMethodField()
+    environment_variables = serializers.SerializerMethodField()
 
     def get_show_advertising(self, obj):
         return obj.show_advertising
 
+    def get_environment_variables(self, obj):
+        return {
+            variable.name: variable.value
+            for variable in obj.environmentvariable_set.all()
+        }
+
     class Meta(ProjectSerializer.Meta):
         fields = ProjectSerializer.Meta.fields + (
             'enable_epub_build',
@@ -68,6 +75,7 @@ class Meta(ProjectSerializer.Meta):
             'has_valid_clone',
             'has_valid_webhook',
             'show_advertising',
+            'environment_variables',
         )
 
 

readthedocs/restapi/views/model_views.py

@@ -117,13 +117,6 @@ def valid_versions(self, request, **kwargs):
             'flat': version_strings,
         })
 
-    @detail_route(permission_classes=[permissions.IsAdminUser])
-    def environment_variables(self, request, *_, **__):
-        return Response({
-            env.name: env.value
-            for env in self.get_object().environmentvariable_set.all()
-        })
-
     @detail_route()
     def translations(self, *_, **__):
         translations = self.get_object().translations.all()