edx-enterprise-data 8.2.0__tar.gz → 8.3.0__tar.gz

{edx_enterprise_data-8.2.0 → edx_enterprise_data-8.3.0}/CHANGELOG.rst

@@ -15,6 +15,10 @@ Unreleased
 ----------
 
 =========================
+[8.3.0] - 2024-07-25
+---------------------
+  * refactor: Refactor code to avoid error conditions.
+
 [8.2.0] - 2024-07-25
 ---------------------
   * Added a new API endpoint to get admin analytics aggregated data on user enrollment and engagement.

{edx_enterprise_data-8.2.0/edx_enterprise_data.egg-info → edx_enterprise_data-8.3.0}/PKG-INFO

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

{edx_enterprise_data-8.2.0 → edx_enterprise_data-8.3.0/edx_enterprise_data.egg-info}/PKG-INFO

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

{edx_enterprise_data-8.2.0 → edx_enterprise_data-8.3.0}/edx_enterprise_data.egg-info/SOURCES.txt

@@ -21,7 +21,6 @@ enterprise_data/signals.py
 enterprise_data/urls.py
 enterprise_data/utils.py
 enterprise_data/admin_analytics/__init__.py
-enterprise_data/admin_analytics/constants.py
 enterprise_data/admin_analytics/data_loaders.py
 enterprise_data/admin_analytics/database.py
 enterprise_data/admin_analytics/utils.py

{edx_enterprise_data-8.2.0 → edx_enterprise_data-8.3.0}/enterprise_data/__init__.py

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

{edx_enterprise_data-8.2.0 → edx_enterprise_data-8.3.0}/enterprise_data/admin_analytics/database.py

@@ -4,12 +4,31 @@ Utility functions for interacting with the database.
 from contextlib import closing
 from logging import getLogger
 
-from enterprise_data.admin_analytics.constants import DATABASE_CONNECTION_CONFIG, DATABASE_CONNECTOR
+from mysql.connector import connect
+
+from django.conf import settings
+
 from enterprise_data.utils import timeit
 
 LOGGER = getLogger(__name__)
 
 
+def get_db_connection(database=settings.ENTERPRISE_REPORTING_DB_ALIAS):
+    """
+    Get a connection to the database.
+
+    Returns:
+        (mysql.connector.connection.MySQLConnection): The database connection.
+    """
+    return connect(
+        host=settings.DATABASES[database]['HOST'],
+        port=settings.DATABASES[database]['PORT'],
+        database=settings.DATABASES[database]['NAME'],
+        user=settings.DATABASES[database]['USER'],
+        password=settings.DATABASES[database]['PASSWORD'],
+    )
+
+
 @timeit
 def run_query(query):
     """
@@ -22,7 +41,7 @@ def run_query(query):
         (list): The results of the query.
     """
     try:
-        with closing(DATABASE_CONNECTOR(**DATABASE_CONNECTION_CONFIG)) as connection:
+        with closing(get_db_connection()) as connection:
             with closing(connection.cursor()) as cursor:
                 cursor.execute(query)
                 return cursor.fetchall()

edx_enterprise_data-8.2.0/enterprise_data/admin_analytics/constants.py

@@ -1,15 +0,0 @@
-"""
-Constants for admin analytics.
-"""
-import mysql.connector
-
-from django.conf import settings
-
-DATABASE_CONNECTION_CONFIG = {
-    'host': settings.DATABASES[settings.ENTERPRISE_REPORTING_DB_ALIAS]['HOST'],
-    'port': settings.DATABASES[settings.ENTERPRISE_REPORTING_DB_ALIAS]['PORT'],
-    'database': settings.DATABASES[settings.ENTERPRISE_REPORTING_DB_ALIAS]['NAME'],
-    'user': settings.DATABASES[settings.ENTERPRISE_REPORTING_DB_ALIAS]['USER'],
-    'password': settings.DATABASES[settings.ENTERPRISE_REPORTING_DB_ALIAS]['PASSWORD'],
-}
-DATABASE_CONNECTOR = mysql.connector.connect