Merge pull request #312 from openedx/iahmad/ENT-5804

feat: Added total_learning_time_seconds field in EnterpriseLearnerEnrollment

CHANGELOG.rst

@@ -15,6 +15,10 @@ Unreleased
 ----------
 
 =========================
+[4.2.6] - 2022-06-09
+---------------------
+  * Add `total_learning_time_seconds` field in EnterpriseLearnerEnrollment
+
 [4.2.5] - 2022-04-22
 ---------------------
   * Rename base class to a more appropriate name

enterprise_data/__init__.py

@@ -2,6 +2,6 @@
 Enterprise data api application. This Django app exposes API endpoints used by enterprises.
 """
 
-__version__ = "4.2.5"
+__version__ = "4.2.6"
 
 default_app_config = "enterprise_data.apps.EnterpriseDataAppConfig"  # pylint: disable=invalid-name

enterprise_data/api/v1/serializers.py

@@ -2,7 +2,6 @@
 Serializers for enterprise api v1.
 """
 
-
 from rest_framework import serializers
 
 from enterprise_data.models import EnterpriseLearner, EnterpriseLearnerEnrollment
@@ -14,6 +13,7 @@ class EnterpriseLearnerEnrollmentSerializer(serializers.ModelSerializer):
     """
     course_api_url = serializers.SerializerMethodField()
     enterprise_user_id = serializers.SerializerMethodField()
+    total_learning_time_hours = serializers.SerializerMethodField()
 
     class Meta:
         model = EnterpriseLearnerEnrollment
@@ -32,7 +32,7 @@ class Meta:
             'last_activity_date', 'progress_status', 'passed_date', 'current_grade',
             'letter_grade', 'enterprise_user_id', 'user_email', 'user_account_creation_date',
             'user_country_code', 'user_username', 'enterprise_name', 'enterprise_customer_uuid',
-            'enterprise_sso_uid', 'created', 'course_api_url',
+            'enterprise_sso_uid', 'created', 'course_api_url', 'total_learning_time_hours',
         )
 
     def get_course_api_url(self, obj):
@@ -45,6 +45,10 @@ def get_enterprise_user_id(self, obj):
         """Returns enterprise user id of a learner's enrollment"""
         return obj.enterprise_user_id
 
+    def get_total_learning_time_hours(self, obj):
+        """Returns the learners total learning time in hours"""
+        return round(obj.total_learning_time_seconds/3600.0, 2)
+
 
 class EnterpriseLearnerSerializer(serializers.ModelSerializer):
     """

enterprise_data/api/v1/views.py

@@ -84,7 +84,7 @@ class EnterpriseLearnerEnrollmentViewSet(EnterpriseViewSetMixin, viewsets.ReadOn
         'last_activity_date', 'progress_status', 'passed_date', 'current_grade',
         'letter_grade', 'enterprise_user_id', 'user_email', 'user_account_creation_date',
         'user_country_code', 'user_username', 'enterprise_name', 'enterprise_customer_uuid',
-        'enterprise_sso_uid', 'created', 'course_api_url',
+        'enterprise_sso_uid', 'created', 'course_api_url', 'total_learning_time_hours',
     ]
 
     def get_renderer_context(self):

enterprise_data/migrations/0027_enterpriselearnerenrollment_total_learning_time_seconds.py

@@ -0,0 +1,18 @@
+# Generated by Django 3.2.12 on 2022-06-09 10:49
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('enterprise_data', '0026_auto_20210916_0414'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='enterpriselearnerenrollment',
+            name='total_learning_time_seconds',
+            field=models.PositiveIntegerField(default=0),
+        ),
+    ]

enterprise_data/models.py

@@ -102,6 +102,7 @@ class Meta:
     course_primary_subject = models.CharField(max_length=255, null=True)
     has_passed = models.BooleanField(default=False)
     last_activity_date = models.DateField(null=True, db_index=True)
+    total_learning_time_seconds = models.PositiveIntegerField(default=0)
     progress_status = models.CharField(max_length=255, null=True)
     passed_date = models.DateField(null=True)
     current_grade = models.FloatField(null=True)