Skip to content
This repository has been archived by the owner on May 1, 2024. It is now read-only.

Commit

Permalink
Merge pull request #757 from edx/ziafazal/ENT-1588
Browse files Browse the repository at this point in the history 
ENT-1588: Logic to determine value of `has_passed` column changed
  • Loading branch information
@ziafazal
ziafazal authored Sep 12, 2019
2 parents dce5c5d + 8a93c1b commit 25e870f
Show file tree
Hide file tree
Showing 10 changed files with 25 additions and 10 deletions.
4 changes: 2 additions & 2 deletions edx/analytics/tasks/enterprise/enterprise_enrollments.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -167,8 +167,8 @@ def insert_query(self):
consent.granted AS consent_granted,
grades.letter_grade,
CASE
WHEN grades.passed_timestamp IS NULL THEN 0
ELSE 1
WHEN grades.passed_timestamp IS NOT NULL AND NULLIF(grades.letter_grade,'') IS NOT NULL THEN 1
ELSE 0
END AS has_passed,
grades.passed_timestamp,
SUBSTRING_INDEX(social_auth.uid_full, ':', -1) AS enterprise_sso_uid,
Expand Down
3 changes: 2 additions & 1 deletion edx/analytics/tasks/tests/acceptance/fixtures/input/enterprise/lms/auth_user.sql
View file
Original file line number Diff line number Diff line change
Expand Up @@ -40,4 +40,5 @@ INSERT INTO `auth_user` VALUES
(12,'test_user2','','','[email protected]','0000000000000000000000000000000000000000000000000000000000000000000000000000',0,1,0,'2015-09-09 15:03:48','2015-02-12 23:14:35','w',NULL,'n','',0,NULL,'','',1,0,0),
(13,'test_user3','','','[email protected]','0000000000000000000000000000000000000000000000000000000000000000000000000000',0,1,0,'2015-09-09 15:03:48','2015-02-12 23:14:35','w',NULL,'n','',0,NULL,'','',1,0,0),
(14,'test_user4','','','[email protected]','0000000000000000000000000000000000000000000000000000000000000000000000000000',0,1,0,'2015-09-09 15:03:48','2015-02-12 23:14:35','w',NULL,'n','',0,NULL,'','',1,0,0),
(15,'test_user5','','','[email protected]','0000000000000000000000000000000000000000000000000000000000000000000000000000',0,1,0,'2015-09-09 15:03:48','2015-02-12 23:14:35','w',NULL,'n','',0,NULL,'','',1,0,0);
(15,'test_user5','','','[email protected]','0000000000000000000000000000000000000000000000000000000000000000000000000000',0,1,0,'2015-09-09 15:03:48','2015-02-12 23:14:35','w',NULL,'n','',0,NULL,'','',1,0,0),
(16,'test_user6','','','[email protected]','0000000000000000000000000000000000000000000000000000000000000000000000000000',0,1,0,'2019-09-04 15:03:48','2019-09-03 23:14:35','w',NULL,'n','',0,NULL,'','',1,0,0);
3 changes: 2 additions & 1 deletion edx/analytics/tasks/tests/acceptance/fixtures/input/enterprise/lms/auth_userprofile.sql
View file
Original file line number Diff line number Diff line change
Expand Up @@ -41,4 +41,5 @@ INSERT INTO `auth_userprofile` VALUES
(6, 'Test User2', '', 'course.xml', '', '', 1989, 'f', '', '', '', 'US', '', 1, NULL, NULL, 12),
(7, 'Test User3', '', 'course.xml', '', '', 1989, 'm', '', '', '', 'US', '', 1, NULL, NULL, 13),
(8, 'Test User4', '', 'course.xml', '', '', 1989, 'f', '', '', '', 'US', '', 1, NULL, NULL, 14),
(9, 'Test User5', '', 'course.xml', '', '', 1989, 'f', '', '', '', 'US', '', 1, NULL, NULL, 15);
(9, 'Test User5', '', 'course.xml', '', '', 1989, 'f', '', '', '', 'US', '', 1, NULL, NULL, 15),
(10, 'Test User6', '', 'course.xml', '', '', 1989, 'f', '', '', '', 'US', '', 1, NULL, NULL, 16);
3 changes: 2 additions & 1 deletion ...ytics/tasks/tests/acceptance/fixtures/input/enterprise/lms/consent_datasharingconsent.sql
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,4 +28,5 @@ INSERT INTO `consent_datasharingconsent` VALUES
(6,'2016-03-22 21:08:08.432870','2016-03-22 21:08:08.432870','test_user',0,'course-v1:edX+Testing102x+1T2017','0381d3cb033846d48a5cb1475b589d7f'),
(7,'2014-06-27 16:02:38','2014-06-27 16:02:38','test_user5',1,'edX/Open_DemoX/edx_demo_course','0381d3cb033846d48a5cb1475b589d7f'),
(8,'2016-03-22 20:56:09.320098','2016-03-22 20:56:09.320098','test_user5',1,'course-v1:edX+Open_DemoX+edx_demo_course2','0381d3cb033846d48a5cb1475b589d7f'),
(9,'2016-03-22 21:08:08.432870','2016-03-22 21:08:08.432870','test_user5',1,'course-v1:edX+Testing102x+1T2017','0381d3cb033846d48a5cb1475b589d7f');
(9,'2016-03-22 21:08:08.432870','2016-03-22 21:08:08.432870','test_user5',1,'course-v1:edX+Testing102x+1T2017','0381d3cb033846d48a5cb1475b589d7f'),
(10,'2019-09-04 21:08:08.432870','2019-09-04 21:08:08.432870','test_user6',1,'course-v1:edX+Testing102x+1T2017','0381d3cb033846d48a5cb1475b589d7f');
3 changes: 2 additions & 1 deletion .../tests/acceptance/fixtures/input/enterprise/lms/enterprise_enterprisecourseenrollment.sql
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,4 +26,5 @@ INSERT INTO `enterprise_enterprisecourseenrollment` VALUES
(6,'2016-03-22 21:08:08.432870','2016-03-22 21:08:08.432870','course-v1:edX+Testing102x+1T2017',1),
(7,'2014-06-27 16:02:38','2014-06-27 16:02:38','edX/Open_DemoX/edx_demo_course',4),
(8,'2016-03-22 20:56:09.320098','2016-03-22 20:56:09.320098','course-v1:edX+Open_DemoX+edx_demo_course2',4),
(9,'2016-03-22 21:08:08.432870','2016-03-22 21:08:08.432870','course-v1:edX+Testing102x+1T2017',4);
(9,'2016-03-22 21:08:08.432870','2016-03-22 21:08:08.432870','course-v1:edX+Testing102x+1T2017',4),
(10,'2019-09-04 21:08:08.432870','2019-09-04 21:08:08.432870','course-v1:edX+Testing102x+1T2017',5);
3 changes: 2 additions & 1 deletion ...asks/tests/acceptance/fixtures/input/enterprise/lms/enterprise_enterprisecustomeruser.sql
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,4 +20,5 @@ INSERT INTO `enterprise_enterprisecustomeruser` VALUES
(1,'2017-05-23 19:50:12.480930','2018-01-11 17:18:10.743835',11,'0381d3cb033846d48a5cb1475b589d7f'),
(2,'2017-05-30 13:20:05.314463','2018-01-11 17:18:10.793360',12,'0381d3cb033846d48a5cb1475b589d7f'),
(3,'2017-06-07 19:53:04.516017','2018-01-11 17:18:10.840584',13,'03fc6c3a33d84580842576922275ca6f'),
(4,'2017-05-23 19:50:12.480930','2018-01-11 17:18:10.743835',15,'0381d3cb033846d48a5cb1475b589d7f');
(4,'2017-05-23 19:50:12.480930','2018-01-11 17:18:10.743835',15,'0381d3cb033846d48a5cb1475b589d7f'),
(5,'2019-09-04 19:50:12.480930','2019-09-04 17:18:10.743835',16,'0381d3cb033846d48a5cb1475b589d7f');
3 changes: 2 additions & 1 deletion ...ics/tasks/tests/acceptance/fixtures/input/enterprise/lms/grades_persistentcoursegrade.sql
View file
Original file line number Diff line number Diff line change
Expand Up @@ -36,4 +36,5 @@ INSERT INTO `grades_persistentcoursegrade` VALUES
('2017-05-09 16:27:34.661796','2017-05-24 07:22:04.981837',7,14,'course-v1:edX+Testing102x+1T2017','2017-05-19 23:08:02.344000','592d2822c7d5444623e4fde6','Lgr54dD6fJnWX1psNWfej2bF9CU=',.75,'Pass','2017-05-09 16:27:34.690065'),
('2017-05-09 16:27:33.421413','2017-07-06 16:42:00.613812',8,15,'edX/Open_DemoX/edx_demo_course','2017-05-30 08:06:58.485000','592d2822c7d5444623e4fde6','Lgr54dD6fJnWX1psNWfej2bF9CU=',.85,'Pass','2017-05-09 16:27:34.690065'),
('2017-05-09 16:27:33.519065','2017-07-22 09:24:36.149447',9,15,'course-v1:edX+Open_DemoX+edx_demo_course2','2017-06-09 14:39:18.871000','592d2822c7d5444623e4fde6','Lgr54dD6fJnWX1psNWfej2bF9CU=',.5,'',NULL),
('2017-05-09 16:27:34.460666','2017-09-22 01:15:51.524507',10,15,'course-v1:edX+Testing102x+1T2017','2017-09-21 19:57:46.390000','592d2822c7d5444623e4fde6','Lgr54dD6fJnWX1psNWfej2bF9CU=',.74,'',NULL);
('2017-05-09 16:27:34.460666','2017-09-22 01:15:51.524507',10,15,'course-v1:edX+Testing102x+1T2017','2017-09-21 19:57:46.390000','592d2822c7d5444623e4fde6','Lgr54dD6fJnWX1psNWfej2bF9CU=',.74,'',NULL),
('2019-09-04 16:27:34.470666','2019-09-05 01:15:51.544507',11,16,'course-v1:edX+Testing102x+1T2017','2017-09-21 19:57:46.380000','592d2822c7d5444623e4fde6','Lgr54dD6fJnWX1psNWfej2bF9CU=',.3,'','2019-09-04 16:27:34.690065');
3 changes: 2 additions & 1 deletion ...ytics/tasks/tests/acceptance/fixtures/input/enterprise/lms/social_auth_usersocialauth.sql
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,4 +22,5 @@ INSERT INTO `social_auth_usersocialauth` VALUES
(2,12,'tpa-saml','ent1:ron', '{}'),
(3,13,'tpa-saml','ent2:ron', '{}'),
(4,13,'tpa-saml','ent2:hermione', '{}'),
(5,15,'tpa-saml','ent1:ginny', '{}');
(5,15,'tpa-saml','ent1:ginny', '{}'),
(6,16,'tpa-saml','ent1:dory', '{}');
3 changes: 2 additions & 1 deletion ...alytics/tasks/tests/acceptance/fixtures/input/enterprise/lms/student_courseenrollment.sql
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,4 +26,5 @@ INSERT INTO `student_courseenrollment` VALUES
(30,14,'course-v1:edX+Testing102x+1T2017','2016-03-22 21:08:08.432870',1,'credit'),
(31,15,'edX/Open_DemoX/edx_demo_course','2014-06-27 16:02:38',1,'verified'),
(32,15,'course-v1:edX+Open_DemoX+edx_demo_course2','2016-03-22 20:56:09.320098',1,'verified'),
(33,15,'course-v1:edX+Testing102x+1T2017','2016-03-22 21:08:08.432870',1,'credit');
(33,15,'course-v1:edX+Testing102x+1T2017','2016-03-22 21:08:08.432870',1,'credit'),
(34,16,'course-v1:edX+Testing102x+1T2017','2019-03-22 20:56:09.320098',1,'verified');
7 changes: 7 additions & 0 deletions edx/analytics/tasks/tests/acceptance/test_enterprise_enrollments.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -143,6 +143,13 @@ def expected_enterprise_enrollment_results(self):
datetime.datetime(2016, 9, 1, 0, 0), datetime.datetime(2016, 12, 1, 0, 0), 'instructor_paced', '13', 2, 4,
datetime.datetime(2015, 2, 12, 23, 14, 35), '[email protected]', 'test_user5', 'edX+Open_DemoX',
'US', None, None, None, 'Percentage, 100 (#6)', 0.85, 300.00, 56.00, None],

['0381d3cb033846d48a5cb1475b589d7f', 'Enterprise 1', 16, 5, 'course-v1:edX+Testing102x+1T2017',
datetime.datetime(2019, 9, 4, 21, 8, 8), 'verified', 1, '', 0,
datetime.datetime(2019, 9, 4, 16, 27, 34), 'dory', 1, 'All about acceptance testing Part 3!',
datetime.datetime(2016, 12, 1, 0, 0), datetime.datetime(2017, 2, 1, 0, 0), 'instructor_paced', '9', 2, 5,
datetime.datetime(2019, 9, 3, 23, 14, 35), '[email protected]', 'test_user6', 'edX+Testing102',
'US', None, None, None, None, 0.3, 100.00, 0, None],
]

return [tuple(row) for row in expected]
Expand Down

0 comments on commit 25e870f

Please sign in to comment.