edx-enterprise-data 8.12.1__tar.gz → 8.13.0__tar.gz

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (202) hide show
  1. {edx_enterprise_data-8.12.1 → edx_enterprise_data-8.13.0}/CHANGELOG.rst +4 -0
  2. {edx_enterprise_data-8.12.1/edx_enterprise_data.egg-info → edx_enterprise_data-8.13.0}/PKG-INFO +1 -1
  3. {edx_enterprise_data-8.12.1 → edx_enterprise_data-8.13.0/edx_enterprise_data.egg-info}/PKG-INFO +1 -1
  4. {edx_enterprise_data-8.12.1 → edx_enterprise_data-8.13.0}/edx_enterprise_data.egg-info/SOURCES.txt +2 -0
  5. {edx_enterprise_data-8.12.1 → edx_enterprise_data-8.13.0}/enterprise_data/__init__.py +1 -1
  6. {edx_enterprise_data-8.12.1 → edx_enterprise_data-8.13.0}/enterprise_data/admin_analytics/data_loaders.py +0 -48
  7. edx_enterprise_data-8.13.0/enterprise_data/admin_analytics/database/queries/skills_daily_rollup_admin_dash.py +118 -0
  8. {edx_enterprise_data-8.12.1 → edx_enterprise_data-8.13.0}/enterprise_data/admin_analytics/database/tables/__init__.py +1 -0
  9. edx_enterprise_data-8.13.0/enterprise_data/admin_analytics/database/tables/skills_daily_rollup_admin_dash.py +94 -0
  10. {edx_enterprise_data-8.12.1 → edx_enterprise_data-8.13.0}/enterprise_data/admin_analytics/utils.py +0 -171
  11. {edx_enterprise_data-8.12.1 → edx_enterprise_data-8.13.0}/enterprise_data/api/v1/views/enterprise_admin.py +25 -56
  12. {edx_enterprise_data-8.12.1 → edx_enterprise_data-8.13.0}/enterprise_data/tests/admin_analytics/mock_analytics_data.py +56 -0
  13. {edx_enterprise_data-8.12.1 → edx_enterprise_data-8.13.0}/enterprise_data/tests/admin_analytics/test_data_loaders.py +1 -30
  14. edx_enterprise_data-8.13.0/enterprise_data/tests/admin_analytics/test_utils.py +102 -0
  15. edx_enterprise_data-8.13.0/enterprise_data/tests/api/v1/views/test_enterprise_admin.py +247 -0
  16. edx_enterprise_data-8.12.1/enterprise_data/tests/admin_analytics/test_utils.py +0 -241
  17. edx_enterprise_data-8.12.1/enterprise_data/tests/api/v1/views/test_enterprise_admin.py +0 -158
  18. {edx_enterprise_data-8.12.1 → edx_enterprise_data-8.13.0}/LICENSE +0 -0
  19. {edx_enterprise_data-8.12.1 → edx_enterprise_data-8.13.0}/MANIFEST.in +0 -0
  20. {edx_enterprise_data-8.12.1 → edx_enterprise_data-8.13.0}/README.md +0 -0
  21. {edx_enterprise_data-8.12.1 → edx_enterprise_data-8.13.0}/edx_enterprise_data.egg-info/dependency_links.txt +0 -0
  22. {edx_enterprise_data-8.12.1 → edx_enterprise_data-8.13.0}/edx_enterprise_data.egg-info/not-zip-safe +0 -0
  23. {edx_enterprise_data-8.12.1 → edx_enterprise_data-8.13.0}/edx_enterprise_data.egg-info/requires.txt +0 -0
  24. {edx_enterprise_data-8.12.1 → edx_enterprise_data-8.13.0}/edx_enterprise_data.egg-info/top_level.txt +0 -0
  25. {edx_enterprise_data-8.12.1 → edx_enterprise_data-8.13.0}/enterprise_data/admin_analytics/__init__.py +0 -0
  26. {edx_enterprise_data-8.12.1 → edx_enterprise_data-8.13.0}/enterprise_data/admin_analytics/completions_utils.py +0 -0
  27. {edx_enterprise_data-8.12.1 → edx_enterprise_data-8.13.0}/enterprise_data/admin_analytics/constants.py +0 -0
  28. {edx_enterprise_data-8.12.1 → edx_enterprise_data-8.13.0}/enterprise_data/admin_analytics/database/__init__.py +0 -0
  29. {edx_enterprise_data-8.12.1 → edx_enterprise_data-8.13.0}/enterprise_data/admin_analytics/database/queries/__init__.py +0 -0
  30. {edx_enterprise_data-8.12.1 → edx_enterprise_data-8.13.0}/enterprise_data/admin_analytics/database/queries/fact_engagement_admin_dash.py +0 -0
  31. {edx_enterprise_data-8.12.1 → edx_enterprise_data-8.13.0}/enterprise_data/admin_analytics/database/queries/fact_enrollment_admin_dash.py +0 -0
  32. {edx_enterprise_data-8.12.1 → edx_enterprise_data-8.13.0}/enterprise_data/admin_analytics/database/tables/base.py +0 -0
  33. {edx_enterprise_data-8.12.1 → edx_enterprise_data-8.13.0}/enterprise_data/admin_analytics/database/tables/fact_engagement_admin_dash.py +0 -0
  34. {edx_enterprise_data-8.12.1 → edx_enterprise_data-8.13.0}/enterprise_data/admin_analytics/database/tables/fact_enrollment_admin_dash.py +0 -0
  35. {edx_enterprise_data-8.12.1 → edx_enterprise_data-8.13.0}/enterprise_data/admin_analytics/database/utils.py +0 -0
  36. {edx_enterprise_data-8.12.1 → edx_enterprise_data-8.13.0}/enterprise_data/api/__init__.py +0 -0
  37. {edx_enterprise_data-8.12.1 → edx_enterprise_data-8.13.0}/enterprise_data/api/urls.py +0 -0
  38. {edx_enterprise_data-8.12.1 → edx_enterprise_data-8.13.0}/enterprise_data/api/v0/__init__.py +0 -0
  39. {edx_enterprise_data-8.12.1 → edx_enterprise_data-8.13.0}/enterprise_data/api/v0/serializers.py +0 -0
  40. {edx_enterprise_data-8.12.1 → edx_enterprise_data-8.13.0}/enterprise_data/api/v0/urls.py +0 -0
  41. {edx_enterprise_data-8.12.1 → edx_enterprise_data-8.13.0}/enterprise_data/api/v0/views.py +0 -0
  42. {edx_enterprise_data-8.12.1 → edx_enterprise_data-8.13.0}/enterprise_data/api/v1/__init__.py +0 -0
  43. {edx_enterprise_data-8.12.1 → edx_enterprise_data-8.13.0}/enterprise_data/api/v1/paginators.py +0 -0
  44. {edx_enterprise_data-8.12.1 → edx_enterprise_data-8.13.0}/enterprise_data/api/v1/serializers.py +0 -0
  45. {edx_enterprise_data-8.12.1 → edx_enterprise_data-8.13.0}/enterprise_data/api/v1/urls.py +0 -0
  46. {edx_enterprise_data-8.12.1 → edx_enterprise_data-8.13.0}/enterprise_data/api/v1/views/__init__.py +0 -0
  47. {edx_enterprise_data-8.12.1 → edx_enterprise_data-8.13.0}/enterprise_data/api/v1/views/analytics_engagements.py +0 -0
  48. {edx_enterprise_data-8.12.1 → edx_enterprise_data-8.13.0}/enterprise_data/api/v1/views/analytics_enrollments.py +0 -0
  49. {edx_enterprise_data-8.12.1 → edx_enterprise_data-8.13.0}/enterprise_data/api/v1/views/analytics_leaderboard.py +0 -0
  50. {edx_enterprise_data-8.12.1 → edx_enterprise_data-8.13.0}/enterprise_data/api/v1/views/base.py +0 -0
  51. {edx_enterprise_data-8.12.1 → edx_enterprise_data-8.13.0}/enterprise_data/api/v1/views/enterprise_completions.py +0 -0
  52. {edx_enterprise_data-8.12.1 → edx_enterprise_data-8.13.0}/enterprise_data/api/v1/views/enterprise_learner.py +0 -0
  53. {edx_enterprise_data-8.12.1 → edx_enterprise_data-8.13.0}/enterprise_data/api/v1/views/enterprise_offers.py +0 -0
  54. {edx_enterprise_data-8.12.1 → edx_enterprise_data-8.13.0}/enterprise_data/apps.py +0 -0
  55. {edx_enterprise_data-8.12.1 → edx_enterprise_data-8.13.0}/enterprise_data/clients.py +0 -0
  56. {edx_enterprise_data-8.12.1 → edx_enterprise_data-8.13.0}/enterprise_data/constants.py +0 -0
  57. {edx_enterprise_data-8.12.1 → edx_enterprise_data-8.13.0}/enterprise_data/filters.py +0 -0
  58. {edx_enterprise_data-8.12.1 → edx_enterprise_data-8.13.0}/enterprise_data/fixtures/enterprise_enrollment.json +0 -0
  59. {edx_enterprise_data-8.12.1 → edx_enterprise_data-8.13.0}/enterprise_data/fixtures/enterprise_user.json +0 -0
  60. {edx_enterprise_data-8.12.1 → edx_enterprise_data-8.13.0}/enterprise_data/management/__init__.py +0 -0
  61. {edx_enterprise_data-8.12.1 → edx_enterprise_data-8.13.0}/enterprise_data/management/commands/__init__.py +0 -0
  62. {edx_enterprise_data-8.12.1 → edx_enterprise_data-8.13.0}/enterprise_data/management/commands/create_dummy_data.py +0 -0
  63. {edx_enterprise_data-8.12.1 → edx_enterprise_data-8.13.0}/enterprise_data/management/commands/create_dummy_data_lpr_v1.py +0 -0
  64. {edx_enterprise_data-8.12.1 → edx_enterprise_data-8.13.0}/enterprise_data/management/commands/create_enterprise_enrollment.py +0 -0
  65. {edx_enterprise_data-8.12.1 → edx_enterprise_data-8.13.0}/enterprise_data/management/commands/create_enterprise_learner_enrollment_lpr_v1.py +0 -0
  66. {edx_enterprise_data-8.12.1 → edx_enterprise_data-8.13.0}/enterprise_data/management/commands/create_enterprise_learner_lpr_v1.py +0 -0
  67. {edx_enterprise_data-8.12.1 → edx_enterprise_data-8.13.0}/enterprise_data/management/commands/create_enterprise_offer.py +0 -0
  68. {edx_enterprise_data-8.12.1 → edx_enterprise_data-8.13.0}/enterprise_data/management/commands/create_enterprise_user.py +0 -0
  69. {edx_enterprise_data-8.12.1 → edx_enterprise_data-8.13.0}/enterprise_data/management/commands/tests/__init__.py +0 -0
  70. {edx_enterprise_data-8.12.1 → edx_enterprise_data-8.13.0}/enterprise_data/management/commands/tests/test_create_dummy_data_lpr_v1.py +0 -0
  71. {edx_enterprise_data-8.12.1 → edx_enterprise_data-8.13.0}/enterprise_data/management/commands/tests/test_create_enterprise_enrollment.py +0 -0
  72. {edx_enterprise_data-8.12.1 → edx_enterprise_data-8.13.0}/enterprise_data/management/commands/tests/test_create_enterprise_learner_enrollment_lpr_v1.py +0 -0
  73. {edx_enterprise_data-8.12.1 → edx_enterprise_data-8.13.0}/enterprise_data/management/commands/tests/test_create_enterprise_learner_lpr_v1.py +0 -0
  74. {edx_enterprise_data-8.12.1 → edx_enterprise_data-8.13.0}/enterprise_data/management/commands/tests/test_create_enterprise_user.py +0 -0
  75. {edx_enterprise_data-8.12.1 → edx_enterprise_data-8.13.0}/enterprise_data/migrations/0001_initial.py +0 -0
  76. {edx_enterprise_data-8.12.1 → edx_enterprise_data-8.13.0}/enterprise_data/migrations/0002_auto_20180430_1358.py +0 -0
  77. {edx_enterprise_data-8.12.1 → edx_enterprise_data-8.13.0}/enterprise_data/migrations/0003_auto_20180501_0603.py +0 -0
  78. {edx_enterprise_data-8.12.1 → edx_enterprise_data-8.13.0}/enterprise_data/migrations/0004_auto_20180501_0928.py +0 -0
  79. {edx_enterprise_data-8.12.1 → edx_enterprise_data-8.13.0}/enterprise_data/migrations/0004_auto_20180508_1652.py +0 -0
  80. {edx_enterprise_data-8.12.1 → edx_enterprise_data-8.13.0}/enterprise_data/migrations/0005_auto_20180524_2204.py +0 -0
  81. {edx_enterprise_data-8.12.1 → edx_enterprise_data-8.13.0}/enterprise_data/migrations/0006_auto_20180612_0336.py +0 -0
  82. {edx_enterprise_data-8.12.1 → edx_enterprise_data-8.13.0}/enterprise_data/migrations/0007_auto_20180612_0534.py +0 -0
  83. {edx_enterprise_data-8.12.1 → edx_enterprise_data-8.13.0}/enterprise_data/migrations/0008_auto_20180614_0108.py +0 -0
  84. {edx_enterprise_data-8.12.1 → edx_enterprise_data-8.13.0}/enterprise_data/migrations/0009_auto_20180628_1152.py +0 -0
  85. {edx_enterprise_data-8.12.1 → edx_enterprise_data-8.13.0}/enterprise_data/migrations/0010_enterpriseenrollment_created.py +0 -0
  86. {edx_enterprise_data-8.12.1 → edx_enterprise_data-8.13.0}/enterprise_data/migrations/0011_enterpriseuser.py +0 -0
  87. {edx_enterprise_data-8.12.1 → edx_enterprise_data-8.13.0}/enterprise_data/migrations/0012_auto_20180831_1930.py +0 -0
  88. {edx_enterprise_data-8.12.1 → edx_enterprise_data-8.13.0}/enterprise_data/migrations/0013_auto_20180831_1931.py +0 -0
  89. {edx_enterprise_data-8.12.1 → edx_enterprise_data-8.13.0}/enterprise_data/migrations/0014_enterpriseuser_created.py +0 -0
  90. {edx_enterprise_data-8.12.1 → edx_enterprise_data-8.13.0}/enterprise_data/migrations/0015_auto_20180907_1757.py +0 -0
  91. {edx_enterprise_data-8.12.1 → edx_enterprise_data-8.13.0}/enterprise_data/migrations/0016_auto_20180924_2138.py +0 -0
  92. {edx_enterprise_data-8.12.1 → edx_enterprise_data-8.13.0}/enterprise_data/migrations/0017_enterpriseenrollment_unenrollment_timestamp.py +0 -0
  93. {edx_enterprise_data-8.12.1 → edx_enterprise_data-8.13.0}/enterprise_data/migrations/0018_enterprisedatafeaturerole_enterprisedataroleassignment.py +0 -0
  94. {edx_enterprise_data-8.12.1 → edx_enterprise_data-8.13.0}/enterprise_data/migrations/0019_add_enterprise_data_feature_roles.py +0 -0
  95. {edx_enterprise_data-8.12.1 → edx_enterprise_data-8.13.0}/enterprise_data/migrations/0020_add_role_based_access_control_switch.py +0 -0
  96. {edx_enterprise_data-8.12.1 → edx_enterprise_data-8.13.0}/enterprise_data/migrations/0021_auto_20190329_1241.py +0 -0
  97. {edx_enterprise_data-8.12.1 → edx_enterprise_data-8.13.0}/enterprise_data/migrations/0022_remove_role_based_access_control_switch.py +0 -0
  98. {edx_enterprise_data-8.12.1 → edx_enterprise_data-8.13.0}/enterprise_data/migrations/0023_enterpriselearner_enterpriselearnerenrollment.py +0 -0
  99. {edx_enterprise_data-8.12.1 → edx_enterprise_data-8.13.0}/enterprise_data/migrations/0024_auto_20210602_1811.py +0 -0
  100. {edx_enterprise_data-8.12.1 → edx_enterprise_data-8.13.0}/enterprise_data/migrations/0025_auto_20210703_1854.py +0 -0
  101. {edx_enterprise_data-8.12.1 → edx_enterprise_data-8.13.0}/enterprise_data/migrations/0026_auto_20210916_0414.py +0 -0
  102. {edx_enterprise_data-8.12.1 → edx_enterprise_data-8.13.0}/enterprise_data/migrations/0027_enterpriselearnerenrollment_total_learning_time_seconds.py +0 -0
  103. {edx_enterprise_data-8.12.1 → edx_enterprise_data-8.13.0}/enterprise_data/migrations/0028_enterpriselearnerenrollment_offer_id.py +0 -0
  104. {edx_enterprise_data-8.12.1 → edx_enterprise_data-8.13.0}/enterprise_data/migrations/0029_enterpriseoffer.py +0 -0
  105. {edx_enterprise_data-8.12.1 → edx_enterprise_data-8.13.0}/enterprise_data/migrations/0030_auto_20230609_1353.py +0 -0
  106. {edx_enterprise_data-8.12.1 → edx_enterprise_data-8.13.0}/enterprise_data/migrations/0031_auto_20230615_0705.py +0 -0
  107. {edx_enterprise_data-8.12.1 → edx_enterprise_data-8.13.0}/enterprise_data/migrations/0032_auto_20230704_0818.py +0 -0
  108. {edx_enterprise_data-8.12.1 → edx_enterprise_data-8.13.0}/enterprise_data/migrations/0033_enterpriseadminlearnerprogress_enterpriseadminsummarizeinsights.py +0 -0
  109. {edx_enterprise_data-8.12.1 → edx_enterprise_data-8.13.0}/enterprise_data/migrations/0034_auto_20230907_0834.py +0 -0
  110. {edx_enterprise_data-8.12.1 → edx_enterprise_data-8.13.0}/enterprise_data/migrations/0035_auto_20230907_1154.py +0 -0
  111. {edx_enterprise_data-8.12.1 → edx_enterprise_data-8.13.0}/enterprise_data/migrations/0036_enterprisesubsidybudget_subsidy_access_policy_display_name.py +0 -0
  112. {edx_enterprise_data-8.12.1 → edx_enterprise_data-8.13.0}/enterprise_data/migrations/0037_alter_enterpriseenrollment_consent_granted.py +0 -0
  113. {edx_enterprise_data-8.12.1 → edx_enterprise_data-8.13.0}/enterprise_data/migrations/0038_enterpriseoffer_export_timestamp.py +0 -0
  114. {edx_enterprise_data-8.12.1 → edx_enterprise_data-8.13.0}/enterprise_data/migrations/0039_auto_20240212_1403.py +0 -0
  115. {edx_enterprise_data-8.12.1 → edx_enterprise_data-8.13.0}/enterprise_data/migrations/0040_auto_20240718_0536_squashed_0043_alter_enterpriselearnerenrollment_enterprise_enrollment_id.py +0 -0
  116. {edx_enterprise_data-8.12.1 → edx_enterprise_data-8.13.0}/enterprise_data/migrations/0044_enterpriseexecedlcmoduleperformance.py +0 -0
  117. {edx_enterprise_data-8.12.1 → edx_enterprise_data-8.13.0}/enterprise_data/migrations/__init__.py +0 -0
  118. {edx_enterprise_data-8.12.1 → edx_enterprise_data-8.13.0}/enterprise_data/models.py +0 -0
  119. {edx_enterprise_data-8.12.1 → edx_enterprise_data-8.13.0}/enterprise_data/paginators.py +0 -0
  120. {edx_enterprise_data-8.12.1 → edx_enterprise_data-8.13.0}/enterprise_data/renderers.py +0 -0
  121. {edx_enterprise_data-8.12.1 → edx_enterprise_data-8.13.0}/enterprise_data/settings/__init__.py +0 -0
  122. {edx_enterprise_data-8.12.1 → edx_enterprise_data-8.13.0}/enterprise_data/settings/test.py +0 -0
  123. {edx_enterprise_data-8.12.1 → edx_enterprise_data-8.13.0}/enterprise_data/signals.py +0 -0
  124. {edx_enterprise_data-8.12.1 → edx_enterprise_data-8.13.0}/enterprise_data/tests/__init__.py +0 -0
  125. {edx_enterprise_data-8.12.1 → edx_enterprise_data-8.13.0}/enterprise_data/tests/admin_analytics/__init__.py +0 -0
  126. {edx_enterprise_data-8.12.1 → edx_enterprise_data-8.13.0}/enterprise_data/tests/admin_analytics/mock_enrollments.py +0 -0
  127. {edx_enterprise_data-8.12.1 → edx_enterprise_data-8.13.0}/enterprise_data/tests/admin_analytics/test_analytics_engagements.py +0 -0
  128. {edx_enterprise_data-8.12.1 → edx_enterprise_data-8.13.0}/enterprise_data/tests/admin_analytics/test_analytics_enrollments.py +0 -0
  129. {edx_enterprise_data-8.12.1 → edx_enterprise_data-8.13.0}/enterprise_data/tests/admin_analytics/test_analytics_leaderboard.py +0 -0
  130. {edx_enterprise_data-8.12.1 → edx_enterprise_data-8.13.0}/enterprise_data/tests/admin_analytics/test_enterprise_completions.py +0 -0
  131. {edx_enterprise_data-8.12.1 → edx_enterprise_data-8.13.0}/enterprise_data/tests/api/__init__.py +0 -0
  132. {edx_enterprise_data-8.12.1 → edx_enterprise_data-8.13.0}/enterprise_data/tests/api/v0/__init__.py +0 -0
  133. {edx_enterprise_data-8.12.1 → edx_enterprise_data-8.13.0}/enterprise_data/tests/api/v0/test_serializers.py +0 -0
  134. {edx_enterprise_data-8.12.1 → edx_enterprise_data-8.13.0}/enterprise_data/tests/api/v1/__init__.py +0 -0
  135. {edx_enterprise_data-8.12.1 → edx_enterprise_data-8.13.0}/enterprise_data/tests/api/v1/test_serializers.py +0 -0
  136. {edx_enterprise_data-8.12.1 → edx_enterprise_data-8.13.0}/enterprise_data/tests/api/v1/test_views.py +0 -0
  137. {edx_enterprise_data-8.12.1 → edx_enterprise_data-8.13.0}/enterprise_data/tests/api/v1/views/__init__.py +0 -0
  138. {edx_enterprise_data-8.12.1 → edx_enterprise_data-8.13.0}/enterprise_data/tests/factories.py +0 -0
  139. {edx_enterprise_data-8.12.1 → edx_enterprise_data-8.13.0}/enterprise_data/tests/mixins.py +0 -0
  140. {edx_enterprise_data-8.12.1 → edx_enterprise_data-8.13.0}/enterprise_data/tests/test_clients.py +0 -0
  141. {edx_enterprise_data-8.12.1 → edx_enterprise_data-8.13.0}/enterprise_data/tests/test_filters.py +0 -0
  142. {edx_enterprise_data-8.12.1 → edx_enterprise_data-8.13.0}/enterprise_data/tests/test_models.py +0 -0
  143. {edx_enterprise_data-8.12.1 → edx_enterprise_data-8.13.0}/enterprise_data/tests/test_utils.py +0 -0
  144. {edx_enterprise_data-8.12.1 → edx_enterprise_data-8.13.0}/enterprise_data/tests/test_views.py +0 -0
  145. {edx_enterprise_data-8.12.1 → edx_enterprise_data-8.13.0}/enterprise_data/urls.py +0 -0
  146. {edx_enterprise_data-8.12.1 → edx_enterprise_data-8.13.0}/enterprise_data/utils.py +0 -0
  147. {edx_enterprise_data-8.12.1 → edx_enterprise_data-8.13.0}/enterprise_data_roles/__init__.py +0 -0
  148. {edx_enterprise_data-8.12.1 → edx_enterprise_data-8.13.0}/enterprise_data_roles/admin.py +0 -0
  149. {edx_enterprise_data-8.12.1 → edx_enterprise_data-8.13.0}/enterprise_data_roles/apps.py +0 -0
  150. {edx_enterprise_data-8.12.1 → edx_enterprise_data-8.13.0}/enterprise_data_roles/constants.py +0 -0
  151. {edx_enterprise_data-8.12.1 → edx_enterprise_data-8.13.0}/enterprise_data_roles/migrations/0001_initial.py +0 -0
  152. {edx_enterprise_data-8.12.1 → edx_enterprise_data-8.13.0}/enterprise_data_roles/migrations/0002_add_enterprise_data_feature_roles.py +0 -0
  153. {edx_enterprise_data-8.12.1 → edx_enterprise_data-8.13.0}/enterprise_data_roles/migrations/0003_add_role_based_access_control_switch.py +0 -0
  154. {edx_enterprise_data-8.12.1 → edx_enterprise_data-8.13.0}/enterprise_data_roles/migrations/0004_enterprisedataroleassignment_enterprise_id.py +0 -0
  155. {edx_enterprise_data-8.12.1 → edx_enterprise_data-8.13.0}/enterprise_data_roles/migrations/0005_turn_on_role_based_access_control_switch.py +0 -0
  156. {edx_enterprise_data-8.12.1 → edx_enterprise_data-8.13.0}/enterprise_data_roles/migrations/0006_remove_role_based_access_control_switch.py +0 -0
  157. {edx_enterprise_data-8.12.1 → edx_enterprise_data-8.13.0}/enterprise_data_roles/migrations/0007_enterprisedataroleassignment_applies_to_all_contexts.py +0 -0
  158. {edx_enterprise_data-8.12.1 → edx_enterprise_data-8.13.0}/enterprise_data_roles/migrations/__init__.py +0 -0
  159. {edx_enterprise_data-8.12.1 → edx_enterprise_data-8.13.0}/enterprise_data_roles/models.py +0 -0
  160. {edx_enterprise_data-8.12.1 → edx_enterprise_data-8.13.0}/enterprise_data_roles/rules.py +0 -0
  161. {edx_enterprise_data-8.12.1 → edx_enterprise_data-8.13.0}/enterprise_data_roles/tests/__init__.py +0 -0
  162. {edx_enterprise_data-8.12.1 → edx_enterprise_data-8.13.0}/enterprise_data_roles/tests/factories.py +0 -0
  163. {edx_enterprise_data-8.12.1 → edx_enterprise_data-8.13.0}/enterprise_data_roles/tests/test_models.py +0 -0
  164. {edx_enterprise_data-8.12.1 → edx_enterprise_data-8.13.0}/enterprise_reporting/__init__.py +0 -0
  165. {edx_enterprise_data-8.12.1 → edx_enterprise_data-8.13.0}/enterprise_reporting/clients/__init__.py +0 -0
  166. {edx_enterprise_data-8.12.1 → edx_enterprise_data-8.13.0}/enterprise_reporting/clients/enterprise.py +0 -0
  167. {edx_enterprise_data-8.12.1 → edx_enterprise_data-8.13.0}/enterprise_reporting/clients/s3.py +0 -0
  168. {edx_enterprise_data-8.12.1 → edx_enterprise_data-8.13.0}/enterprise_reporting/clients/snowflake.py +0 -0
  169. {edx_enterprise_data-8.12.1 → edx_enterprise_data-8.13.0}/enterprise_reporting/clients/vertica.py +0 -0
  170. {edx_enterprise_data-8.12.1 → edx_enterprise_data-8.13.0}/enterprise_reporting/delivery_method.py +0 -0
  171. {edx_enterprise_data-8.12.1 → edx_enterprise_data-8.13.0}/enterprise_reporting/external_resource_link_report.py +0 -0
  172. {edx_enterprise_data-8.12.1 → edx_enterprise_data-8.13.0}/enterprise_reporting/fixtures/__init__.py +0 -0
  173. {edx_enterprise_data-8.12.1 → edx_enterprise_data-8.13.0}/enterprise_reporting/fixtures/enterprise_customer_reporting.json +0 -0
  174. {edx_enterprise_data-8.12.1 → edx_enterprise_data-8.13.0}/enterprise_reporting/reporter.py +0 -0
  175. {edx_enterprise_data-8.12.1 → edx_enterprise_data-8.13.0}/enterprise_reporting/send_enterprise_reports.py +0 -0
  176. {edx_enterprise_data-8.12.1 → edx_enterprise_data-8.13.0}/enterprise_reporting/tests/__init__.py +0 -0
  177. {edx_enterprise_data-8.12.1 → edx_enterprise_data-8.13.0}/enterprise_reporting/tests/test_clients.py +0 -0
  178. {edx_enterprise_data-8.12.1 → edx_enterprise_data-8.13.0}/enterprise_reporting/tests/test_delivery_method.py +0 -0
  179. {edx_enterprise_data-8.12.1 → edx_enterprise_data-8.13.0}/enterprise_reporting/tests/test_enterprise_client.py +0 -0
  180. {edx_enterprise_data-8.12.1 → edx_enterprise_data-8.13.0}/enterprise_reporting/tests/test_external_link_report.py +0 -0
  181. {edx_enterprise_data-8.12.1 → edx_enterprise_data-8.13.0}/enterprise_reporting/tests/test_reporter.py +0 -0
  182. {edx_enterprise_data-8.12.1 → edx_enterprise_data-8.13.0}/enterprise_reporting/tests/test_send_enterprise_reports.py +0 -0
  183. {edx_enterprise_data-8.12.1 → edx_enterprise_data-8.13.0}/enterprise_reporting/tests/test_utils.py +0 -0
  184. {edx_enterprise_data-8.12.1 → edx_enterprise_data-8.13.0}/enterprise_reporting/tests/test_vertica_client.py +0 -0
  185. {edx_enterprise_data-8.12.1 → edx_enterprise_data-8.13.0}/enterprise_reporting/tests/utils.py +0 -0
  186. {edx_enterprise_data-8.12.1 → edx_enterprise_data-8.13.0}/enterprise_reporting/utils.py +0 -0
  187. {edx_enterprise_data-8.12.1 → edx_enterprise_data-8.13.0}/requirements/base.in +0 -0
  188. {edx_enterprise_data-8.12.1 → edx_enterprise_data-8.13.0}/requirements/base.txt +0 -0
  189. {edx_enterprise_data-8.12.1 → edx_enterprise_data-8.13.0}/requirements/ci.txt +0 -0
  190. {edx_enterprise_data-8.12.1 → edx_enterprise_data-8.13.0}/requirements/common_constraints.txt +0 -0
  191. {edx_enterprise_data-8.12.1 → edx_enterprise_data-8.13.0}/requirements/constraints.txt +0 -0
  192. {edx_enterprise_data-8.12.1 → edx_enterprise_data-8.13.0}/requirements/dev.txt +0 -0
  193. {edx_enterprise_data-8.12.1 → edx_enterprise_data-8.13.0}/requirements/django.txt +0 -0
  194. {edx_enterprise_data-8.12.1 → edx_enterprise_data-8.13.0}/requirements/pip.txt +0 -0
  195. {edx_enterprise_data-8.12.1 → edx_enterprise_data-8.13.0}/requirements/pip_tools.txt +0 -0
  196. {edx_enterprise_data-8.12.1 → edx_enterprise_data-8.13.0}/requirements/quality.txt +0 -0
  197. {edx_enterprise_data-8.12.1 → edx_enterprise_data-8.13.0}/requirements/reporting.in +0 -0
  198. {edx_enterprise_data-8.12.1 → edx_enterprise_data-8.13.0}/requirements/test-master.txt +0 -0
  199. {edx_enterprise_data-8.12.1 → edx_enterprise_data-8.13.0}/requirements/test-reporting.txt +0 -0
  200. {edx_enterprise_data-8.12.1 → edx_enterprise_data-8.13.0}/requirements/test.txt +0 -0
  201. {edx_enterprise_data-8.12.1 → edx_enterprise_data-8.13.0}/setup.cfg +0 -0
  202. {edx_enterprise_data-8.12.1 → edx_enterprise_data-8.13.0}/setup.py +0 -0
