edx-enterprise-data 9.2.0__py3-none-any.whl → 9.2.1__py3-none-any.whl

{edx_enterprise_data-9.2.0.dist-info → edx_enterprise_data-9.2.1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: edx-enterprise-data
-Version: 9.2.0
+Version: 9.2.1
 Summary: Enterprise Reporting
 Home-page: https://github.com/openedx/edx-enterprise-data
 Author: edX

{edx_enterprise_data-9.2.0.dist-info → edx_enterprise_data-9.2.1.dist-info}/RECORD

@@ -1,4 +1,4 @@
-enterprise_data/__init__.py,sha256=lw4RdMlnQpEaiuEI442W84A9nCk5Y2AFB3wxyg2DhY0,123
+enterprise_data/__init__.py,sha256=KS1OhKyx-0mFThb9u4NNxgV6czgcEVQvwYjdMMkap5Y,123
 enterprise_data/apps.py,sha256=aF6hZwDfI2oWj95tUTm_2ikHueQj-jLj-u0GrgzpsQI,414
 enterprise_data/clients.py,sha256=GvQupy5TVYfO_IKC3yzXSAgNP54r-PtIjidM5ws9Iks,3947
 enterprise_data/constants.py,sha256=uCKjfpdlMYFZJsAj3n9RMw4Cmg5_6s3NuwocO-fch3s,238
@@ -39,7 +39,7 @@ enterprise_data/api/v1/views/analytics_enrollments.py,sha256=HXgoFwvXk-CZcf6qbVO
 enterprise_data/api/v1/views/analytics_leaderboard.py,sha256=zwd-2A2sctjAdx5BUjCqiwcZ5aNvM8wfm386pR-RwGQ,4114
 enterprise_data/api/v1/views/base.py,sha256=Kkmd5zgEBAhvwS_GoGXSK6lgbDNwSPioYn-QbnizI3w,3416
 enterprise_data/api/v1/views/enterprise_admin.py,sha256=DsR1oHFhe6LCIFjIJ4YLLZ7PUChvNlFfdZD-sxHoijY,7388
-enterprise_data/api/v1/views/enterprise_learner.py,sha256=E1eU0DgCIhe4Bx70uZku89-RwEKay4aYt7X0IbPhJzA,18650
+enterprise_data/api/v1/views/enterprise_learner.py,sha256=xy9DwCy2eYLnb0z3XolOstxf9faIPHG2aXUXSuWrodM,19231
 enterprise_data/api/v1/views/enterprise_offers.py,sha256=VifxgqTLFLVw4extYPlHcN1N_yjXcsYsAlYEnAbpb10,1266
 enterprise_data/fixtures/enterprise_enrollment.json,sha256=6onPXXR29pMdTdbl_mn81sDi3Re5jkLUZz2TPMB_1IY,5786
 enterprise_data/fixtures/enterprise_user.json,sha256=6g8GvNY9j_fh1dvAU80bTAMI2F5vXCkb8a4UjsftMvQ,1970
@@ -167,8 +167,8 @@ enterprise_reporting/tests/test_send_enterprise_reports.py,sha256=WtL-RqGgu2x5PP
 enterprise_reporting/tests/test_utils.py,sha256=Zt_TA0LVb-B6fQGkUkAKKVlUKKnQh8jnw1US1jKe7g8,9493
 enterprise_reporting/tests/test_vertica_client.py,sha256=-R2yNCGUjRtoXwLMBloVFQkFYrJoo613VCr61gwI3kQ,140
 enterprise_reporting/tests/utils.py,sha256=xms2LM7DV3wczXEfctOK1ddel1EE0J_YSr17UzbCDy4,1401
-edx_enterprise_data-9.2.0.dist-info/LICENSE,sha256=dql8h4yceoMhuzlcK0TT_i-NgTFNIZsgE47Q4t3dUYI,34520
-edx_enterprise_data-9.2.0.dist-info/METADATA,sha256=Y3R-klk-iA_cgSs0EiuD_zzzPnx-4_JBwF9ZMrirwpg,1569
-edx_enterprise_data-9.2.0.dist-info/WHEEL,sha256=R0nc6qTxuoLk7ShA2_Y-UWkN8ZdfDBG2B6Eqpz2WXbs,91
-edx_enterprise_data-9.2.0.dist-info/top_level.txt,sha256=f5F2kU-dob6MqiHJpgZkFzoCD5VMhsdpkTV5n9Tvq3I,59
-edx_enterprise_data-9.2.0.dist-info/RECORD,,
+edx_enterprise_data-9.2.1.dist-info/LICENSE,sha256=dql8h4yceoMhuzlcK0TT_i-NgTFNIZsgE47Q4t3dUYI,34520
+edx_enterprise_data-9.2.1.dist-info/METADATA,sha256=ThIreeBfPl0yvMU4JURsx2TnlXEizu5eCi6f38iAr2A,1569
+edx_enterprise_data-9.2.1.dist-info/WHEEL,sha256=R0nc6qTxuoLk7ShA2_Y-UWkN8ZdfDBG2B6Eqpz2WXbs,91
+edx_enterprise_data-9.2.1.dist-info/top_level.txt,sha256=f5F2kU-dob6MqiHJpgZkFzoCD5VMhsdpkTV5n9Tvq3I,59
+edx_enterprise_data-9.2.1.dist-info/RECORD,,

enterprise_data/__init__.py

@@ -2,4 +2,4 @@
 Enterprise data api application. This Django app exposes API endpoints used by enterprises.
 """
 
-__version__ = "9.2.0"
+__version__ = "9.2.1"

enterprise_data/api/v1/views/enterprise_learner.py

@@ -6,6 +6,7 @@ from datetime import date, timedelta
 from logging import getLogger
 from uuid import UUID
 
+from edx_django_utils.cache import TieredCache
 from rest_framework import filters, viewsets
 from rest_framework.decorators import action
 from rest_framework.response import Response
@@ -18,12 +19,13 @@ from django.db.models.functions import Coalesce
 from django.http import StreamingHttpResponse
 from django.utils import timezone
 
+from enterprise_data.admin_analytics.database.utils import LOGGER
 from enterprise_data.api.v1 import serializers
 from enterprise_data.filters import AuditEnrollmentsFilterBackend, AuditUsersEnrollmentFilterBackend
 from enterprise_data.models import EnterpriseLearner, EnterpriseLearnerEnrollment
 from enterprise_data.paginators import EnterpriseEnrollmentsPagination
 from enterprise_data.renderers import EnrollmentsCSVRenderer
-from enterprise_data.utils import subtract_one_month
+from enterprise_data.utils import get_cache_key, subtract_one_month
 
 from .base import EnterpriseViewSetMixin
 
@@ -82,19 +84,26 @@ class EnterpriseLearnerEnrollmentViewSet(EnterpriseViewSetMixin, viewsets.ReadOn
         enterprise_customer_uuid = self.kwargs['enterprise_id']
 
         # TODO: Created a ticket ENT0-9531 to fix the cache issue
-        # Reason for Comenting cache: Remove the cache for this ViewSet
-        # becuae the cache is not working as expected
-        # cache_key = get_cache_key(
-        #     resource='enterprise-learner',
-        #     enterprise_customer=enterprise_customer_uuid,
-        # )
-        # cached_response = TieredCache.get_cached_response(cache_key)
-        # if cached_response.is_found:
-        #     return cached_response.value
-        # else:
+        # Temporary logging to test cache issue
+        try:
+            LOGGER.info("Trying to get Learner Enrollment data from Cache")
+            cache_key = get_cache_key(
+                resource='enterprise-learner',
+                enterprise_customer=enterprise_customer_uuid,
+            )
+            cached_response = TieredCache.get_cached_response(cache_key)
+            if cached_response.is_found:
+                LOGGER.info("Learner Enrollment data found in Cache for Enterprise: [%s]", enterprise_customer_uuid)
+            else:
+                LOGGER.info("Learner Enrollment data not found in Cache for Enterprise: [%s]", enterprise_customer_uuid)
+                TieredCache.set_all_tiers(cache_key, 'dummy_enrollments', DEFAULT_LEARNER_CACHE_TIMEOUT)
+                LOGGER.info("Cache set for Enterprise: [%s] whose key is: [%s]", enterprise_customer_uuid, cache_key)
+        except Exception as e:
+            LOGGER.error("Memcached connection test failed: %s", e)
+
         enrollments = EnterpriseLearnerEnrollment.objects.filter(enterprise_customer_uuid=enterprise_customer_uuid)
         enrollments = self.apply_filters(enrollments)
-        # TieredCache.set_all_tiers(cache_key, enrollments, DEFAULT_LEARNER_CACHE_TIMEOUT)
+
         return enrollments
 
     def list(self, request, *args, **kwargs):