Fix default user ordering (#4972)

Author: rafalkowalski

app/dashboard/tests/test_users_list.py

@@ -17,26 +17,75 @@
 along with this program. If not, see <http://www.gnu.org/licenses/>.
 
 """
-
 import json
+from datetime import timedelta
 
 from django.contrib.auth.models import User
+from django.db.models import Count, Q
 from django.test.client import RequestFactory
+from django.utils import timezone
 
-from dashboard.models import Profile
+from dashboard.models import Bounty, BountyFulfillment, Profile
 from dashboard.views import users_fetch
 from test_plus.test import TestCase
 
+CURRENT_USERNAME = "asdfasdf"
+
+def setup_bounties():
+    owners = [CURRENT_USERNAME, 'user2']
+    for owner in owners:
+        Bounty.objects.create(
+            title='foo',
+            value_in_token=3,
+            token_name='USDT',
+            web3_created=timezone.now() - timedelta(days=7),
+            github_url='https://github.com/oogetyboogety/gitcointestproject/issues/28',
+            token_address='0x0',
+            issue_description='hello world',
+            bounty_owner_github_username=owner,
+            is_open=True,
+            accepted=True,
+            expires_date=timezone.now() + timedelta(days=1, hours=1),
+            idx_project_length=5,
+            project_length='Months',
+            bounty_type='Feature',
+            experience_level='Intermediate',
+            raw_data={},
+            idx_status='submitted',
+            bounty_owner_email='asdfasdf@bar.com',
+            current_bounty=True
+        )
+
+    BountyFulfillment.objects.create(
+        fulfiller_address='0x0000000000000000000000000000000000000000',
+        fulfiller_email='fred@bar.com',
+        fulfiller_github_username='user1',
+        fulfiller_name='Fred',
+        accepted=True,
+        bounty=Bounty.objects.first(),
+        profile=User.objects.filter(username='user1').first().profile
+    )
+
+    BountyFulfillment.objects.create(
+        fulfiller_address='0x0000000000000000000000000000000000000000',
+        fulfiller_email='fred@bar.com',
+        fulfiller_github_username='user19',
+        fulfiller_name='Fred',
+        accepted=True,
+        bounty=Bounty.objects.last(),
+        profile=User.objects.last().profile
+    )
+
 
 class UsersListTest(TestCase):
     """Define tests for the user list."""
 
     def setUp(self):
         self.request = RequestFactory()
         self.current_user = User.objects.create(
-            password="asdfasdf", username="asdfasdf")
+            password="asdfasdf", username=CURRENT_USERNAME)
         current_user_profile = Profile.objects.create(
-            user=self.current_user, data={}, hide_profile=False, handle="asdfasdf")
+            user=self.current_user, data={}, hide_profile=False, handle=CURRENT_USERNAME)
 
         for i in range(20):
             user = User.objects.create(password="{}".format(i),
@@ -48,3 +97,17 @@ def test_user_list(self):
         request = self.request
         request.user = self.current_user
         assert json.loads(users_fetch(request.get('/api/v0.1/users_fetch?user={}'.format(self.current_user.id))).content)['count'] == 21
+
+    def test_default_users_ordering_with_previous_workers_at_the_top(self):
+        setup_bounties()
+
+        all_profiles = Profile.objects.annotate(
+            worked_with=Count(
+                'fulfilled', filter=Q(
+                    fulfilled__accepted=True,
+                    fulfilled__bounty__bounty_owner_github_username__iexact=CURRENT_USERNAME
+                )
+            )
+        ).order_by('-worked_with')
+
+        assert all_profiles.values('user__username', 'worked_with')[0] == {'user__username': 'user1', 'worked_with': 1}

app/dashboard/views.py

@@ -826,41 +826,47 @@ def users_fetch(request):
             fulfilled__accepted=True,
             fulfilled__bounty__github_url__icontains=organisation
         ).distinct()
-    profile_list = profile_list.annotate(
-        feedbacks_got_count=Count('feedbacks_got', filter=Q(feedbacks_got__sender_profile=current_user.profile.id))
-    )
+
+    def previous_worked():
+        if current_user.profile.persona_is_funder:
+            return Count(
+                'fulfilled',
+                filter=Q(
+                    fulfilled__bounty__network=network,
+                    fulfilled__accepted=True,
+                    fulfilled__bounty__bounty_owner_github_username__iexact=current_user.profile.handle
+                )
+            )
+
+        return Count(
+            'bounties_funded__fulfillments',
+            filter=Q(
+                bounties_funded__fulfillments__bounty__network=network,
+                bounties_funded__fulfillments__accepted=True,
+                bounties_funded__fulfillments__fulfiller_github_username=current_user.profile.handle
+            )
+        )
+
     profile_list = Profile.objects.filter(pk__in=profile_list).annotate(
             average_rating=Avg('feedbacks_got__rating', filter=Q(feedbacks_got__bounty__network=network))
-        ).order_by(
-        order_by
+        ).annotate(previous_worked=previous_worked()).order_by(
+        order_by, '-previous_worked'
     )
     profile_list = profile_list.values_list('pk', flat=True)
     params = dict()
     all_pages = Paginator(profile_list, limit)
     all_users = []
     this_page = all_pages.page(page)
 
-    this_page = Profile.objects.filter(pk__in=[ele for ele in this_page]).annotate(
-        feedbacks_got_count=Count('feedbacks_got', filter=Q(feedbacks_got__sender_profile=current_user.profile.id))
-    ).order_by(order_by).annotate(
-        previous_worked_count=Count('fulfilled', filter=Q(
-            fulfilled__bounty__network=network,
-            fulfilled__accepted=True,
-            fulfilled__bounty__bounty_owner_github_username__iexact=current_user.profile.handle
-        ))).annotate(
+    this_page = Profile.objects.filter(pk__in=[ele for ele in this_page])\
+        .order_by(order_by).annotate(
+        previous_worked_count=previous_worked()).annotate(
             count=Count('fulfilled', filter=Q(fulfilled__bounty__network=network, fulfilled__accepted=True))
         ).annotate(
             average_rating=Avg('feedbacks_got__rating', filter=Q(feedbacks_got__bounty__network=network))
-        )
+        ).order_by('-previous_worked_count')
     for user in this_page:
         previously_worked_with = 0
-        if current_user:
-            previously_worked_with = BountyFulfillment.objects.filter(
-                bounty__bounty_owner_github_username__iexact=current_user.profile.handle,
-                fulfiller_github_username__iexact=user.handle,
-                bounty__network=network,
-                accepted=True
-            ).count()
         count_work_completed = Activity.objects.filter(profile=user, activity_type='work_done').count()
         count_work_in_progress = Activity.objects.filter(profile=user, activity_type='start_work').count()
         profile_json = {
@@ -870,7 +876,7 @@ def users_fetch(request):
             'job_type', 'linkedin_url', 'resume', 'remote', 'keywords',
             'organizations', 'is_org']}
         profile_json['job_status'] = user.job_status_verbose if user.job_search_status else None
-        profile_json['previously_worked'] = previously_worked_with > 0
+        profile_json['previously_worked'] = user.previous_worked_count > 0
         profile_json['position_contributor'] = user.get_contributor_leaderboard_index()
         profile_json['position_funder'] = user.get_funder_leaderboard_index()
         profile_json['work_done'] = count_work_completed