@@ -15,6 +15,10 @@ Unreleased
15
15
  ----------
16
16
 
17
17
  =========================
18
+ [8.13.0] - 2024-09-23
19
+ ---------------------
20
+ * feat: convert the skills pandas code into sql queries for better performance
21
+
18
22
  [8.12.1] - 2024-09-16
19
23
  ---------------------
20
24
  * fix: Remove hyphens from enterprise customer UUID before database query.
@@ -1,6 +1,6 @@
1
1
  Metadata-Version: 2.1
2
2
  Name: edx-enterprise-data
3
- Version: 8.12.1
3
+ Version: 8.13.0
4
4
  Summary: Enterprise Reporting
5
5
  Home-page: https://github.com/openedx/edx-enterprise-data
6
6
  Author: edX
@@ -1,6 +1,6 @@
1
1
  Metadata-Version: 2.1
2
2
  Name: edx-enterprise-data
3
- Version: 8.12.1
3
+ Version: 8.13.0
4
4
  Summary: Enterprise Reporting
5
5
  Home-page: https://github.com/openedx/edx-enterprise-data
6
6
  Author: edX
@@ -30,10 +30,12 @@ enterprise_data/admin_analytics/database/utils.py
30
30
  enterprise_data/admin_analytics/database/queries/__init__.py
