Merge pull request #162 from dimagi/ce/user-learn-progress

user learn progress

commcare_connect/opportunity/models.py

@@ -142,7 +142,7 @@ class Meta:
     def learn_progress(self):
         learn_modules = LearnModule.objects.filter(app=self.opportunity.learn_app)
         completed_modules = CompletedModule.objects.filter(
-            opportunity=self.opportunity, module__in=learn_modules
+            opportunity=self.opportunity, module__in=learn_modules, user=self.user
         ).count()
         percentage = (completed_modules / learn_modules.count()) * 100
         return round(percentage, 2)

commcare_connect/opportunity/tests/factories.py

@@ -88,3 +88,14 @@ class OpportunityAccessFactory(DjangoModelFactory):
 
     class Meta:
         model = "opportunity.OpportunityAccess"
+
+
+class CompletedModuleFactory(DjangoModelFactory):
+    opportunity = SubFactory(OpportunityFactory)
+    user = SubFactory("commcare_connect.users.tests.factories.UserFactory")
+    date = Faker("date")
+    module = SubFactory(LearnModuleFactory, app=SelfAttribute("..opportunity.learn_app"))
+    duration = Faker("time_delta")
+
+    class Meta:
+        model = "opportunity.CompletedModule"

commcare_connect/opportunity/tests/test_models.py

@@ -0,0 +1,12 @@
+import pytest
+
+from commcare_connect.opportunity.tests.factories import CompletedModuleFactory, OpportunityAccessFactory
+
+
+@pytest.mark.django_db
+def test_learn_progress():
+    module = CompletedModuleFactory()
+    access_1 = OpportunityAccessFactory(opportunity=module.opportunity, user=module.user)
+    access_2 = OpportunityAccessFactory(opportunity=module.opportunity)
+    assert access_1.learn_progress == 100
+    assert access_2.learn_progress == 0