Fix project counter

dribdat/user/models.py

@@ -171,17 +171,15 @@ def joined_projects(self, with_challenges=True, limit=-1):
         """Retrieve all projects user has joined."""
         activities = Activity.query.filter_by(
                 user_id=self.id, name='star'
-            ).order_by(Activity.timestamp.desc())
-        if limit < 0:
-            activities = activities.all()
-        else:
-            activities = activities.limit(limit * 2)
+            ).order_by(Activity.timestamp.desc()).all()
         projects = []
+        project_ids = []
         for a in activities:
-            if a.project not in projects and not a.project.is_hidden:
-                if with_challenges or a.project.progress != 0:
-                    if len(projects) < limit:
-                        projects.append(a.project)
+            if limit > 0 and len(projects) >= limit: continue
+            if a.project_id not in project_ids and not a.project.is_hidden:
+                if with_challenges or a.project.progress > 0:
+                    projects.append(a.project)
+                    project_ids.append(a.project_id)
         return projects
 
     def posted_challenges(self):

tests/test_import.py

@@ -69,6 +69,7 @@ def test_user_schema(self, project, testapp):
         # Now we are a member of one project
         schema = get_schema_for_user_projects(user, hosturl)
         assert len(schema) == 1
+        assert 'message' not in schema
         assert len(schema[0]["workPerformed"]) == 1
 
         # Create another project