31
31
  enterprise_data/admin_analytics/database/queries/fact_engagement_admin_dash.py
32
32
  enterprise_data/admin_analytics/database/queries/fact_enrollment_admin_dash.py
33
+ enterprise_data/admin_analytics/database/queries/skills_daily_rollup_admin_dash.py
33
34
  enterprise_data/admin_analytics/database/tables/__init__.py
34
35
  enterprise_data/admin_analytics/database/tables/base.py
35
36
  enterprise_data/admin_analytics/database/tables/fact_engagement_admin_dash.py
36
37
  enterprise_data/admin_analytics/database/tables/fact_enrollment_admin_dash.py
38
+ enterprise_data/admin_analytics/database/tables/skills_daily_rollup_admin_dash.py
37
39
  enterprise_data/api/__init__.py
38
40
  enterprise_data/api/urls.py
39
41
  enterprise_data/api/v0/__init__.py
@@ -2,4 +2,4 @@
2
2
  Enterprise data api application. This Django app exposes API endpoints used by enterprises.
3
3
  """
4
4
 
5
- __version__ = "8.12.1"
5
+ __version__ = "8.13.0"
@@ -147,51 +147,3 @@ def fetch_max_enrollment_datetime():
147
147
  if not results:
148
148
  return None
149
149
  return pandas.to_datetime(results[0][0])
150
-
151
-
152
- def fetch_skills_data(enterprise_uuid: str):
153
- """
154
- Fetch skills data from the database for the given enterprise customer.
155
-
156
- Arguments:
157
- enterprise_uuid (str): The UUID of the enterprise customer.
158
-
159
- Returns:
160
- (pandas.DataFrame): The skills data.
161
- """
162
-
163
- enterprise_uuid = enterprise_uuid.replace('-', '')
164
-
165
- cols = [
166
- 'course_number',
167
- 'skill_type',
168
- 'skill_name',
169
- 'skill_url',
170
- 'confidence',
171
- 'skill_rank',
172
- 'course_title',
173
- 'course_key',
174
- 'level_type',
175
- 'primary_subject_name',
176
- 'date',
177
- 'enterprise_customer_uuid',
178
- 'enterprise_customer_name',
179
- 'enrolls',
180
- 'completions',
181
- ]
182
- query = get_select_query(
183
- table='skills_daily_rollup_admin_dash', columns=cols, enterprise_uuid=enterprise_uuid
184
- )
185
-
186
- with timer('fetch_skills_data'):
187
- skills = run_query(query=query)
188
-
189
- if not skills:
190
- raise Http404(f'No skills data found for enterprise {enterprise_uuid}')
191
-
192
- LOGGER.info(f'[PLOTLY] Skills data fetched successfully. Records: {len(skills)}')
193
- skills = pandas.DataFrame(numpy.array(skills), columns=cols)
194
- LOGGER.info('[PLOTLY] Skills data converted to DataFrame.')
195
- skills['date'] = skills['date'].astype('datetime64[ns]')
196
-
197
- return skills
@@ -0,0 +1,118 @@
1
+ """
2
+ Module containing queries for the skills_daily_rollup_admin_dash table.
3
+ """
4
+
5
+
6
+ class SkillsDailyRollupAdminDashQueries:
7
+ """
8
+ Queries related to the skills_daily_rollup_admin_dash table.
9
+ """
10
+ @staticmethod
11
+ def get_top_skills():
12
+ """
13
+ Get the query to fetch the top skills for an enterprise customer.
14
+ """
15
+ return """
16
+ SELECT
17
+ skill_name,
18
+ skill_type,
19
+ SUM(enrolls) AS enrolls,
20
+ SUM(completions) AS completions
21
+ FROM
22
+ skills_daily_rollup_admin_dash
23
+ WHERE
24
+ enterprise_customer_uuid=%(enterprise_customer_uuid)s AND
25
+ date BETWEEN %(start_date)s AND %(end_date)s
26
+ GROUP BY
27
+ skill_name, skill_type
28
+ ORDER BY
29
+ enrolls DESC, completions DESC;
30
+ """
31
+
32
+ @staticmethod
33
+ def get_top_skills_by_enrollment():
34
+ """
35
+ Get the query to fetch the top skills by enrollment for an enterprise customer.
36
+ """
37
+ return """
38
+ WITH TopSkills AS (
39
+ -- Get top 10 skills by total enrollments
40
+ SELECT
41
+ skill_name
42
+ FROM
43
+ skills_daily_rollup_admin_dash
44
+ WHERE
45
+ enterprise_customer_uuid=%(enterprise_customer_uuid)s
46
+ AND date BETWEEN %(start_date)s AND %(end_date)s
47
+ GROUP BY
48
+ skill_name
49
+ ORDER BY
50
+ SUM(enrolls) DESC
51
+ LIMIT 10
52
+ )
53
+ SELECT
54
+ sd.skill_name,
55
+ CASE
56
+ WHEN sd.primary_subject_name IN (
57
+ 'business-management', 'computer-science',
58
+ 'data-analysis-statistics', 'engineering', 'communication'
59
+ ) THEN sd.primary_subject_name
60
+ ELSE 'other'
61
+ END AS subject_name,
62
+ SUM(sd.enrolls) AS count
63
+ FROM
64
+ skills_daily_rollup_admin_dash AS sd
65
+ JOIN
66
+ TopSkills AS ts ON sd.skill_name = ts.skill_name
67
+ WHERE
68
+ sd.enterprise_customer_uuid=%(enterprise_customer_uuid)s
69
+ AND date BETWEEN %(start_date)s AND %(end_date)s
70
+ GROUP BY
71
+ sd.skill_name, subject_name
72
+ ORDER BY
73
+ subject_name;
74
+ """
75
+
76
+ @staticmethod
77
+ def get_top_skills_by_completion():
78
+ """
79
+ Get the query to fetch the top skills by completion for an enterprise customer.
80
+ """
81
+ return """
82
+ WITH TopSkills AS (
83
+ -- Get top 10 skills by total completions
84
+ SELECT
85
+ skill_name
86
+ FROM
87
+ skills_daily_rollup_admin_dash
88
+ WHERE
89
+ enterprise_customer_uuid=%(enterprise_customer_uuid)s
90
+ AND date BETWEEN %(start_date)s AND %(end_date)s
91
+ GROUP BY
92
+ skill_name
93
+ ORDER BY
94
+ SUM(completions) DESC
95
+ LIMIT 10
96
+ )
97
+ SELECT
98
+ sd.skill_name,
99
+ CASE
100
+ WHEN sd.primary_subject_name IN (
101
+ 'business-management', 'computer-science',
102
+ 'data-analysis-statistics', 'engineering', 'communication'
103
+ ) THEN sd.primary_subject_name
104
+ ELSE 'other'
105
+ END AS subject_name,
106
+ SUM(sd.completions) AS count
107
+ FROM
108
+ skills_daily_rollup_admin_dash AS sd
109
+ JOIN
110
+ TopSkills AS ts ON sd.skill_name = ts.skill_name
111
+ WHERE
112
+ sd.enterprise_customer_uuid=%(enterprise_customer_uuid)s
113
+ AND date BETWEEN %(start_date)s AND %(end_date)s
114
+ GROUP BY
115
+ sd.skill_name, subject_name
116
+ ORDER BY
117
+ subject_name;
118
+ """
@@ -3,3 +3,4 @@ This module contains the database queries for the admin analytics.
3
3
  """
