temp: fix implementation

enterprise/api/v1/serializers.py

@@ -17,6 +17,7 @@
 from django.contrib import auth
 from django.contrib.sites.models import Site
 from django.core import exceptions as django_exceptions
+from django.db import models as django_models
 from django.utils.translation import gettext_lazy as _
 
 from enterprise import models, utils
@@ -40,6 +41,16 @@
 )
 from enterprise.validators import validate_pgp_key
 
+try:
+    from common.djangoapps.student.models import CourseEnrollment
+except ImportError:
+    CourseEnrollment = None
+
+try:
+    from openedx.core.djangoapps.content.course_overviews.models import CourseOverview
+except ImportError:
+    CourseOverview = None
+
 LOGGER = getLogger(__name__)
 User = auth.get_user_model()
 
@@ -327,18 +338,52 @@ class Meta:
         fields = (
             'enterprise_customer_user',
             'course_id',
-            'enrollment_date',
-            'enrollment_track',
-            'user_email',
-            'course_start',
-            'course_end',
         )
 
-    enrollment_track = serializers.CharField()
-    enrollment_date = serializers.DateTimeField()
-    user_email = serializers.EmailField()
-    course_start = serializers.DateTimeField()
-    course_end = serializers.DateTimeField()
+
+class EnterpriseCourseEnrollmentWithAdditionalFieldsReadOnlySerializer(EnterpriseCourseEnrollmentReadOnlySerializer):
+    """
+    Serializer for EnterpriseCourseEnrollment model with additional fields.
+    """
+
+    def to_representation(self, instance):
+        representation = super().to_representation(instance)
+        representation.update(self._get_additional_fields(instance))
+        return representation
+
+    def _get_additional_fields(self, instance):
+        """
+        Return annotations with additional data for the queryset.
+        Additional fields are None in the test environment, where platform models are not available.
+        """
+
+        if not CourseEnrollment or not CourseOverview:
+            return {
+                'enrollment_track': None,
+                'enrollment_date': None,
+                'user_email': None,
+                'course_start': None,
+                'course_end': None,
+            }
+
+        user = auth.get_user_model().objects.filter(
+            id=instance.enterprise_customer_user.user_id,
+        ).first()
+        enrollment = CourseEnrollment.objects.filter(
+            user=user,
+            course_id=instance.course_id,
+        ).first()
+        course_overview = CourseOverview.objects.filter(
+            id=instance.course_id,
+        ).first()
+
+        return {
+            'enrollment_track': getattr(enrollment, 'mode', None),
+            'enrollment_date': getattr(enrollment, 'created', None),
+            'user_email': getattr(user, 'email', None),
+            'course_start': getattr(course_overview, 'start', None),
+            'course_end': getattr(course_overview, 'end', None),
+        }
 
 
 class EnterpriseCourseEnrollmentWriteSerializer(serializers.ModelSerializer):

enterprise/api/v1/views.py

@@ -546,7 +546,7 @@ def get_serializer_class(self):
         Use a special serializer for any requests that aren't read-only.
         """
         if self.request.method in ('GET',):
-            return serializers.EnterpriseCourseEnrollmentReadOnlySerializer
+            return serializers.EnterpriseCourseEnrollmentWithAdditionalFieldsReadOnlySerializer
         return serializers.EnterpriseCourseEnrollmentWriteSerializer
 
 

enterprise/models.py

@@ -87,11 +87,6 @@
 except ImportError:
     CourseEntitlement = None
 
-try:
-    from openedx.core.djangoapps.content.course_overviews.models import CourseOverview
-except ImportError:
-    CourseOverview = None
-
 LOGGER = getLogger(__name__)
 User = auth.get_user_model()
 mark_safe_lazy = lazy(mark_safe, str)
@@ -1789,42 +1784,8 @@ def get_queryset(self):
 
         return super().get_queryset().select_related('enterprise_customer_user').filter(
             enterprise_customer_user__linked=True
-        ).annotate(**self._get_additional_data_annotations())
-
-    def _get_additional_data_annotations(self):
-        """
-        Return annotations with additional data for the queryset.
-        Additional fields are None in the test environment, where platform models are not available.
-        """
-
-        if not CourseEnrollment or not CourseOverview:
-            return {
-                'enrollment_track': models.Value(None, output_field=models.CharField()),
-                'enrollment_date': models.Value(None, output_field=models.DateTimeField()),
-                'user_email': models.Value(None, output_field=models.EmailField()),
-                'course_start': models.Value(None, output_field=models.DateTimeField()),
-                'course_end': models.Value(None, output_field=models.DateTimeField()),
-            }
-
-        enrollment_subquery = CourseEnrollment.objects.filter(
-            user=models.OuterRef('enterprise_customer_user__user_id'),
-            course_id=models.OuterRef('course_id'),
-        )
-        user_subquery = auth.get_user_model().objects.filter(
-            id=models.OuterRef('enterprise_customer_user__user_id'),
-        ).values('email')[:1]
-        course_subquery = CourseOverview.objects.filter(
-            id=models.OuterRef('course_id'),
         )
 
-        return {
-            'enrollment_track': models.Subquery(enrollment_subquery.values('mode')[:1]),
-            'enrollment_date': models.Subquery(enrollment_subquery.values('created')[:1]),
-            'user_email': models.Subquery(user_subquery),
-            'course_start': models.Subquery(course_subquery.values('start')[:1]),
-            'course_end': models.Subquery(course_subquery.values('end')[:1]),
-        }
-
 
 class EnterpriseCourseEnrollment(TimeStampedModel):
     """