Merge pull request #209 from Wardormeur/bugfix/leran-upon-extend-possible-status

Add enrollment check based upon modules status instead of only the gl…

Author: Wardormeur

lib/users/lms/award-badge.js

@@ -6,6 +6,7 @@ var _ = require('lodash');
  * Webhook handler to award badges based on courses
  * Courses "Code" must correspond to the badge slug
  * @param  {Object} certificate contains all the info, header/user/course passed
+ * ie: {"header":{"source":"LearnUpon","version":1,"webhookId":2213843,"attempt":2,"lastAttemptAt":"2016-09-01T10:33:32Z","webHookType":"course_completion","signature":"5736605a1627415455de6f7ca50e7e9d"},"user":{"userId":12345,"lastName":null,"firstName":null,"email":"qq@example.com","username":null,"customData":null},"enrollmentId":42,"courseId":42,"courseName":"CoderDojo Ethos: Implementation and Practice","courseReferenceCode":"coderdojo-ethos:-implementation-and-practice","courseMetaData":null,"modules":[{"id":42,"type":"scorm","name":"CoderDojo Ethos: Implementation and Practice","status":"passed","percentage":100.0,"dateCompleted":null,"attempts":null,"isKnowledgeCheck":false}],"credits":[],"courseAccessExpiresAt":null,"certification":false,"certificationName":null,"certExpiresAt":null,"wasRecertified":false,"dateEnrolled":"2016-08-29T12:02:38Z","dateStarted":"2016-09-01T10:30:50Z","dateCompleted":"2016-09-01T10:32:28Z","percentage":100,"enrollmentStatus":"passed","hasAttemptsRemaining":false}
  */
 function awardLMSBadge (args, cb) {
   var seneca = this;
@@ -14,10 +15,14 @@ function awardLMSBadge (args, cb) {
   var user = certif.user;
 
   function checkTestStatus (waterfallCb) {
-    if (certif.header.webHookType !== 'course_completion')
-      return cb(null, 'Unhandled webhook');
-    if (certif.enrollmentStatus !== 'passed' && certif.enrollmentStatus !== 'completed' )
-      return cb(null, 'Unhandled status');
+    if (certif.header.webHookType !== 'course_completion') {
+      return cb(null, {ok: false, why: 'Unhandled webhook'});
+    }
+    if (!_.every(certif.modules, {'status': 'passed'}) &&
+      !_.every(certif.modules, {'status': 'completed'}) &&
+      !_.includes(['completed', 'passed'], certif.enrollmentStatus) ) {
+      return cb(null, {ok: false, why: 'Unhandled status'});
+    }
     waterfallCb(null, certif.courseReferenceCode);
   }