4
4
  from .fact_engagement_admin_dash import FactEngagementAdminDashTable
5
5
  from .fact_enrollment_admin_dash import FactEnrollmentAdminDashTable
6
+ from .skills_daily_rollup_admin_dash import SkillsDailyRollupAdminDashTable
@@ -0,0 +1,94 @@
1
+ """
2
+ Module for interacting with the skills_daily_rollup_admin_dash table.
3
+ """
4
+ from datetime import date
5
+ from uuid import UUID
6
+
7
+ from enterprise_data.admin_analytics.database.queries.skills_daily_rollup_admin_dash import (
8
+ SkillsDailyRollupAdminDashQueries,
9
+ )
10
+ from enterprise_data.admin_analytics.database.tables.base import BaseTable
11
+ from enterprise_data.admin_analytics.database.utils import run_query
12
+
13
+
14
+ class SkillsDailyRollupAdminDashTable(BaseTable):
15
+ """
16
+ Class for communicating with the skills_daily_rollup_admin_dash table.
17
+ """
18
+ queries = SkillsDailyRollupAdminDashQueries()
19
+
20
+ def get_top_skills(self, enterprise_customer_uuid: UUID, start_date: date, end_date: date):
21
+ """
22
+ Get the top skills for the given enterprise customer.
23
+
24
+ Arguments:
25
+ enterprise_customer_uuid (UUID): The UUID of the enterprise customer.
26
+ start_date (date): The start date.
27
+ end_date (date): The end date.
28
+
29
+ Returns:
30
+ list<dict>: A list of dictionaries containing the skill_name, skill_type, enrolls and completions.
31
+ """
32
+ return run_query(
33
+ query=self.queries.get_top_skills(),
34
+ params={
35
+ 'enterprise_customer_uuid': enterprise_customer_uuid,
36
+ 'start_date': start_date,
37
+ 'end_date': end_date,
38
+ },
39
+ as_dict=True,
40
+ )
41
+
42
+ def get_top_skills_by_enrollment(
43
+ self,
44
+ enterprise_customer_uuid: UUID,
45
+ start_date: date,
46
+ end_date: date
47
+ ):
48
+ """
49
+ Get the top skills by enrollments for the given enterprise customer.
50
+
51
+ Arguments:
52
+ enterprise_customer_uuid (UUID): The UUID of the enterprise customer.
53
+ start_date (date): The start date.
54
+ end_date (date): The end date.
55
+
56
+ Returns:
57
+ list<dict>: A list of dictionaries containing the skill_name, subject_name, count.
58
+ """
59
+ return run_query(
60
+ query=self.queries.get_top_skills_by_enrollment(),
61
+ params={
62
+ 'enterprise_customer_uuid': enterprise_customer_uuid,
63
+ 'start_date': start_date,
64
+ 'end_date': end_date,
65
+ },
66
+ as_dict=True,
67
+ )
68
+
69
+ def get_top_skills_by_completion(
70
+ self,
71
+ enterprise_customer_uuid: UUID,
72
+ start_date: date,
73
+ end_date: date
74
+ ):
75
+ """
76
+ Get the top skills by completion for the given enterprise customer.
77
+
78
+ Arguments:
79
+ enterprise_customer_uuid (UUID): The UUID of the enterprise customer.
80
+ start_date (date): The start date.
81
+ end_date (date): The end date.
82
+
83
+ Returns:
84
+ list<dict>: A list of dictionaries containing the skill_name, subject_name, count.
85
+ """
86
+ return run_query(
87
+ query=self.queries.get_top_skills_by_completion(),
88
+ params={
89
+ 'enterprise_customer_uuid': enterprise_customer_uuid,
90
+ 'start_date': start_date,
91
+ 'end_date': end_date,
92
+ },
93
+ as_dict=True,
94
+ )
@@ -12,9 +12,7 @@ from enterprise_data.admin_analytics.data_loaders import (
12
12
  fetch_engagement_data,
13
13
  fetch_enrollment_data,
14
14
  fetch_max_enrollment_datetime,
15
- fetch_skills_data,
16
15
  )
17
- from enterprise_data.utils import date_filter, primary_subject_truncate
18
16
 
19
17
  LOGGER = getLogger(__name__)
20
18
 
@@ -23,9 +21,6 @@ class ChartType(Enum):
23
21
  """
24
22
  Chart types.
25
23
  """
26
- BUBBLE = 'bubble'
27
- TOP_SKILLS_ENROLLMENT = 'top_skills_enrollment'
28
- TOP_SKILLS_COMPLETION = 'top_skills_completion'
29
24
  COMPLETIONS_OVER_TIME = 'completions_over_time'
30
25
  TOP_COURSES_BY_COMPLETIONS = 'top_courses_by_completions'
31
26
  TOP_SUBJECTS_BY_COMPLETIONS = 'top_subjects_by_completions'
@@ -183,169 +178,3 @@ def fetch_and_cache_engagements_data(enterprise_id, cache_expiry):
183
178
  cache_key, engagements, get_cache_timeout(cache_expiry)
184
179
  )
185
180
  return engagements
186
-
187
-
188
- def fetch_and_cache_skills_data(enterprise_id, cache_expiry):
189
- """
190
- Helper method to fetch and cache skills data.
191
-
192
- Arguments:
193
- enterprise_id (str): UUID of the enterprise customer in string format.
194
- cache_expiry (datetime): Datetime object denoting the cache expiry.
195
-
196
- Returns:
197
- (pandas.DataFrame): The skills data.
198
- """
199
- cache_key = get_cache_key(
200
- resource='enterprise-admin-analytics-aggregate-skills',
201
- enterprise_customer=enterprise_id,
202
- )
203
- cached_response = TieredCache.get_cached_response(cache_key)
204
-
205
- if cached_response.is_found:
206
- LOGGER.info(f"Skills data found in cache for Enterprise [{enterprise_id}]")
207
- return cached_response.value
208
- else:
209
- skills = fetch_skills_data(enterprise_id)
210
- TieredCache.set_all_tiers(
211
- cache_key, skills, get_cache_timeout(cache_expiry)
212
- )
213
- return skills
214
-
215
-
216
- def get_skills_bubble_chart_df(skills_filtered):
217
- """ Get the skills data for the bubble chart.
218
-
219
- Args:
220
- skills_filtered (pandas.DataFrame): The skills data.
221
-
222
- Returns:
223
- (pandas.DataFrame): The skills data for the bubble chart.
224
- """
225
-
226
- # Group by skill_name and skill_type, and aggregate enrolls and completions
227
- skills_aggregated = (
228
- skills_filtered.groupby(['skill_name', 'skill_type'], as_index=False)
229
- .agg(enrolls=('enrolls', 'sum'), completions=('completions', 'sum'))
230
- )
231
-
232
- # Convert enrolls and completions to integers
233
- skills_aggregated['enrolls'] = skills_aggregated['enrolls'].astype(int)
234
- skills_aggregated['completions'] = skills_aggregated['completions'].astype(int)
235
-
236
- # Sort the dataframe by enrolls and completions in descending order
237
- skills_aggregated = skills_aggregated.sort_values(by=['enrolls', 'completions'], ascending=False)
238
-
239
- return skills_aggregated
240
-
241
-
242
- def get_top_skills_enrollment(skills_filtered):
243
- """ Get the top skills by enrolls.
244
-
245
- Args:
246
- skills_filtered (pandas.DataFrame): The skills data.
247
-
248
- Returns:
249
- (pandas.DataFrame): The top skills by enrolls data
250
- """
251
-
252
- # Get the top 10 skills by enrolls
253
- top_skills = (
254
- skills_filtered.groupby('skill_name')
255
- .enrolls.sum()
256
- .sort_values(ascending=False)
257
- .head(10)
258
- .index
259
- )
260
-
261
- # Apply primary_subject_truncate to the primary_subject_name column
262
- skills_filtered['primary_subject_name'] = skills_filtered['primary_subject_name'].apply(primary_subject_truncate)
263
-
264
- # Filter data for the top skills and aggregate enrolls by skill_name and primary_subject_name
265
- top_skills_enrollment_data = (
266
- skills_filtered[skills_filtered.skill_name.isin(top_skills)]
267
- .groupby(['skill_name', 'primary_subject_name'], as_index=False)
268
- .agg(count=('enrolls', 'sum'))
269
- )
270
-
271
- # Sort the dataframe by primary_subject_name
272
- top_skills_enrollment_data = top_skills_enrollment_data.sort_values(by="primary_subject_name")
273
-
274
- return top_skills_enrollment_data
275
-
276
-
277
- def get_top_skills_completion(skills_filtered):
278
- """ Get the top skills by completions.
279
-
280
- Args:
281
- skills_filtered (pandas.DataFrame): The skills data.
282
-
283
- Returns:
284
- (pandas.DataFrame): The top skills by completions
285
- """
286
-
287
- # Get the top 10 skills by completions
288
- top_skills = (
289
- skills_filtered.groupby('skill_name')
290
- .completions.sum()
291
- .sort_values(ascending=False)
292
- .head(10)
293
- .index
294
- )
295
-
296
- # Apply primary_subject_truncate to the primary_subject_name column
297
- skills_filtered['primary_subject_name'] = skills_filtered['primary_subject_name'].apply(primary_subject_truncate)
298
-
299
- # Filter data for the top skills and aggregate completions by skill_name and primary_subject_name
300
- top_skills_completion_data = (
301
- skills_filtered[skills_filtered.skill_name.isin(top_skills)]
302
- .groupby(['skill_name', 'primary_subject_name'], as_index=False)
303
- .agg(count=('completions', 'sum'))
304
- )
305
-
306
- # Sort the dataframe by primary_subject_name
307
- top_skills_completion_data = top_skills_completion_data.sort_values(by='primary_subject_name')
308
-
309
- return top_skills_completion_data
310
-
311
-
312
- def get_skills_chart_data(chart_type, start_date, end_date, skills):
313
- """
314
- Get chart data for skill charts.
315
-
316
- Arguments:
317
- chart_type (ChartType): The type of chart to generate.
318
- start_date (datetime): The start date for the date filter.
319
- end_date (datetime): The end date for the date filter.
320
- skills (pandas.DataFrame): The skills data.
321
- """
322
- skills_filtered = date_filter(start=start_date, end=end_date, data_frame=skills.copy(), date_column='date')
323
- if chart_type == ChartType.BUBBLE:
324
- return get_skills_bubble_chart_df(skills_filtered=skills_filtered.copy())
325
- elif chart_type == ChartType.TOP_SKILLS_ENROLLMENT:
326
- return get_top_skills_enrollment(skills_filtered=skills_filtered.copy())
327
- elif chart_type == ChartType.TOP_SKILLS_COMPLETION:
328
- return get_top_skills_completion(skills_filtered=skills_filtered.copy())
329
- else:
330
- raise ValueError(f"Invalid chart type: {chart_type}")
331
-
332
-
333
- def get_top_skills_csv_data(skills, start_date, end_date):
334
- """ Get the top skills data for CSV download.
335
-
336
- Args:
337
- skills (pandas.DataFrame): The skills data.
338
- start_date (str): The start date for the date filter.
339
- end_date (str): The end date for the date filter.
340
-
341
- Returns:
342
- (pandas.DataFrame): The top skills data for CSV download.
343
- """
344
- dff = get_skills_chart_data(
345
- chart_type=ChartType.BUBBLE,
346
- start_date=start_date,
347
- end_date=end_date,
348
- skills=skills.copy(),
349
- )
350
- dff = dff.sort_values(by='enrolls', ascending=False)
351
- return dff
@@ -1,7 +1,7 @@
1
1
  """
2
2
  Views for enterprise admin api v1.
3
3
  """
4
- from datetime import datetime, timedelta
4
+ from datetime import datetime
5
5
 
6
6
  from edx_rbac.decorators import permission_required
7
7
  from edx_rest_framework_extensions.auth.jwt.authentication import JwtAuthentication
@@ -10,16 +10,11 @@ from rest_framework.response import Response
10
10
  from rest_framework.status import HTTP_200_OK, HTTP_404_NOT_FOUND
11
11
  from rest_framework.views import APIView
12
12
 
13
- from django.http import HttpResponse
14
-
15
13
  from enterprise_data.admin_analytics.data_loaders import fetch_max_enrollment_datetime
16
- from enterprise_data.admin_analytics.database.tables import FactEngagementAdminDashTable, FactEnrollmentAdminDashTable
17
- from enterprise_data.admin_analytics.utils import (
18
- ChartType,
19
- fetch_and_cache_enrollments_data,
20
- fetch_and_cache_skills_data,
21
- get_skills_chart_data,
22
- get_top_skills_csv_data,
14
+ from enterprise_data.admin_analytics.database.tables import (
15
+ FactEngagementAdminDashTable,
16
+ FactEnrollmentAdminDashTable,
17
+ SkillsDailyRollupAdminDashTable,
23
18
  )
24
19
  from enterprise_data.api.v1 import serializers
25
20
  from enterprise_data.models import (
@@ -157,61 +152,35 @@ class EnterpriseAdminAnalyticsSkillsView(APIView):
157
152
  Returns:
158
153
  response(HttpResponse): response object
159
154
  """
160
- serializer = serializers.AdminAnalyticsAggregatesQueryParamsSerializer(
161
- data=request.GET
162
- )
155
+ enterprise_id = enterprise_id.replace('-', '')
156
+ serializer = serializers.AdvanceAnalyticsQueryParamSerializer(data=request.GET)
163
157
  serializer.is_valid(raise_exception=True)
164
- last_updated_at = fetch_max_enrollment_datetime()
165
- cache_expiry = (
166
- last_updated_at + timedelta(days=1) if last_updated_at else datetime.now()
167
- )
168
158
 
169
- enrollment = fetch_and_cache_enrollments_data(
170
- enterprise_id, cache_expiry
171
- ).copy()
159
+ if (start_date := serializer.data.get('start_date')) is None:
160
+ start_date, _ = FactEnrollmentAdminDashTable().get_enrollment_date_range(enterprise_id)
172
161
 
173
- start_date = serializer.data.get('start_date', enrollment.enterprise_enrollment_date.min())
174
162
  end_date = serializer.data.get('end_date', datetime.now())
175
163
 
176
- skills = fetch_and_cache_skills_data(enterprise_id, cache_expiry).copy()
177
-
178
- if serializer.data.get('response_type') == 'csv':
179
- csv_data = get_top_skills_csv_data(skills, start_date, end_date)
180
- response = HttpResponse(content_type='text/csv')
181
- filename = f"Skills by Enrollment and Completion, {start_date} - {end_date}.csv"
182
- response['Content-Disposition'] = f'attachment; filename="{filename}"'
183
- response['Access-Control-Expose-Headers'] = 'Content-Disposition'
184
- csv_data.to_csv(path_or_buf=response, index=False)
185
- return response
186
-
187
- with timer('skills_all_charts_data'):
188
- top_skills = get_skills_chart_data(
189
- chart_type=ChartType.BUBBLE,
190
- start_date=start_date,
191
- end_date=end_date,
192
- skills=skills,
193
- )
194
- top_skills_enrollments = get_skills_chart_data(
195
- chart_type=ChartType.TOP_SKILLS_ENROLLMENT,
196
- start_date=start_date,
197
- end_date=end_date,
198
- skills=skills,
164
+ with timer('top_skills'):
165
+ skills = SkillsDailyRollupAdminDashTable().get_top_skills(enterprise_id, start_date, end_date)
166
+
167
+ with timer('top_skills_by_enrollments'):
168
+ top_skills_by_enrollments = SkillsDailyRollupAdminDashTable().get_top_skills_by_enrollment(
169
+ enterprise_id,
170
+ start_date,
171
+ end_date
199
172
  )
200
- top_skills_by_completions = get_skills_chart_data(
201
- chart_type=ChartType.TOP_SKILLS_COMPLETION,
202
- start_date=start_date,
203
- end_date=end_date,
204
- skills=skills,
173
+ with timer('top_skills_by_completions'):
174
+ top_skills_by_completions = SkillsDailyRollupAdminDashTable().get_top_skills_by_completion(
175
+ enterprise_id,
176
+ start_date,
177
+ end_date
205
178
  )
206
179
 
207
180
  response_data = {
208
- "top_skills": top_skills.to_dict(orient="records"),
209
- "top_skills_by_enrollments": top_skills_enrollments.to_dict(
210
- orient="records"
211
- ),
212
- "top_skills_by_completions": top_skills_by_completions.to_dict(
213
- orient="records"
214
- ),
181
+ "top_skills": skills,
182
+ "top_skills_by_enrollments": top_skills_by_enrollments,
183
+ "top_skills_by_completions": top_skills_by_completions,
215
184
  }
216
185
 
217
186
  return Response(data=response_data, status=HTTP_200_OK)
@@ -537,3 +537,59 @@ def engagements_csv_content():
537
537
  b'paul77@example.org,Synergized reciprocal encoding,2021-07-26,business-management,4.4\r\n'
538
538
  b'samanthaclarke@example.org,Synergized reciprocal encoding,2021-07-19,business-management,0.0\r\n'
539
539
  )
540
+
541
+
542
+ TOP_SKILLS = [
543
+ {
544
+ "skill_name": "Python (Programming Language)",
545
+ "skill_type": "Specialized Skill",
546
+ "enrolls": 19027.0,
547
+ "completions": 3004.0
548
+ },
549
+ {
550
+ "skill_name": "Data Science",
551
+ "skill_type": "Specialized Skill",
552
+ "enrolls": 13756.0,
553
+ "completions": 1517.0
554
+ },
555
+ {
556
+ "skill_name": "Algorithms",
557
+ "skill_type": "Specialized Skill",
558
+ "enrolls": 12776.0,
559
+ "completions": 1640.0
560
+ },
561
+ ]
562
+ TOP_SKILLS_BY_ENROLLMENTS = [
563
+ {
564
+ "skill_name": "Python (Programming Language)",
565
+ "subject_name": "business-management",
566
+ "count": 313.0
567
+ },
568
+ {
569
+ "skill_name": "Machine Learning",
570
+ "subject_name": "business-management",
571
+ "count": 442.0
572
+ },
573
+ {
574
+ "skill_name": "Computer Science",
575
+ "subject_name": "business-management",
576
+ "count": 39.0
577
+ },
578
+ ]
579
+ TOP_SKILLS_BY_COMPLETIONS = [
580
+ {
581
+ "skill_name": "Python (Programming Language)",
582
+ "subject_name": "business-management",
583
+ "count": 21.0
584
+ },
585
+ {
586
+ "skill_name": "SQL (Programming Language)",
587
+ "subject_name": "business-management",
588
+ "count": 11.0
589
+ },
590
+ {
591
+ "skill_name": "Algorithms",
592
+ "subject_name": "business-management",
593
+ "count": 15.0
594
+ },
595
+ ]